From 002eba3daed0cadda6058b4e8b1f08c70fad5507 Mon Sep 17 00:00:00 2001 From: Garion Herman Date: Tue, 18 Aug 2020 11:04:37 +1200 Subject: [PATCH 1/2] Update translations --- client/lang/en.js | 4 +--- client/lang/src/en.json | 4 +--- lang/da.yml | 7 +++++++ lang/eo.yml | 7 +++++++ 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/client/lang/en.js b/client/lang/en.js index bc9a8b73..b9cd3519 100644 --- a/client/lang/en.js +++ b/client/lang/en.js @@ -44,8 +44,6 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') { "MultiFactorAuthentication.DELETE_CONFIRMATION_BUTTON": "Remove method", "MultiFactorAuthentication.RESET_BACKUP_CONFIRMATION": "All existing codes will be made invalid and new codes will be created", "MultiFactorAuthentication.RESET_BACKUP_CONFIRMATION_BUTTON": "Reset codes", - "MultiFactorAuthentication.ADMIN_SETUP_COMPLETE_CONTINUE": "Your settings have been updated", - "MultiFactorAuthentication.TRY_AGAIN_ERROR": "Something went wrong. Please try again.", - "MultiFactorAuthentication.UNKNOWN_ERROR": "An unknown error occurred." + "MultiFactorAuthentication.ADMIN_SETUP_COMPLETE_CONTINUE": "Your settings have been updated" }); } \ No newline at end of file diff --git a/client/lang/src/en.json b/client/lang/src/en.json index de6a305b..642f9680 100644 --- a/client/lang/src/en.json +++ b/client/lang/src/en.json @@ -37,7 +37,5 @@ "MultiFactorAuthentication.DELETE_CONFIRMATION_BUTTON": "Remove method", "MultiFactorAuthentication.RESET_BACKUP_CONFIRMATION": "All existing codes will be made invalid and new codes will be created", "MultiFactorAuthentication.RESET_BACKUP_CONFIRMATION_BUTTON": "Reset codes", - "MultiFactorAuthentication.ADMIN_SETUP_COMPLETE_CONTINUE": "Your settings have been updated", - "MultiFactorAuthentication.TRY_AGAIN_ERROR": "Something went wrong. Please try again.", - "MultiFactorAuthentication.UNKNOWN_ERROR": "An unknown error occurred." + "MultiFactorAuthentication.ADMIN_SETUP_COMPLETE_CONTINUE": "Your settings have been updated" } diff --git a/lang/da.yml b/lang/da.yml index 20b5fdeb..8753b735 100644 --- a/lang/da.yml +++ b/lang/da.yml @@ -68,6 +68,13 @@ da: one: '' other: '' SINGULARNAME: '' + SilverStripe\MFA\Report\EnabledMembers: + ANY_AT_LEAST_ONE: '' + COLUMN_METHODS_REGISTERED: '' + COLUMN_METHOD_DEFAULT: '' + COLUMN_SKIPPED_REGISTRATION: '' + FILTER_MEMBER_DESCRIPTION: '' + NONE: '' SilverStripe\MFA\RequestHandler: CSRF_FAILURE: '' METHOD_ALREADY_REGISTERED: '' diff --git a/lang/eo.yml b/lang/eo.yml index 7ea34f80..2c1cb62a 100644 --- a/lang/eo.yml +++ b/lang/eo.yml @@ -68,6 +68,13 @@ eo: one: 'Unu registrita metodo' other: '{count} registritaj metodoj' SINGULARNAME: 'Registrita metodo' + SilverStripe\MFA\Report\EnabledMembers: + ANY_AT_LEAST_ONE: '' + COLUMN_METHODS_REGISTERED: '' + COLUMN_METHOD_DEFAULT: '' + COLUMN_SKIPPED_REGISTRATION: '' + FILTER_MEMBER_DESCRIPTION: '' + NONE: '' SilverStripe\MFA\RequestHandler: CSRF_FAILURE: 'Via peto eltempiĝis. Bonvolu refreŝigi kaj reprovi.' METHOD_ALREADY_REGISTERED: 'Tiu metodo jam estas registrita kontraŭ ĉi tiu membro.' From 3cc810f7d1b9f246a3bf334297bdaec0bf49a7f5 Mon Sep 17 00:00:00 2001 From: Garion Herman Date: Wed, 19 Aug 2020 13:18:55 +1200 Subject: [PATCH 2/2] FIX Reinstate recent translation strings after update We still don't support JS translations in i18nTextCollector, so it's up to the developers creating and merging features with new translations to manually update Transifex, otherwise they get trampled during releases. https://docs.silverstripe.org/en/4/contributing/translation_process/#javascript-translations --- client/lang/en.js | 6 ++++-- client/lang/src/en.json | 4 +++- readme.md | 7 +++++++ 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/client/lang/en.js b/client/lang/en.js index b9cd3519..849cd197 100644 --- a/client/lang/en.js +++ b/client/lang/en.js @@ -44,6 +44,8 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') { "MultiFactorAuthentication.DELETE_CONFIRMATION_BUTTON": "Remove method", "MultiFactorAuthentication.RESET_BACKUP_CONFIRMATION": "All existing codes will be made invalid and new codes will be created", "MultiFactorAuthentication.RESET_BACKUP_CONFIRMATION_BUTTON": "Reset codes", - "MultiFactorAuthentication.ADMIN_SETUP_COMPLETE_CONTINUE": "Your settings have been updated" + "MultiFactorAuthentication.ADMIN_SETUP_COMPLETE_CONTINUE": "Your settings have been updated", + "MultiFactorAuthentication.TRY_AGAIN_ERROR": "Something went wrong. Please try again.", + "MultiFactorAuthentication.UNKNOWN_ERROR": "An unknown error occurred." }); -} \ No newline at end of file +} diff --git a/client/lang/src/en.json b/client/lang/src/en.json index 642f9680..de6a305b 100644 --- a/client/lang/src/en.json +++ b/client/lang/src/en.json @@ -37,5 +37,7 @@ "MultiFactorAuthentication.DELETE_CONFIRMATION_BUTTON": "Remove method", "MultiFactorAuthentication.RESET_BACKUP_CONFIRMATION": "All existing codes will be made invalid and new codes will be created", "MultiFactorAuthentication.RESET_BACKUP_CONFIRMATION_BUTTON": "Reset codes", - "MultiFactorAuthentication.ADMIN_SETUP_COMPLETE_CONTINUE": "Your settings have been updated" + "MultiFactorAuthentication.ADMIN_SETUP_COMPLETE_CONTINUE": "Your settings have been updated", + "MultiFactorAuthentication.TRY_AGAIN_ERROR": "Something went wrong. Please try again.", + "MultiFactorAuthentication.UNKNOWN_ERROR": "An unknown error occurred." } diff --git a/readme.md b/readme.md index 2211aac6..c0fce529 100644 --- a/readme.md +++ b/readme.md @@ -64,6 +64,13 @@ functionality: - [Security](docs/en/security.md) - [Integrating with other authenticators](docs/en/other-authenticators.md) +## Module development + +When adding translatable content to front-end UIs in the MFA module, you must ensure that these translations are pushed +to Transifex. If this doesn't happen, they will be automatically removed in the next module released. See the +[translation docs](https://docs.silverstripe.org/en/4/contributing/translation_process/#javascript-translations) +for more information. + ## License See [license](LICENSE.md).