[enh] locales: make server name a variable (#37)

* [enh] locales: make server name a variable Enables translation into languages that do not put the server name at the end of the sentence. * [enh] locale: server name as variable in login modal
tituspijean · Sep 19, 2020 · e7a14e1 · e7a14e1
1 parent ee33d7a
commit e7a14e1
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 13 deletions.
diff --git a/js/dist/admin.js b/js/dist/admin.js
diff --git a/js/dist/admin.js.map b/js/dist/admin.js.map
diff --git a/js/dist/forum.js b/js/dist/forum.js
diff --git a/js/dist/forum.js.map b/js/dist/forum.js.map
diff --git a/js/src/forum/components/LDAPLogInModal.js b/js/src/forum/components/LDAPLogInModal.js
@@ -41,7 +41,7 @@ export default class LDAPLogInModal extends Modal {
   }
 
   title() {
-    return app.translator.trans(translationPrefix + 'log_in_with') + ' ' + app.forum.attribute('LDAP_method_name');
+    return app.translator.trans(translationPrefix + 'log_in_with', {server: app.forum.attribute('LDAP_method_name')});
   }
 
   content() {

diff --git a/js/src/forum/index.js b/js/src/forum/index.js
@@ -34,7 +34,7 @@ app.initializers.add('tituspijean-auth-ldap', function() {
 		if (items.has('logIn')) {
 			items.add('logInLDAP',
 				Button.component({
-					children: app.translator.trans(translationPrefix + 'log_in_with') + ' ' + app.forum.attribute('LDAP_method_name'),
+					children: app.translator.trans(translationPrefix + 'log_in_with', {server: app.forum.attribute('LDAP_method_name')}),
 					className: 'Button Button--link',
 					onclick: () => app.modal.show(new LDAPLogInModal())
 				}), 0

diff --git a/locale/en.yml b/locale/en.yml
@@ -1,6 +1,6 @@
 tituspijean-auth-ldap:
   forum:
-    log_in_with: Log in with
+    log_in_with: "Log in with {server}"
     log_out: => core.ref.log_out
   admin:
     settings:

diff --git a/locale/fr.yml b/locale/fr.yml
@@ -1,6 +1,6 @@
 tituspijean-auth-ldap:
   forum:
-    log_in_with: Connexion par
+    log_in_with: "Connexion via {server}"
     log_out: => core.ref.log_out
   admin:
     settings: