From 39f2837838ba30ec02bfe9f33c9fa0dfca05d1a6 Mon Sep 17 00:00:00 2001
From: lkisme <lkisme@me.com>
Date: Sun, 26 Feb 2017 21:11:15 +0800
Subject: wording change, email sending optimization, add texts to i18n

---
 models/settings.js |  6 +++---
 models/users.js    | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'models')

diff --git a/models/settings.js b/models/settings.js
index b160c2a4..b9ff1b37 100644
--- a/models/settings.js
+++ b/models/settings.js
@@ -1,7 +1,7 @@
 Settings = new Mongo.Collection('settings');
 
 Settings.attachSchema(new SimpleSchema({
-  strict: {
+  disableRegistration: {
     type: Boolean,
   },
   'mailServer.username': {
@@ -23,7 +23,7 @@ Settings.attachSchema(new SimpleSchema({
   'mailServer.from': {
     type: String,
     optional: true,
-    defaultValue: 'Kanban',
+    defaultValue: 'Wekan',
   },
   createdAt: {
     type: Date,
@@ -56,7 +56,7 @@ if (Meteor.isServer) {
     const setting = Settings.findOne({});
     if(!setting){
       const now = new Date();
-      const defaultSetting = {strict: false, mailServer: {
+      const defaultSetting = {disableRegistration: false, mailServer: {
         username: '', password:'', host: '', port:'', from: '',
       }, createdAt: now, modifiedAt: now};
       Settings.insert(defaultSetting);
diff --git a/models/users.js b/models/users.js
index c7db8fff..b77c7a84 100644
--- a/models/users.js
+++ b/models/users.js
@@ -348,7 +348,7 @@ if (Meteor.isServer) {
         if (user._id === inviter._id) throw new Meteor.Error('error-user-notAllowSelf');
       } else {
         if (posAt <= 0) throw new Meteor.Error('error-user-doesNotExist');
-        if (Settings.findOne().strict) throw new Meteor.Error('error-user-notCreated');
+        if (Settings.findOne().disableRegistration) throw new Meteor.Error('error-user-notCreated');
         const email = username;
         username = email.substring(0, posAt);
         const newUserId = Accounts.createUser({ username, email });
@@ -395,8 +395,8 @@ if (Meteor.isServer) {
       user.isAdmin = true;
       return user;
     }
-    const strict = Settings.findOne().strict;
-    if (!strict) {
+    const disableRegistration = Settings.findOne().disableRegistration;
+    if (!disableRegistration) {
       return user;
     }
 
@@ -484,8 +484,8 @@ if (Meteor.isServer) {
   Users.after.insert((userId, doc) => {
 
     //invite user to corresponding boards
-    const strict = Settings.findOne().strict;
-    if (strict) {
+    const disableRegistration = Settings.findOne().disableRegistration;
+    if (disableRegistration) {
       const user = Users.findOne(doc._id);
       const invitationCode = InvitationCodes.findOne({code: user.profile.icode, valid:true});
       if (!invitationCode) {
-- 
cgit v1.2.3-1-g7c22