From 5abf02c6d1e6fcf1955cb5c0c18b37e0f6e2dba1 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 24 Sep 2013 14:55:46 -0400 Subject: [PATCH] default language, en --- public/language/TODO | 10 +++------- public/src/translator.js | 7 ++++--- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/public/language/TODO b/public/language/TODO index 42a405e1c1..f15cb142c1 100644 --- a/public/language/TODO +++ b/public/language/TODO @@ -1,7 +1,3 @@ -1. NPM INSTALL -For now, language packs will be stored here. Eventually, will be moved to server side to allow for npm installability. -When that happens, server code will generate compressed JSON language files in this folder. - - -2. SERVERSIDE METHODS -Allow server side code to call language.get(key) \ No newline at end of file +NPM INSTALL +For now, language packs will be stored here. Eventually, will be moved to server side to allow for npm install-ability. +When that happens, server code will generate compressed JSON language files in this folder. \ No newline at end of file diff --git a/public/src/translator.js b/public/src/translator.js index a1ebc017a8..28b3f01e17 100644 --- a/public/src/translator.js +++ b/public/src/translator.js @@ -13,6 +13,8 @@ * */ + var DEFAULT_LANGUAGE = 'en'; + var translator = {}, files = { loaded: {}, @@ -61,7 +63,6 @@ for (var key in keys) { if (keys.hasOwnProperty(key)) { - //check for additional variables then keys[key].split(/[,][?\s+]/); var variables = keys[key].split(/[,][?\s+]/); var parsedKey = keys[key].replace('[[', '').replace(']]', '').split(':'), @@ -119,7 +120,7 @@ files.loading[filename] = true; - jQuery.getJSON(RELATIVE_PATH + '/language/en/' + filename + '.json?v=' + timestamp, function (language) { + jQuery.getJSON(RELATIVE_PATH + '/language/' + DEFAULT_LANGUAGE + '/' + filename + '.json?v=' + timestamp, function (language) { files.loaded[filename] = language; if (callback) { @@ -142,7 +143,7 @@ path = require('path'), fs = require('fs'); - utils.walk(path.join(__dirname, '../../', 'public/language/en'), function (err, data) { + utils.walk(path.join(__dirname, '../../', 'public/language/' + DEFAULT_LANGUAGE), function (err, data) { var loaded = data.length; for (var d in data) {