Add globalization

Author: 0candy

browser/current-context.js

@@ -3,13 +3,17 @@
 // This file is licensed under the MIT License.
 // License text available at https://opensource.org/licenses/MIT
 
+var path = require('path');
+var SG = require('strong-globalize');
+var g = SG();
+
 module.exports = function(loopback) {
   loopback.getCurrentContext = function() {
     return null;
   };
 
   loopback.runInContext =
   loopback.createContext = function() {
-    throw new Error('Current context is not supported in the browser.');
+    throw new Error(g.f('Current context is not supported in the browser.'));
   };
 };

common/models/access-token.js

@@ -7,6 +7,10 @@
  * Module Dependencies.
  */
 
+var path = require('path');
+var SG = require('strong-globalize');
+var g = SG();
+
 var loopback = require('../../lib/loopback');
 var assert = require('assert');
 var uid = require('uid2');
@@ -111,7 +115,7 @@ module.exports = function(AccessToken) {
             } else if (isValid) {
               cb(null, token);
             } else {
-              var e = new Error('Invalid Access Token');
+              var e = new Error(g.f('Invalid Access Token'));
               e.status = e.statusCode = 401;
               e.code = 'INVALID_TOKEN';
               cb(e);

common/models/acl.js

@@ -36,6 +36,10 @@
 
  */
 
+var path = require('path');
+var SG = require('strong-globalize');
+var g = SG();
+
 var loopback = require('../../lib/loopback');
 var async = require('async');
 var assert = require('assert');
@@ -536,7 +540,7 @@ module.exports = function(ACL) {
         break;
       default:
         process.nextTick(function() {
-          var err = new Error('Invalid principal type: ' + type);
+          var err = new Error(g.f('Invalid principal type: ', type));
           err.statusCode = 400;
           cb(err);
         });

common/models/change.js

@@ -7,6 +7,10 @@
  * Module Dependencies.
  */
 
+var path = require('path');
+var SG = require('strong-globalize');
+var g = SG();
+
 var PersistedModel = require('../../lib/loopback').PersistedModel;
 var loopback = require('../../lib/loopback');
 var utils = require('../../lib/utils');
@@ -110,7 +114,7 @@ module.exports = function(Change) {
           })
           .join('\n');
 
-        var msg = 'Cannot rectify ' + modelName + ' changes:\n' + desc;
+        var msg = g.f('Cannot rectify %s changes:\n%s', modelName, desc);
         err = new Error(msg);
         err.details = { errors: errors };
         return callback(err);

common/models/email.js

@@ -15,6 +15,10 @@
  * @inherits {Model}
  */
 
+var path = require('path');
+var SG = require('strong-globalize');
+var g = SG();
+
 module.exports = function(Email) {
   /**
    * Send an email with the given `options`.
@@ -43,13 +47,13 @@ module.exports = function(Email) {
    */
 
   Email.send = function() {
-    throw new Error('You must connect the Email Model to a Mail connector');
+    throw new Error(g.f('You must connect the Email Model to a Mail connector'));
   };
 
   /**
    * A shortcut for Email.send(this).
    */
   Email.prototype.send = function() {
-    throw new Error('You must connect the Email Model to a Mail connector');
+    throw new Error(g.f('You must connect the Email Model to a Mail connector'));
   };
 };

common/models/user.js

@@ -7,9 +7,12 @@
  * Module Dependencies.
  */
 
+var path = require('path');
+var SG = require('strong-globalize');
+var g = SG();
+
 var loopback = require('../../lib/loopback');
 var utils = require('../../lib/utils');
-var path = require('path');
 var SALT_WORK_FACTOR = 10;
 var crypto = require('crypto');
 
@@ -203,22 +206,22 @@ module.exports = function(User) {
       realmDelimiter);
 
     if (realmRequired && !query.realm) {
-      var err1 = new Error('realm is required');
+      var err1 = new Error(g.f('realm is required'));
       err1.statusCode = 400;
       err1.code = 'REALM_REQUIRED';
       fn(err1);
       return fn.promise;
     }
     if (!query.email && !query.username) {
-      var err2 = new Error('username or email is required');
+      var err2 = new Error(g.f('username or email is required'));
       err2.statusCode = 400;
       err2.code = 'USERNAME_EMAIL_REQUIRED';
       fn(err2);
       return fn.promise;
     }
 
     self.findOne({ where: query }, function(err, user) {
-      var defaultError = new Error('login failed');
+      var defaultError = new Error(g.f('login failed'));
       defaultError.statusCode = 401;
       defaultError.code = 'LOGIN_FAILED';
 
@@ -248,7 +251,7 @@ module.exports = function(User) {
             if (self.settings.emailVerificationRequired && !user.emailVerified) {
               // Fail to log in if email verification is not done yet
               debug('User email has not been verified');
-              err = new Error('login failed as the email has not been verified');
+              err = new Error(g.f('login failed as the email has not been verified'));
               err.statusCode = 401;
               err.code = 'LOGIN_FAILED_EMAIL_NOT_VERIFIED';
               fn(err);
@@ -295,7 +298,7 @@ module.exports = function(User) {
       } else if (accessToken) {
         accessToken.destroy(fn);
       } else {
-        fn(new Error('could not find accessToken'));
+        fn(new Error(g.f('could not find accessToken')));
       }
     });
     return fn.promise;
@@ -432,10 +435,14 @@ module.exports = function(User) {
 
       options.text = options.text.replace(/\{href\}/g, options.verifyHref);
 
+      options.text = g.f(options.text);
+
       options.to = options.to || user.email;
 
       options.subject = options.subject || 'Thanks for Registering';
 
+      options.subject = g.f(options.subject);
+
       options.headers = options.headers || {};
 
       var template = loopback.template(options.template);
@@ -496,11 +503,11 @@ module.exports = function(User) {
           });
         } else {
           if (user) {
-            err = new Error('Invalid token: ' + token);
+            err = new Error(g.f('Invalid token: %s', token));
             err.statusCode = 400;
             err.code = 'INVALID_TOKEN';
           } else {
-            err = new Error('User not found: ' + uid);
+            err = new Error(g.f('User not found: %s', uid));
             err.statusCode = 404;
             err.code = 'USER_NOT_FOUND';
           }
@@ -529,7 +536,7 @@ module.exports = function(User) {
 
     options = options || {};
     if (typeof options.email !== 'string') {
-      var err = new Error('Email is required');
+      var err = new Error(g.f('Email is required'));
       err.statusCode = 400;
       err.code = 'EMAIL_REQUIRED';
       cb(err);
@@ -541,7 +548,7 @@ module.exports = function(User) {
         return cb(err);
       }
       if (!user) {
-        err = new Error('Email not found');
+        err = new Error(g.f('Email not found'));
         err.statusCode = 404;
         err.code = 'EMAIL_NOT_FOUND';
         return cb(err);
@@ -577,7 +584,7 @@ module.exports = function(User) {
     if (typeof plain === 'string' && plain) {
       return true;
     }
-    var err =  new Error('Invalid password: ' + plain);
+    var err =  new Error(g.f('Invalid password: %s', plain));
     err.statusCode = 422;
     throw err;
   };
@@ -636,20 +643,21 @@ module.exports = function(User) {
     UserModel.remoteMethod(
       'login',
       {
-        description: 'Login a user with username/email and password.',
+        description: g.f('Login a user with username/email and password.'),
         accepts: [
           { arg: 'credentials', type: 'object', required: true, http: { source: 'body' }},
           { arg: 'include', type: ['string'], http: { source: 'query' },
-            description: 'Related objects to include in the response. ' +
-            'See the description of return value for more details.' },
+            description: g.f('Related objects to include in the response. ' +
+            'See the description of return value for more details.') },
         ],
         returns: {
           arg: 'accessToken', type: 'object', root: true,
           description:
-            'The response body contains properties of the AccessToken created on login.\n' +
+            g.f('The response body contains properties of the AccessToken created on login.\n' +
             'Depending on the value of `include` parameter, the body may contain ' +
             'additional properties:\n\n' +
-            '  - `user` - `{User}` - Data of the currently logged in user. (`include=user`)\n\n',
+            '  - `user` - `U+007BUserU+007D` - Data of the currently logged in user. ' +
+            '(`include=user`)\n\n'),
         },
         http: { verb: 'post' },
       }
@@ -658,16 +666,16 @@ module.exports = function(User) {
     UserModel.remoteMethod(
       'logout',
       {
-        description: 'Logout a user with access token.',
+        description: g.f('Logout a user with access token.'),
         accepts: [
           { arg: 'access_token', type: 'string', required: true, http: function(ctx) {
             var req = ctx && ctx.req;
             var accessToken = req && req.accessToken;
             var tokenID = accessToken && accessToken.id;
 
             return tokenID;
-          }, description: 'Do not supply this argument, it is automatically extracted ' +
-            'from request headers.',
+          }, description: g.f('Do not supply this argument, it is automatically extracted ' +
+            'from request headers.'),
           },
         ],
         http: { verb: 'all' },
@@ -677,7 +685,7 @@ module.exports = function(User) {
     UserModel.remoteMethod(
       'confirm',
       {
-        description: 'Confirm a user registration with email verification token.',
+        description: g.f('Confirm a user registration with email verification token.'),
         accepts: [
           { arg: 'uid', type: 'string', required: true },
           { arg: 'token', type: 'string', required: true },
@@ -690,7 +698,7 @@ module.exports = function(User) {
     UserModel.remoteMethod(
       'resetPassword',
       {
-        description: 'Reset password for a user with email.',
+        description: g.f('Reset password for a user with email.'),
         accepts: [
           { arg: 'options', type: 'object', required: true, http: { source: 'body' }},
         ],
@@ -701,7 +709,7 @@ module.exports = function(User) {
     UserModel.afterRemote('confirm', function(ctx, inst, next) {
       if (ctx.args.redirect !== undefined) {
         if (!ctx.res) {
-          return next(new Error('The transport does not support HTTP redirects.'));
+          return next(new Error(g.f('The transport does not support HTTP redirects.')));
         }
         ctx.res.location(ctx.args.redirect);
         ctx.res.status(302);
@@ -719,7 +727,7 @@ module.exports = function(User) {
     // email validation regex
     var re = /^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
 
-    UserModel.validatesFormatOf('email', { with: re, message: 'Must provide a valid email' });
+    UserModel.validatesFormatOf('email', { with: re, message: g.f('Must provide a valid email') });
 
     // FIXME: We need to add support for uniqueness of composite keys in juggler
     if (!(UserModel.settings.realmRequired || UserModel.settings.realmDelimiter)) {

example/client-server/client.js

@@ -3,6 +3,10 @@
 // This file is licensed under the MIT License.
 // License text available at https://opensource.org/licenses/MIT
 
+var path = require('path');
+var SG = require('strong-globalize');
+var g = SG();
+
 var loopback = require('../../');
 var client = loopback();
 var CartItem = require('./models').CartItem;
@@ -16,10 +20,10 @@ CartItem.attachTo(remote);
 
 // call the remote method
 CartItem.sum(1, function(err, total) {
-  console.log('result:', err || total);
+  g.log('result:', err || total);
 });
 
 // call a built in remote method
 CartItem.find(function(err, items) {
-  console.log(items);
+  g.log(items);
 });

example/colors/app.js

@@ -3,6 +3,10 @@
 // This file is licensed under the MIT License.
 // License text available at https://opensource.org/licenses/MIT
 
+var path = require('path');
+var SG = require('strong-globalize');
+var g = SG();
+
 var loopback = require('../../');
 var app = loopback();
 
@@ -22,4 +26,4 @@ Color.create({ name: 'blue' });
 
 app.listen(3000);
 
-console.log('a list of colors is available at http://localhost:3000/colors');
+g.log('a list of colors is available at http://localhost:3000/colors');

example/context/app.js

@@ -3,6 +3,10 @@
 // This file is licensed under the MIT License.
 // License text available at https://opensource.org/licenses/MIT
 
+var path = require('path');
+var SG = require('strong-globalize');
+var g = SG();
+
 var loopback = require('../../');
 var app = loopback();
 
@@ -22,13 +26,13 @@ var Color = loopback.createModel('color', { 'name': String });
 Color.beforeRemote('**', function(ctx, unused, next) {
   // Inside LoopBack code, you can read the property from the context
   var ns = loopback.getCurrentContext();
-  console.log('Request to host', ns && ns.get('host'));
+  g.log('Request to host', ns && ns.get('host'));
   next();
 });
 
 app.dataSource('db', { connector: 'memory' });
 app.model(Color, { dataSource: 'db' });
 
 app.listen(3000, function() {
-  console.log('A list of colors is available at http://localhost:3000/colors');
+  g.log('A list of colors is available at http://localhost:3000/colors');
 });