Skip to content

Commit

Permalink
model intl
Browse files Browse the repository at this point in the history
  • Loading branch information
luiseduardobrito committed Sep 25, 2013
1 parent ccbe908 commit 8ed3f0f
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 12 deletions.
23 changes: 12 additions & 11 deletions api/adapters/model.js
Original file line number Diff line number Diff line change
Expand Up @@ -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.");
}
}

Expand All @@ -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.");
}
}

Expand Down Expand Up @@ -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]);
}
Expand All @@ -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());
}
}

Expand Down Expand Up @@ -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());
}
}
}
Expand Down Expand Up @@ -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
Expand All @@ -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);
});
Expand All @@ -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);
});
Expand Down Expand Up @@ -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++) {
Expand Down
2 changes: 1 addition & 1 deletion config/general.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module.exports = {

state: "development",
lang: "en-US",
lang: "pt-BR",

development: {

Expand Down
15 changes: 15 additions & 0 deletions language/en-US.js
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
15 changes: 15 additions & 0 deletions language/pt-BR.js
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down

0 comments on commit 8ed3f0f

Please sign in to comment.