Merge branch '4.1' into 4

silverstripe · Oct 22, 2020 · c8e1004 · c8e1004
2 parents e1559eb + 5a5d7c4
commit c8e1004
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 1 deletion.
diff --git a/client/lang/en.js b/client/lang/en.js
@@ -48,4 +48,4 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "MultiFactorAuthentication.TRY_AGAIN_ERROR": "Something went wrong. Please try again.",
     "MultiFactorAuthentication.UNKNOWN_ERROR": "An unknown error occurred."
 });
-}
+}
diff --git 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
@@ -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.'

diff --git a/readme.md b/readme.md
@@ -70,6 +70,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).