Merge pull request #1035 from strongloop/globalization_fixup

Fixup globalization

intl/en/messages.json

@@ -5,16 +5,24 @@
   "e6161ae8459c79d810e2aa9d21282a39": "You must provide an {{id}} when updating attributes!",
   "fca4d12faff1035d9d0438d73432571b": "Duplicate entry for {0}.{1}",
   "09483e03b91c8bd58732a74b3ef1ec13": "Invalid date: {0}",
+  "0b16d3ffc42f91b4b9a4b3b50c41c838": "The order {0} is not valid",
   "0e88a84c6bc2638fbcc5d3ea95181f99": "Unknown property: {0}",
+  "21095484501dbff31af6556fa6039182": "The {{offset/skip}} parameter {0} is not valid",
   "416dfbb7b823f51c9f3800be81060b41": "No instance with {{id}} {0} found for {1}",
+  "4e31b1edd10dadb724d83387de0b5062": "The {{limit}} parameter {0} is not valid",
   "5ec8efeb715a2c34b440f2d76e2cf87d": "  {0}",
+  "62a2d80c405b7fec5f547c448ab1b6ff": "The {{order}} {0} has invalid direction",
+  "63f503acabdc4c7588aab741b8466862": "The {0} property has invalid clause {1}",
   "6c3234937d69763fc7f6bcafccc59bbc": "{{Model::deleteById}} requires the {{id}} argument",
   "6eb6fd4fbd73394000bc25f5776fd20c": "{{Model::exists}} requires the {{id}} argument",
   "7bbbdece4eea90e42aa5c0bce295e503": "{{Model::findById}} requires the {{id}} argument",
+  "9da58ab4555ac50f4999883de6470d7d": "The {0} operator has invalid clauses {1}",
   "a829dee089c912e68c18920ba015400c": "WARNING: {{id}} property cannot be changed from {0} to {1} for model:{2} in {{'loaded'}} operation hook",
   "a984a076c59e451948b2bcf7a393d860": "WARNING: {{id}} property cannot be changed from {0} to {1} for model:{2} in {{'before save'}} operation hook",
+  "baf2c8b0c5a574b8a894e9b6304fece1": "The where clause {0} is not an {{object}}",
   "db03083e9a768388fdbee865249ac67a": "Ignoring validation errors in {{updateOrCreate()}}:",
   "e4434de4bb8f5a3cd1d416e4d80d7e0b": "Unknown \"{0}\" {{id}} \"{1}\".",
+  "e54f118a75e15e132f16b985274eb46d": "The query filter {0} is not an {{object}}",
   "f6e8c96c93b9c7687d6c172b3695e898": "{{id}} property ({0}) cannot be updated from {1} to {2}",
   "0be2d39d225b1d8b2a0f92ad5c65c9ac": "No model specified for {{polymorphic}} {0}: {1}",
   "0c4eb8b6c2ff6e51d7e195eee346ced9": "Table '{0}' does not exist.",
@@ -29,8 +37,10 @@
   "ec42dca074f1818c447f7ad16e2d01af": "{0} is not provided by the attached connector",
   "ba0fd8106eb54de4d003a844206431fd": "Model hook \"{0}\" is deprecated, use Operation hooks instead. {{http://docs.strongloop.com/display/LB/Operation+hooks}}",
   "280f4550f90e133118955ec6f6f72830": "Discriminator type {0} specified but no model exists with such name",
-  "83abbb3ad105947dccbb21b4cf41e98f": "{{Relation.modelTo}} is not defined for relation {0} and is no polymorphic",
+  "38dbf42c29a4645238cc3d632e88ebc9": "{{Relation.modelTo}} is not defined for relation {0} and is no {{polymorphic}}",
   "eb56c2b0c30cf006e2df00a549ec9c2c": "Relation \"{0}\" is not defined for {1} model",
+  "938401ea4ce48159efa9be1d4a5e8bab": "Items must be an array: {0}",
+  "f41bd91dc0f000a79c0bf842f1b7fdf9": "could not create List from JSON string: {0}",
   "514985b2327f061ffb1c932f6b909979": "Model {0} is not defined.",
   "8091838319a5cc7d6a34af2f2a616ce9": "Property name should not be \"{{constructor}}\" in Model: {0}",
   "da02dd6c53d4148320eeb31718a7aebe": "Invalid type for property {0}",

lib/dao.js

@@ -1302,7 +1302,7 @@ DataAccessObject._normalize = function(filter) {
           fields.push(token);
         }
       } else {
-        err = new Error('The order %j is not valid', order[i]);
+        err = new Error(g.f('The order %j is not valid', order[i]));
         err.statusCode = 400;
         throw err;
       }

lib/datasource.js

@@ -327,7 +327,7 @@ DataSource.prototype.setup = function(name, settings) {
         this.emit('connected');
       } else {
         // The connection fails, let's report it and hope it will be recovered in the next call
-        console.error(g.f('Connection fails: %s\nIt will be retried for the next request.', err));
+        g.error('Connection fails: %s\nIt will be retried for the next request.', err);
         this.emit('error', err);
         this.connecting = false;
       }

lib/include.js

@@ -303,7 +303,7 @@ Inclusion.include = function(objects, include, options, cb) {
     //}
     if (!relation.modelTo) {
       if (!relation.polymorphic) {
-        cb(new Error(g.f('{{Relation.modelTo}} is not defined for relation %s and is no polymorphic',
+        cb(new Error(g.f('{{Relation.modelTo}} is not defined for relation %s and is no {{polymorphic}}',
           relationName)));
         return;
       }

package.json

@@ -46,7 +46,7 @@
     "loopback-connector": "^2.1.0",
     "node-uuid": "^1.4.2",
     "qs": "^3.1.0",
-    "strong-globalize": "^2.6.0",
+    "strong-globalize": "^2.6.2",
     "traverse": "^0.6.6"
   },
   "license": "MIT"