Browse Source

Merge branch 'Emile840-master'

Lauri Ojansivu 3 years ago
parent
commit
fb09efd1a4

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

@@ -180,6 +180,10 @@ Template.userFormsLayout.events({
         templateInstance.isLoading.set(false);
       });
     }
+    isCheckDone = false;
+  },
+  'click #at-signUp'(event, templateInstance){
+    isCheckDone = false;
   },
   'DOMSubtreeModified #at-oidc'(event){
     if(alreadyCheck <= 2){

+ 3 - 0
client/components/sidebar/sidebar.jade

@@ -109,6 +109,9 @@ template(name="boardTeamGeneral")
           b
             | {{_ 'add-teams'}}
           br
+          i.addTeamsLabelcss
+            | {{_ 'to-create-teams-contact-admin'}}
+          br
           i.addTeamsLabelcss
             | {{_ 'add-teams-label'}}
         th

+ 1 - 0
i18n/en.i18n.json

@@ -1099,6 +1099,7 @@
   "invite-people-success": "Invitation to register sent with success",
   "invite-people-error": "Error while sending invitation to register",
   "can-invite-if-same-mailDomainName": "Email domain name",
+  "to-create-teams-contact-admin": "To create teams, please contact the administrator.",
   "Node_heap_total_heap_size": "Node heap: total heap size",
   "Node_heap_total_heap_size_executable": "Node heap: total heap size executable",
   "Node_heap_total_physical_size": "Node heap: total physical size",

+ 5 - 1
i18n/fr.i18n.json

@@ -1095,6 +1095,10 @@
     "confirm-btn": "Confirmer",
     "remove-btn": "Supprimer",
     "filter-card-title-label": "Filtrer par titre de carte",
+    "invite-people-success": "Invitation to register sent with success",
+    "invite-people-error": "Error while sending invitation to register",
+    "can-invite-if-same-mailDomainName": "Email domain name",
+    "to-create-teams-contact-admin": "Pour créer des équipes, veuillez contacter l'administrateur.",
     "invite-people-success": "Invitation à s'enregistrer envoyée avec succès",
     "invite-people-error": "Une erreur s'est produite lors de l'envoi de l'invitation à s'enregistrer",
     "can-invite-if-same-mailDomainName": "Nom de domaine du message",
@@ -1113,4 +1117,4 @@
     "Node_memory_usage_heap_total": "Utilisation mémoire de Node : taille totale du tas alloué",
     "Node_memory_usage_heap_used": "Utilisation mémoire de Node : mémoire réellement utilisée",
     "Node_memory_usage_external": "Utilisation mémoire de Node: externe"
-}
+}