From 6512e174540acb1768626e4f66e123eb0599bcc8 Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Wed, 13 Nov 2013 23:36:18 -0800 Subject: [PATCH] translations: temporarily using locales_new so we can work with existing PRs (@paglias). I want to merge to develop sooner-than-later to avoid near-future conflicts. Pushing to beta --- locales_new/en/app.json | 2 +- src/middleware.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/locales_new/en/app.json b/locales_new/en/app.json index 76791eb5da..049aae4458 100644 --- a/locales_new/en/app.json +++ b/locales_new/en/app.json @@ -2,6 +2,6 @@ "languageName": "English", "removeAds": "Remove Ads", "clientSideStrings": { - "removeAds": "Remove Ads Client Side" + "removeAds": "Remove Ads" } } \ No newline at end of file diff --git a/src/middleware.js b/src/middleware.js index 607520599c..8d008e2056 100644 --- a/src/middleware.js +++ b/src/middleware.js @@ -85,7 +85,7 @@ var translations = {}; var setUpTranslations = function(locale){ var t = translations[locale] = {}; - t.server = require(path.join(__dirname, "/../locales/", locale, 'app.json')); + t.server = require(path.join(__dirname, "/../locales_new/", locale, 'app.json')); t.client = t.server.clientSideStrings; delete t.server.clientSideStrings; _.merge(t.server, t.client); @@ -94,7 +94,7 @@ var setUpTranslations = function(locale){ // First fetch english so we can merge with missing strings in other languages setUpTranslations('en'); -fs.readdirSync(path.join(__dirname, "/../locales")).forEach(function(file) { +fs.readdirSync(path.join(__dirname, "/../locales_new")).forEach(function(file) { if(file === 'en') return; setUpTranslations(file); // Merge missing strings from english