Sfoglia il codice sorgente

Merge pull request #4217 from Emile840/master

Fix legal notice traduction bug when refreshing sign in page
Lauri Ojansivu 3 anni fa
parent
commit
66488b834b
2 ha cambiato i file con 16 aggiunte e 2 eliminazioni
  1. 4 2
      client/components/main/layouts.jade
  2. 12 0
      client/components/main/layouts.js

+ 4 - 2
client/components/main/layouts.jade

@@ -50,9 +50,11 @@ template(name="userFormsLayout")
           +connectionMethod(authenticationMethod=currentSetting.defaultAuthenticationMethod)
         if isLegalNoticeLinkExist
           div#legalNoticeDiv
-            span {{_ 'acceptance_of_our_legalNotice'}}
-            a.at-link(href="{{currentSetting.legalNotice}}", target="_blank", rel="noopener noreferrer")
+            span#legalNoticeSpan {{_ 'acceptance_of_our_legalNotice'}}
+            a#legalNoticeAtLink.at-link(href="{{currentSetting.legalNotice}}", target="_blank", rel="noopener noreferrer")
               | {{_ 'legalNotice'}}
+          if getLegalNoticeWithWritTraduction
+            div
         div.at-form-lang
           select.select-lang.js-userform-set-language
             each languages

+ 12 - 0
client/components/main/layouts.js

@@ -86,6 +86,18 @@ Template.userFormsLayout.helpers({
       return false;
   },
 
+  getLegalNoticeWithWritTraduction(){
+    let spanLegalNoticeElt = $("#legalNoticeSpan");
+    if(spanLegalNoticeElt != null && spanLegalNoticeElt != undefined){
+      spanLegalNoticeElt.html(TAPi18n.__('acceptance_of_our_legalNotice', {}, T9n.getLanguage() || 'en'));
+    }
+    let atLinkLegalNoticeElt = $("#legalNoticeAtLink");
+    if(atLinkLegalNoticeElt != null && atLinkLegalNoticeElt != undefined){
+      atLinkLegalNoticeElt.html(TAPi18n.__('legalNotice', {}, T9n.getLanguage() || 'en'));
+    }
+    return true;
+  },
+
   isLoading() {
     return Template.instance().isLoading.get();
   },