From 8ed3f0fc96d175a974a22d654005808282f15b4c Mon Sep 17 00:00:00 2001 From: Luis Eduardo Brito Date: Tue, 24 Sep 2013 21:08:44 -0300 Subject: [PATCH] model intl --- api/adapters/model.js | 23 ++++++++++++----------- config/general.js | 2 +- language/en-US.js | 15 +++++++++++++++ language/pt-BR.js | 15 +++++++++++++++ 4 files changed, 43 insertions(+), 12 deletions(-) diff --git a/api/adapters/model.js b/api/adapters/model.js index ba804c6..5971c64 100644 --- a/api/adapters/model.js +++ b/api/adapters/model.js @@ -269,7 +269,8 @@ var Model = function(type) { } catch(e) { log.error(e) - throw new Error("Problem encrypting password using " + (method || "sha256") + " algorithm."); + throw new Error((lang.model.encryption_error + "." || "Problem encrypting string." ) + + " Method: " + (method || "sha256") + " algorithm."); } } @@ -283,7 +284,7 @@ var Model = function(type) { return buf.toString('base64'); } catch (e) { - throw new Error("Problem generating random hash."); + throw new Error(lang.model.hash_error || "Problem generating random hash."); } } @@ -311,7 +312,7 @@ var Model = function(type) { try { if(!type.get(model[k].type)) - throw new Error("Specified type is not recognized ("+model[k].type+")") + throw new Error((lang.type.unknown || "Specified type is not recognized") + "("+model[k].type+")") type.get(model[k].type).check(obj[k]); } @@ -321,7 +322,7 @@ var Model = function(type) { if(model[k].default) obj[k] = generate_default(model[k].default) else - throw new Error("Could not parse required field '" + k + "'. " + e.message.toString()); + throw new Error((lang.model.validation_error || "Could not parse required field") + " '" + k + "'. " + e.message.toString()); } } @@ -356,7 +357,7 @@ var Model = function(type) { } catch(e) { - throw new Error("Could not parse required field '" + k + "'. " + e.message.toString()); + throw new Error((lang.model.validation_error || "Could not parse required field") + " '" + k + "'. " + e.message.toString()); } } } @@ -403,11 +404,11 @@ var Model = function(type) { cb = cb || function(){}; if(!obj._model || obj._model == null || obj._model == "") { - throw new Error("Object provided is not from any framework model, we can't persist it"); + throw new Error(lang.model.not_from_framework || "Object provided is not from any framework model, we can't persist it"); } if(!obj._id) { - throw new Error("Object provided has none primary key, the default '_id' was removed"); + throw new Error(lang.model.not_primary_key || "Object provided has none primary key, the default '_id' was removed"); } // ensure encryption @@ -424,14 +425,14 @@ var Model = function(type) { }, function(err, docs) { if(err) - throw new Error("Problem querying database. " + err.message.toString()); + throw new Error((lang.database.query_error || "Problem querying database") +". "+ err.message.toString()); if(!docs || docs.length == 0) { db.save(obj, function(err, obj){ if(err) - throw new Error("Problem querying database. " + err.message.toString()); + throw new Error((lang.database.query_error || "Problem querying database") +". "+ err.message.toString()); cb(true); }); @@ -444,7 +445,7 @@ var Model = function(type) { }, obj, {multi:false}, function(err) { if(err) - throw new Error("Problem querying database. " + err.message.toString()); + throw new Error((lang.database.query_error || "Problem querying database") +". "+ err.message.toString()); cb(true); }); @@ -474,7 +475,7 @@ var Model = function(type) { db.find(rest, function(err, docs) { if(err) { - throw new Error("Problem querying database: "+err) + throw new Error((lang.database.query_error || "Problem querying database") +". "+ err.toString()); } for(var i = 0; i < docs.length; i++) { diff --git a/config/general.js b/config/general.js index e924246..9cc9381 100644 --- a/config/general.js +++ b/config/general.js @@ -1,7 +1,7 @@ module.exports = { state: "development", - lang: "en-US", + lang: "pt-BR", development: { diff --git a/language/en-US.js b/language/en-US.js index 199cbda..79684d9 100644 --- a/language/en-US.js +++ b/language/en-US.js @@ -24,6 +24,8 @@ module.exports = { type: { + unknown: "Specified type is not recognized", + // validation errors not_null: "The input should not be null", not_numeric: "Input is not a number", @@ -37,6 +39,19 @@ module.exports = { not_array: "The input is not a valid array", }, + model: { + + encryption_error: "Problem encrypting string", + hash_error: "Problem generating random hash", + validation_error: "Problem parsing required field", + not_from_framework: "Object provided is not from any framework model, we can't persist it", + not_primary_key: "Object provided has none primary key, the default '_id' was removed" + }, + + database: { + query_error: "Problem querying database" + }, + user: { email_registered: "Email already registered", diff --git a/language/pt-BR.js b/language/pt-BR.js index f293f4e..8d379d8 100644 --- a/language/pt-BR.js +++ b/language/pt-BR.js @@ -25,6 +25,8 @@ module.exports = { type: { + unknown: "O tipo especificado não é válido ou não está presente no sistema", + // validation errors not_null: "O valor não pode ser nulo", not_numeric: "O valor especificado não é numérico", @@ -38,6 +40,19 @@ module.exports = { not_array: "O valor especificado não é uma lista", }, + model: { + + encryption_error: "Erro ao encriptar o campo especificado", + hash_error: "Erro ao gerar o hash", + validation_error: "Erro ao validar o campo", + not_from_framework: "O objeto especificado não é um Model válido, não é possível salvá-lo no banco", + not_primary_key: "O objeto especificado não possui uma chave primária válida, o _id foi removido" + }, + + database: { + query_error: "Erro ao conectar ao banco de dados" + }, + user: { email_registered: "Email já registrado no sistema",