From 3edd37f537b5c12f98ecc8757e67ec3362bc9609 Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Thu, 8 May 2014 13:56:01 -0600 Subject: [PATCH] fix(mobile): export i18n for mobile so it can temporarily use en translations --- src/i18n.js | 13 ++++++++++++- src/middleware.js | 7 ------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/i18n.js b/src/i18n.js index 5ea96380af..cdb4319090 100644 --- a/src/i18n.js +++ b/src/i18n.js @@ -94,4 +94,15 @@ module.exports = { langCodes: langCodes, getUserLanguage: getUserLanguage, momentLangs: momentLangs -}; \ No newline at end of file +}; + + +// Export en strings only, temporary solution for mobile +// This is copied from middleware.js#module.exports.locals#t() +module.exports.enTranslations = function(){ // stringName and vars are the allowed parameters + var language = _.find(avalaibleLanguages, {code: 'en'}); + //language.momentLang = ((!isStaticPage && i18n.momentLangs[language.code]) || undefined); + var args = Array.prototype.slice.call(arguments, 0); + args.push(language.code); + return shared.i18n.t.apply(null, args); +}; diff --git a/src/middleware.js b/src/middleware.js index 79df5f8608..941379723b 100644 --- a/src/middleware.js +++ b/src/middleware.js @@ -170,10 +170,3 @@ module.exports.locals = function(req, res, next) { next(); } - -module.exports.enTranslations = function(stringName, vars){ - var language = {code:'en'}; - var string = translations[language.code][stringName]; - if(!string) return _.template(translations[language.code].stringNotFound, {string: stringName}); - return vars === undefined ? string : _.template(string, vars); -};