Преглед на файлове

Rename "Domaine" to "Domain" that is more like English.

Thanks to xet7 !
Lauri Ojansivu преди 3 години
родител
ревизия
c136033c1f

+ 1 - 1
client/components/settings/settingBody.jade

@@ -187,7 +187,7 @@ template(name='layoutSettings')
     li.layout-form
       .title {{_ 'can-invite-if-same-mailDomainName'}}
       .form-group
-        input.wekan-form-control#mailDomaineNamevalue(type="text", placeholder="" value="{{currentSetting.mailDomaineName}}")
+        input.wekan-form-control#mailDomainNamevalue(type="text", placeholder="" value="{{currentSetting.mailDomainName}}")
     li.layout-form
       .title {{_ 'display-authentication-method'}}
       .form-group.flex

+ 3 - 3
client/components/settings/settingBody.js

@@ -205,8 +205,8 @@ BlazeComponent.extendComponent({
     )
       .val()
       .trim();
-    const mailDomaineName = $(
-      '#mailDomaineNamevalue',
+    const mailDomainName = $(
+      '#mailDomainNamevalue',
     )
       .val()
       .trim();
@@ -233,7 +233,7 @@ BlazeComponent.extendComponent({
           automaticLinkedUrlSchemes,
           spinnerName,
           oidcBtnText,
-          mailDomaineName,
+          mailDomainName,
         },
       });
     } catch (e) {

+ 2 - 2
client/components/users/userHeader.js

@@ -30,12 +30,12 @@ Template.memberMenuPopup.helpers({
   },
   isSameDomainNameSettingValue(){
     const currSett = Settings.findOne();
-    if(currSett && currSett != undefined && currSett.disableRegistration && currSett.mailDomaineName !== undefined && currSett.mailDomaineName != ""){
+    if(currSett && currSett != undefined && currSett.disableRegistration && currSett.mailDomainName !== undefined && currSett.mailDomainName != ""){
       currentUser = Meteor.user();
       if (currentUser) {
         let found = false;
         for(let i = 0; i < currentUser.emails.length; i++) {
-          if(currentUser.emails[i].address.endsWith(currSett.mailDomaineName)){
+          if(currentUser.emails[i].address.endsWith(currSett.mailDomainName)){
             found = true;
             break;
           }

+ 1 - 1
models/settings.js

@@ -88,7 +88,7 @@ Settings.attachSchema(
       type: String,
       optional: true,
     },
-    mailDomaineName: {
+    mailDomainName: {
       type: String,
       optional: true,
     },

+ 1 - 1
server/publications/settings.js

@@ -25,7 +25,7 @@ Meteor.publish('setting', () => {
         defaultAuthenticationMethod: 1,
         spinnerName: 1,
         oidcBtnText: 1,
-        mailDomaineName: 1,
+        mailDomainName: 1,
       },
     },
   );