Revert globalization of Swagger descriptions

Author: bajtos

common/models/user.js

@@ -660,12 +660,12 @@ module.exports = function(User) {
     UserModel.remoteMethod(
       'login',
       {
-        description: g.f('Login a user with username/email and password.'),
+        description: '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: g.f('Related objects to include in the response. ' +
-            'See the description of return value for more details.') },
+            description: 'Related objects to include in the response. ' +
+            'See the description of return value for more details.' },
         ],
         returns: {
           arg: 'accessToken', type: 'object', root: true,
@@ -683,15 +683,15 @@ module.exports = function(User) {
     UserModel.remoteMethod(
       'logout',
       {
-        description: g.f('Logout a user with access token.'),
+        description: '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: g.f('Do not supply this argument, it is automatically extracted ' +
-            'from request headers.'),
+            }, description: 'Do not supply this argument, it is automatically extracted ' +
+            'from request headers.',
         },
         ],
         http: {verb: 'all'}
@@ -701,7 +701,7 @@ module.exports = function(User) {
     UserModel.remoteMethod(
       'confirm',
       {
-        description: g.f('Confirm a user registration with email verification token.'),
+        description: 'Confirm a user registration with email verification token.',
         accepts: [
           {arg: 'uid', type: 'string', required: true},
           {arg: 'token', type: 'string', required: true},
@@ -714,7 +714,7 @@ module.exports = function(User) {
     UserModel.remoteMethod(
       'resetPassword',
       {
-        description: g.f('Reset password for a user with email.'),
+        description: 'Reset password for a user with email.',
         accepts: [
           {arg: 'options', type: 'object', required: true, http: {source: 'body'}}
         ],

lib/model.js

@@ -13,6 +13,7 @@ var assert = require('assert');
 var RemoteObjects = require('strong-remoting');
 var SharedClass = require('strong-remoting').SharedClass;
 var extend = require('util')._extend;
+var format = require('util').format;
 
 module.exports = function(registry) {
 
@@ -452,7 +453,7 @@ module.exports = function(registry) {
       http: {verb: 'get', path: '/' + pathName},
       accepts: {arg: 'refresh', type: 'boolean', http: {source: 'query'}},
       accessType: 'READ',
-      description: g.f('Fetches belongsTo relation %s.', relationName),
+      description: format('Fetches belongsTo relation %s.', relationName),
       returns: {arg: relationName, type: modelName, root: true},
     }, fn);
   };
@@ -476,7 +477,7 @@ module.exports = function(registry) {
       isStatic: false,
       http: {verb: 'get', path: '/' + pathName},
       accepts: {arg: 'refresh', type: 'boolean', http: {source: 'query'}},
-      description: g.f('Fetches hasOne relation %s.', relationName),
+      description: format('Fetches hasOne relation %s.', relationName),
       accessType: 'READ',
       returns: {arg: relationName, type: relation.modelTo.modelName, root: true},
       rest: {after: convertNullToNotFoundError.bind(null, toModelName)}
@@ -486,7 +487,7 @@ module.exports = function(registry) {
       isStatic: false,
       http: {verb: 'post', path: '/' + pathName},
       accepts: {arg: 'data', type: toModelName, http: {source: 'body'}},
-      description: g.f('Creates a new instance in %s of this model.', relationName),
+      description: format('Creates a new instance in %s of this model.', relationName),
       accessType: 'WRITE',
       returns: {arg: 'data', type: toModelName, root: true}
     });
@@ -495,15 +496,15 @@ module.exports = function(registry) {
       isStatic: false,
       http: {verb: 'put', path: '/' + pathName},
       accepts: {arg: 'data', type: toModelName, http: {source: 'body'}},
-      description: g.f('Update %s of this model.', relationName),
+      description: format('Update %s of this model.', relationName),
       accessType: 'WRITE',
       returns: {arg: 'data', type: toModelName, root: true}
     });
 
     define('__destroy__' + relationName, {
       isStatic: false,
       http: {verb: 'delete', path: '/' + pathName},
-      description: g.f('Deletes %s of this model.', relationName),
+      description: format('Deletes %s of this model.', relationName),
       accessType: 'WRITE',
     });
   };
@@ -517,10 +518,10 @@ module.exports = function(registry) {
       isStatic: false,
       http: {verb: 'get', path: '/' + pathName + '/:fk'},
       accepts: {arg: 'fk', type: 'any',
-        description: g.f('Foreign key for %s', relationName),
+        description: format('Foreign key for %s', relationName),
         required: true,
         http: {source: 'path'}},
-      description: g.f('Find a related item by id for %s.', relationName),
+      description: format('Find a related item by id for %s.', relationName),
       accessType: 'READ',
       returns: {arg: 'result', type: toModelName, root: true},
       rest: {after: convertNullToNotFoundError.bind(null, toModelName)}
@@ -531,10 +532,10 @@ module.exports = function(registry) {
       isStatic: false,
       http: {verb: 'delete', path: '/' + pathName + '/:fk'},
       accepts: { arg: 'fk', type: 'any',
-        description: g.f('Foreign key for %s', relationName),
+        description: format('Foreign key for %s', relationName),
         required: true,
         http: {source: 'path'}},
-      description: g.f('Delete a related item by id for %s.', relationName),
+      description: format('Delete a related item by id for %s.', relationName),
       accessType: 'WRITE',
       returns: []
     }, destroyByIdFunc);
@@ -545,12 +546,12 @@ module.exports = function(registry) {
       http: {verb: 'put', path: '/' + pathName + '/:fk'},
       accepts: [
         {arg: 'fk', type: 'any',
-          description: g.f('Foreign key for %s', relationName),
+          description: format('Foreign key for %s', relationName),
           required: true,
           http: { source: 'path' }},
         {arg: 'data', type: toModelName, http: {source: 'body'}},
       ],
-      description: g.f('Update a related item by id for %s.', relationName),
+      description: format('Update a related item by id for %s.', relationName),
       accessType: 'WRITE',
       returns: {arg: 'result', type: toModelName, root: true}
     }, updateByIdFunc);
@@ -569,10 +570,10 @@ module.exports = function(registry) {
         isStatic: false,
         http: {verb: 'put', path: '/' + pathName + '/rel/:fk'},
         accepts: [{ arg: 'fk', type: 'any',
-          description: g.f('Foreign key for %s', relationName),
+          description: format('Foreign key for %s', relationName),
           required: true,
           http: {source: 'path'}}].concat(accepts),
-        description: g.f('Add a related item by id for %s.', relationName),
+        description: format('Add a related item by id for %s.', relationName),
         accessType: 'WRITE',
         returns: {arg: relationName, type: modelThrough.modelName, root: true}
       }, addFunc);
@@ -582,10 +583,10 @@ module.exports = function(registry) {
         isStatic: false,
         http: {verb: 'delete', path: '/' + pathName + '/rel/:fk'},
         accepts: {arg: 'fk', type: 'any',
-          description: g.f('Foreign key for %s', relationName),
+          description: format('Foreign key for %s', relationName),
           required: true,
           http: {source: 'path'}},
-        description: g.f('Remove the %s relation to an item by id.', relationName),
+        description: format('Remove the %s relation to an item by id.', relationName),
         accessType: 'WRITE',
         returns: []
       }, removeFunc);
@@ -597,10 +598,10 @@ module.exports = function(registry) {
         isStatic: false,
         http: {verb: 'head', path: '/' + pathName + '/rel/:fk'},
         accepts: {arg: 'fk', type: 'any',
-          description: g.f('Foreign key for %s', relationName),
+          description: format('Foreign key for %s', relationName),
           required: true,
           http: {source: 'path'}},
-        description: g.f('Check the existence of %s relation to an item by id.', relationName),
+        description: format('Check the existence of %s relation to an item by id.', relationName),
         accessType: 'READ',
         returns: {arg: 'exists', type: 'boolean', root: true},
         rest: {
@@ -643,7 +644,7 @@ module.exports = function(registry) {
       isStatic: isStatic,
       http: {verb: 'get', path: '/' + pathName},
       accepts: {arg: 'filter', type: 'object'},
-      description: g.f('Queries %s of %s.', scopeName, this.modelName),
+      description: format('Queries %s of %s.', scopeName, this.modelName),
       accessType: 'READ',
       returns: {arg: scopeName, type: [toModelName], root: true}
     });
@@ -652,24 +653,24 @@ module.exports = function(registry) {
       isStatic: isStatic,
       http: {verb: 'post', path: '/' + pathName},
       accepts: {arg: 'data', type: toModelName, http: {source: 'body'}},
-      description: g.f('Creates a new instance in %s of this model.', scopeName),
+      description: format('Creates a new instance in %s of this model.', scopeName),
       accessType: 'WRITE',
       returns: {arg: 'data', type: toModelName, root: true}
     });
 
     define('__delete__' + scopeName, {
       isStatic: isStatic,
       http: {verb: 'delete', path: '/' + pathName},
-      description: g.f('Deletes all %s of this model.', scopeName),
+      description: format('Deletes all %s of this model.', scopeName),
       accessType: 'WRITE',
     });
 
     define('__count__' + scopeName, {
       isStatic: isStatic,
       http: {verb: 'get', path: '/' + pathName + '/count'},
       accepts: {arg: 'where', type: 'object',
-        description: g.f('Criteria to match model instances')},
-      description: g.f('Counts %s of %s.', scopeName, this.modelName),
+        description: 'Criteria to match model instances'},
+      description: format('Counts %s of %s.', scopeName, this.modelName),
       accessType: 'READ',
       returns: {arg: 'count',  type: 'number'}
     });
@@ -718,7 +719,7 @@ module.exports = function(registry) {
         acceptArgs = [
           {
             arg: paramName, type: 'any', http: { source: 'path' },
-            description: g.f('Foreign key for %s.',  relation.name),
+            description: format('Foreign key for %s.',  relation.name),
             required: true,
           },
         ];