diff --git a/Cargo.lock b/Cargo.lock index a97bd0b5e..367ac3727 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3141,7 +3141,7 @@ dependencies = [ [[package]] name = "mas-axum-utils" -version = "0.20.0-rc.0" +version = "0.20.0" dependencies = [ "anyhow", "axum", @@ -3175,7 +3175,7 @@ dependencies = [ [[package]] name = "mas-cli" -version = "0.20.0-rc.0" +version = "0.20.0" dependencies = [ "anyhow", "axum", @@ -3249,7 +3249,7 @@ dependencies = [ [[package]] name = "mas-config" -version = "0.20.0-rc.0" +version = "0.20.0" dependencies = [ "anyhow", "camino", @@ -3281,7 +3281,7 @@ dependencies = [ [[package]] name = "mas-context" -version = "0.20.0-rc.0" +version = "0.20.0" dependencies = [ "console", "opentelemetry", @@ -3297,7 +3297,7 @@ dependencies = [ [[package]] name = "mas-data-model" -version = "0.20.0-rc.0" +version = "0.20.0" dependencies = [ "base64ct", "chrono", @@ -3318,7 +3318,7 @@ dependencies = [ [[package]] name = "mas-email" -version = "0.20.0-rc.0" +version = "0.20.0" dependencies = [ "async-trait", "lettre", @@ -3329,7 +3329,7 @@ dependencies = [ [[package]] name = "mas-handlers" -version = "0.20.0-rc.0" +version = "0.20.0" dependencies = [ "aide", "anyhow", @@ -3409,7 +3409,7 @@ dependencies = [ [[package]] name = "mas-http" -version = "0.20.0-rc.0" +version = "0.20.0" dependencies = [ "futures-util", "headers", @@ -3430,7 +3430,7 @@ dependencies = [ [[package]] name = "mas-i18n" -version = "0.20.0-rc.0" +version = "0.20.0" dependencies = [ "camino", "icu_calendar", @@ -3452,7 +3452,7 @@ dependencies = [ [[package]] name = "mas-i18n-scan" -version = "0.20.0-rc.0" +version = "0.20.0" dependencies = [ "camino", "clap", @@ -3466,7 +3466,7 @@ dependencies = [ [[package]] name = "mas-iana" -version = "0.20.0-rc.0" +version = "0.20.0" dependencies = [ "schemars 0.8.22", "serde", @@ -3474,7 +3474,7 @@ dependencies = [ [[package]] name = "mas-iana-codegen" -version = "0.20.0-rc.0" +version = "0.20.0" dependencies = [ "anyhow", "async-trait", @@ -3490,7 +3490,7 @@ dependencies = [ [[package]] name = "mas-jose" -version = "0.20.0-rc.0" +version = "0.20.0" dependencies = [ "base64ct", "chrono", @@ -3520,7 +3520,7 @@ dependencies = [ [[package]] name = "mas-keystore" -version = "0.20.0-rc.0" +version = "0.20.0" dependencies = [ "aead", "base64ct", @@ -3548,7 +3548,7 @@ dependencies = [ [[package]] name = "mas-listener" -version = "0.20.0-rc.0" +version = "0.20.0" dependencies = [ "anyhow", "bytes", @@ -3573,7 +3573,7 @@ dependencies = [ [[package]] name = "mas-matrix" -version = "0.20.0-rc.0" +version = "0.20.0" dependencies = [ "anyhow", "async-trait", @@ -3583,7 +3583,7 @@ dependencies = [ [[package]] name = "mas-matrix-synapse" -version = "0.20.0-rc.0" +version = "0.20.0" dependencies = [ "anyhow", "async-trait", @@ -3600,7 +3600,7 @@ dependencies = [ [[package]] name = "mas-oidc-client" -version = "0.20.0-rc.0" +version = "0.20.0" dependencies = [ "assert_matches", "async-trait", @@ -3636,7 +3636,7 @@ dependencies = [ [[package]] name = "mas-policy" -version = "0.20.0-rc.0" +version = "0.20.0" dependencies = [ "anyhow", "arc-swap", @@ -3653,7 +3653,7 @@ dependencies = [ [[package]] name = "mas-router" -version = "0.20.0-rc.0" +version = "0.20.0" dependencies = [ "axum", "serde", @@ -3664,7 +3664,7 @@ dependencies = [ [[package]] name = "mas-spa" -version = "0.20.0-rc.0" +version = "0.20.0" dependencies = [ "camino", "serde", @@ -3673,7 +3673,7 @@ dependencies = [ [[package]] name = "mas-storage" -version = "0.20.0-rc.0" +version = "0.20.0" dependencies = [ "async-trait", "chrono", @@ -3695,7 +3695,7 @@ dependencies = [ [[package]] name = "mas-storage-pg" -version = "0.20.0-rc.0" +version = "0.20.0" dependencies = [ "async-trait", "chrono", @@ -3722,7 +3722,7 @@ dependencies = [ [[package]] name = "mas-tasks" -version = "0.20.0-rc.0" +version = "0.20.0" dependencies = [ "anyhow", "async-trait", @@ -3754,7 +3754,7 @@ dependencies = [ [[package]] name = "mas-templates" -version = "0.20.0-rc.0" +version = "0.20.0" dependencies = [ "anyhow", "arc-swap", @@ -3784,7 +3784,7 @@ dependencies = [ [[package]] name = "mas-tower" -version = "0.20.0-rc.0" +version = "0.20.0" dependencies = [ "http", "opentelemetry", @@ -4054,7 +4054,7 @@ dependencies = [ [[package]] name = "oauth2-types" -version = "0.20.0-rc.0" +version = "0.20.0" dependencies = [ "assert_matches", "base64ct", @@ -6259,7 +6259,7 @@ dependencies = [ [[package]] name = "syn2mas" -version = "0.20.0-rc.0" +version = "0.20.0" dependencies = [ "anyhow", "arc-swap", diff --git a/Cargo.toml b/Cargo.toml index 0c4be842f..c60ff8dd0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,7 +9,7 @@ members = ["crates/*"] resolver = "2" # Updated in the CI with a `sed` command -package.version = "0.20.0-rc.0" +package.version = "0.20.0" package.license = "AGPL-3.0-only OR LicenseRef-Element-Commercial" package.authors = ["Element Backend Team"] package.edition = "2024" @@ -33,35 +33,35 @@ broken_intra_doc_links = "deny" [workspace.dependencies] # Workspace crates -mas-axum-utils = { path = "./crates/axum-utils/", version = "=0.20.0-rc.0" } -mas-cli = { path = "./crates/cli/", version = "=0.20.0-rc.0" } -mas-config = { path = "./crates/config/", version = "=0.20.0-rc.0" } -mas-context = { path = "./crates/context/", version = "=0.20.0-rc.0" } -mas-data-model = { path = "./crates/data-model/", version = "=0.20.0-rc.0" } -mas-email = { path = "./crates/email/", version = "=0.20.0-rc.0" } -mas-graphql = { path = "./crates/graphql/", version = "=0.20.0-rc.0" } -mas-handlers = { path = "./crates/handlers/", version = "=0.20.0-rc.0" } -mas-http = { path = "./crates/http/", version = "=0.20.0-rc.0" } -mas-i18n = { path = "./crates/i18n/", version = "=0.20.0-rc.0" } -mas-i18n-scan = { path = "./crates/i18n-scan/", version = "=0.20.0-rc.0" } -mas-iana = { path = "./crates/iana/", version = "=0.20.0-rc.0" } -mas-iana-codegen = { path = "./crates/iana-codegen/", version = "=0.20.0-rc.0" } -mas-jose = { path = "./crates/jose/", version = "=0.20.0-rc.0" } -mas-keystore = { path = "./crates/keystore/", version = "=0.20.0-rc.0" } -mas-listener = { path = "./crates/listener/", version = "=0.20.0-rc.0" } -mas-matrix = { path = "./crates/matrix/", version = "=0.20.0-rc.0" } -mas-matrix-synapse = { path = "./crates/matrix-synapse/", version = "=0.20.0-rc.0" } -mas-oidc-client = { path = "./crates/oidc-client/", version = "=0.20.0-rc.0" } -mas-policy = { path = "./crates/policy/", version = "=0.20.0-rc.0" } -mas-router = { path = "./crates/router/", version = "=0.20.0-rc.0" } -mas-spa = { path = "./crates/spa/", version = "=0.20.0-rc.0" } -mas-storage = { path = "./crates/storage/", version = "=0.20.0-rc.0" } -mas-storage-pg = { path = "./crates/storage-pg/", version = "=0.20.0-rc.0" } -mas-tasks = { path = "./crates/tasks/", version = "=0.20.0-rc.0" } -mas-templates = { path = "./crates/templates/", version = "=0.20.0-rc.0" } -mas-tower = { path = "./crates/tower/", version = "=0.20.0-rc.0" } -oauth2-types = { path = "./crates/oauth2-types/", version = "=0.20.0-rc.0" } -syn2mas = { path = "./crates/syn2mas", version = "=0.20.0-rc.0" } +mas-axum-utils = { path = "./crates/axum-utils/", version = "=0.20.0" } +mas-cli = { path = "./crates/cli/", version = "=0.20.0" } +mas-config = { path = "./crates/config/", version = "=0.20.0" } +mas-context = { path = "./crates/context/", version = "=0.20.0" } +mas-data-model = { path = "./crates/data-model/", version = "=0.20.0" } +mas-email = { path = "./crates/email/", version = "=0.20.0" } +mas-graphql = { path = "./crates/graphql/", version = "=0.20.0" } +mas-handlers = { path = "./crates/handlers/", version = "=0.20.0" } +mas-http = { path = "./crates/http/", version = "=0.20.0" } +mas-i18n = { path = "./crates/i18n/", version = "=0.20.0" } +mas-i18n-scan = { path = "./crates/i18n-scan/", version = "=0.20.0" } +mas-iana = { path = "./crates/iana/", version = "=0.20.0" } +mas-iana-codegen = { path = "./crates/iana-codegen/", version = "=0.20.0" } +mas-jose = { path = "./crates/jose/", version = "=0.20.0" } +mas-keystore = { path = "./crates/keystore/", version = "=0.20.0" } +mas-listener = { path = "./crates/listener/", version = "=0.20.0" } +mas-matrix = { path = "./crates/matrix/", version = "=0.20.0" } +mas-matrix-synapse = { path = "./crates/matrix-synapse/", version = "=0.20.0" } +mas-oidc-client = { path = "./crates/oidc-client/", version = "=0.20.0" } +mas-policy = { path = "./crates/policy/", version = "=0.20.0" } +mas-router = { path = "./crates/router/", version = "=0.20.0" } +mas-spa = { path = "./crates/spa/", version = "=0.20.0" } +mas-storage = { path = "./crates/storage/", version = "=0.20.0" } +mas-storage-pg = { path = "./crates/storage-pg/", version = "=0.20.0" } +mas-tasks = { path = "./crates/tasks/", version = "=0.20.0" } +mas-templates = { path = "./crates/templates/", version = "=0.20.0" } +mas-tower = { path = "./crates/tower/", version = "=0.20.0" } +oauth2-types = { path = "./crates/oauth2-types/", version = "=0.20.0" } +syn2mas = { path = "./crates/syn2mas", version = "=0.20.0" } # OpenAPI schema generation and validation [workspace.dependencies.aide] diff --git a/frontend/.storybook/locales.ts b/frontend/.storybook/locales.ts index 090812bf0..b5f64e907 100644 --- a/frontend/.storybook/locales.ts +++ b/frontend/.storybook/locales.ts @@ -27,7 +27,7 @@ export type LocalazyMetadata = { }; const localazyMetadata: LocalazyMetadata = { - projectUrl: "https://localazy.com/p/matrix-authentication-service", + projectUrl: "https://localazy.com/p/matrix-authentication-service!v0.20", baseLocale: "en", languages: [ { @@ -172,21 +172,21 @@ const localazyMetadata: LocalazyMetadata = { file: "frontend.json", path: "", cdnFiles: { - "cs": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/cs/frontend.json", - "da": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/da/frontend.json", - "de": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/de/frontend.json", - "en": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/en/frontend.json", - "et": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/et/frontend.json", - "fi": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/fi/frontend.json", - "fr": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/fr/frontend.json", - "hu": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/hu/frontend.json", - "nb_NO": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/nb-NO/frontend.json", - "nl": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/nl/frontend.json", - "pt": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/pt/frontend.json", - "ru": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/ru/frontend.json", - "sv": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/sv/frontend.json", - "uk": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/uk/frontend.json", - "zh#Hans": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/zh-Hans/frontend.json" + "cs": "https://delivery.localazy.com/_a68674711858600910558e57bb66/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/cs/frontend.json", + "da": "https://delivery.localazy.com/_a68674711858600910558e57bb66/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/da/frontend.json", + "de": "https://delivery.localazy.com/_a68674711858600910558e57bb66/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/de/frontend.json", + "en": "https://delivery.localazy.com/_a68674711858600910558e57bb66/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/en/frontend.json", + "et": "https://delivery.localazy.com/_a68674711858600910558e57bb66/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/et/frontend.json", + "fi": "https://delivery.localazy.com/_a68674711858600910558e57bb66/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/fi/frontend.json", + "fr": "https://delivery.localazy.com/_a68674711858600910558e57bb66/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/fr/frontend.json", + "hu": "https://delivery.localazy.com/_a68674711858600910558e57bb66/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/hu/frontend.json", + "nb_NO": "https://delivery.localazy.com/_a68674711858600910558e57bb66/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/nb-NO/frontend.json", + "nl": "https://delivery.localazy.com/_a68674711858600910558e57bb66/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/nl/frontend.json", + "pt": "https://delivery.localazy.com/_a68674711858600910558e57bb66/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/pt/frontend.json", + "ru": "https://delivery.localazy.com/_a68674711858600910558e57bb66/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/ru/frontend.json", + "sv": "https://delivery.localazy.com/_a68674711858600910558e57bb66/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/sv/frontend.json", + "uk": "https://delivery.localazy.com/_a68674711858600910558e57bb66/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/uk/frontend.json", + "zh#Hans": "https://delivery.localazy.com/_a68674711858600910558e57bb66/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/zh-Hans/frontend.json" } }, { @@ -194,21 +194,21 @@ const localazyMetadata: LocalazyMetadata = { file: "file.json", path: "", cdnFiles: { - "cs": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/cs/file.json", - "da": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/da/file.json", - "de": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/de/file.json", - "en": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/en/file.json", - "et": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/et/file.json", - "fi": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/fi/file.json", - "fr": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/fr/file.json", - "hu": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/hu/file.json", - "nb_NO": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/nb-NO/file.json", - "nl": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/nl/file.json", - "pt": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/pt/file.json", - "ru": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/ru/file.json", - "sv": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/sv/file.json", - "uk": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/uk/file.json", - "zh#Hans": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/zh-Hans/file.json" + "cs": "https://delivery.localazy.com/_a68674711858600910558e57bb66/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/cs/file.json", + "da": "https://delivery.localazy.com/_a68674711858600910558e57bb66/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/da/file.json", + "de": "https://delivery.localazy.com/_a68674711858600910558e57bb66/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/de/file.json", + "en": "https://delivery.localazy.com/_a68674711858600910558e57bb66/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/en/file.json", + "et": "https://delivery.localazy.com/_a68674711858600910558e57bb66/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/et/file.json", + "fi": "https://delivery.localazy.com/_a68674711858600910558e57bb66/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/fi/file.json", + "fr": "https://delivery.localazy.com/_a68674711858600910558e57bb66/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/fr/file.json", + "hu": "https://delivery.localazy.com/_a68674711858600910558e57bb66/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/hu/file.json", + "nb_NO": "https://delivery.localazy.com/_a68674711858600910558e57bb66/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/nb-NO/file.json", + "nl": "https://delivery.localazy.com/_a68674711858600910558e57bb66/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/nl/file.json", + "pt": "https://delivery.localazy.com/_a68674711858600910558e57bb66/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/pt/file.json", + "ru": "https://delivery.localazy.com/_a68674711858600910558e57bb66/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/ru/file.json", + "sv": "https://delivery.localazy.com/_a68674711858600910558e57bb66/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/sv/file.json", + "uk": "https://delivery.localazy.com/_a68674711858600910558e57bb66/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/uk/file.json", + "zh#Hans": "https://delivery.localazy.com/_a68674711858600910558e57bb66/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/zh-Hans/file.json" } } ] diff --git a/frontend/locales/fr.json b/frontend/locales/fr.json index 225ed45e0..eb4f0b3f9 100644 --- a/frontend/locales/fr.json +++ b/frontend/locales/fr.json @@ -146,7 +146,7 @@ }, "nav": { "devices": "Appareil", - "plan": "Plan", + "plan": "Forfait", "profile": "Profil", "sessions": "Sessions", "settings": "Paramètres" diff --git a/translations/fi.json b/translations/fi.json index b3a65538f..668856735 100644 --- a/translations/fi.json +++ b/translations/fi.json @@ -235,6 +235,11 @@ "link_mismatch": { "heading": "Tämä tili on jo yhdistetty toiseen tiliin." }, + "login_link": { + "action": "Jatka", + "description": "Tälle käyttäjänimelle (%(username)s) on jo olemassa tili, joka yhdistetään tähän tiliin.", + "heading": "Yhdistä olemassa olevaan tiliisi" + }, "register": { "choose_username": { "description": "Tätä ei voi muuttaa myöhemmin.", diff --git a/translations/fr.json b/translations/fr.json index 75ab19646..8d7fb28a0 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -235,6 +235,9 @@ "link_mismatch": { "heading": "Ce compte est déjà associé à un autre compte." }, + "login_link": { + "action": "Continuer" + }, "register": { "choose_username": { "description": "Cela ne peut pas être modifié ultérieurement.",