From b5274a0d9117fb07bf69c5f91d3a2eef28650e08 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Fri, 20 Sep 2013 14:35:32 -0400 Subject: [PATCH 01/18] init --- public/language/TODO | 2 + public/language/en/global.json | 3 ++ public/language/en/login.json | 8 ++++ public/src/language.js | 12 ++++++ public/src/templates.js | 77 ++++++++++++++++++---------------- public/src/translator.js | 75 +++++++++++++++++++++++++++++++++ public/templates/header.tpl | 1 + public/templates/login.tpl | 20 ++++----- 8 files changed, 151 insertions(+), 47 deletions(-) create mode 100644 public/language/TODO create mode 100644 public/language/en/global.json create mode 100644 public/language/en/login.json create mode 100644 public/src/language.js create mode 100644 public/src/translator.js diff --git a/public/language/TODO b/public/language/TODO new file mode 100644 index 0000000000..2f9c2d6598 --- /dev/null +++ b/public/language/TODO @@ -0,0 +1,2 @@ +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. \ No newline at end of file diff --git a/public/language/en/global.json b/public/language/en/global.json new file mode 100644 index 0000000000..618afaaf2d --- /dev/null +++ b/public/language/en/global.json @@ -0,0 +1,3 @@ +{ + "home": "Home" +} \ No newline at end of file diff --git a/public/language/en/login.json b/public/language/en/login.json new file mode 100644 index 0000000000..f63e708750 --- /dev/null +++ b/public/language/en/login.json @@ -0,0 +1,8 @@ +{ + "login": "Login", + "username": "Username", + "password": "Password", + "remember_me": "Remember Me?", + "forgot_password": "Forgot Password?", + "alternative_logins": "Alternative Logins" +} \ No newline at end of file diff --git a/public/src/language.js b/public/src/language.js new file mode 100644 index 0000000000..8a2c610169 --- /dev/null +++ b/public/src/language.js @@ -0,0 +1,12 @@ +(function (module) { + + + + + + +})('undefined' === typeof module ? { + module: { + exports: {} + } +} : module); \ No newline at end of file diff --git a/public/src/templates.js b/public/src/templates.js index af6918935e..0528ce67dd 100644 --- a/public/src/templates.js +++ b/public/src/templates.js @@ -1,4 +1,4 @@ -(function(module) { +(function (module) { var config = {}, templates, @@ -12,11 +12,11 @@ fs = require('fs'); } catch (e) {} - templates.force_refresh = function(tpl) { + templates.force_refresh = function (tpl) { return !!config.force_refresh[tpl]; } - templates.get_custom_map = function(tpl) { + templates.get_custom_map = function (tpl) { if (config['custom_mapping'] && tpl) { for (var pattern in config['custom_mapping']) { if (tpl.match(pattern)) { @@ -28,11 +28,11 @@ return false; } - templates.is_available = function(tpl) { + templates.is_available = function (tpl) { return jQuery.inArray(tpl, available_templates) !== -1; }; - templates.ready = function(callback) { + templates.ready = function (callback) { if (callback == null) { if (this.ready_callback) { this.ready_callback(); @@ -48,7 +48,7 @@ } }; - templates.prepare = function(raw_tpl, data) { + templates.prepare = function (raw_tpl, data) { var template = {}; template.html = raw_tpl; template.parse = parse; @@ -62,10 +62,10 @@ var loaded = templatesToLoad.length; for (var t in templatesToLoad) { - (function(file) { - fs.readFile(__dirname + '/../templates/' + file + '.tpl', function(err, html) { - var template = function() { - this.toString = function() { + (function (file) { + fs.readFile(__dirname + '/../templates/' + file + '.tpl', function (err, html) { + var template = function () { + this.toString = function () { return this.html; }; } @@ -84,7 +84,7 @@ } function loadClient() { - jQuery.when(jQuery.getJSON(RELATIVE_PATH + '/templates/config.json'), jQuery.getJSON(RELATIVE_PATH + '/api/get_templates_listing')).done(function(config_data, templates_data) { + jQuery.when(jQuery.getJSON(RELATIVE_PATH + '/templates/config.json'), jQuery.getJSON(RELATIVE_PATH + '/api/get_templates_listing')).done(function (config_data, templates_data) { config = config_data[0]; available_templates = templates_data[0]; templates.ready(); @@ -96,11 +96,11 @@ } - templates.init = function(templates_to_load) { + templates.init = function (templates_to_load) { loadTemplates(templates_to_load || []); } - templates.getTemplateNameFromUrl = function(url) { + templates.getTemplateNameFromUrl = function (url) { var parts = url.split('?')[0].split('/'); for (var i = 0; i < parts.length; ++i) { @@ -112,7 +112,7 @@ } - templates.load_template = function(callback, url, template) { + templates.load_template = function (callback, url, template) { var location = document.location || window.location, rootUrl = location.protocol + '//' + (location.hostname || location.host) + (location.port ? ':' + location.port : ''); @@ -129,13 +129,13 @@ var template_data = null; - (function() { + (function () { var timestamp = new Date().getTime(); //debug if (!templates[tpl_url]) { - jQuery.get(RELATIVE_PATH + '/templates/' + tpl_url + '.tpl?v=' + timestamp, function(html) { - var template = function() { - this.toString = function() { + jQuery.get(RELATIVE_PATH + '/templates/' + tpl_url + '.tpl?v=' + timestamp, function (html) { + var template = function () { + this.toString = function () { return this.html; }; } @@ -154,9 +154,9 @@ }()); - (function() { + (function () { - jQuery.get(API_URL + api_url, function(data) { + jQuery.get(API_URL + api_url, function (data) { if (!data) { ajaxify.go('404'); @@ -165,7 +165,7 @@ template_data = data; parse_template(); - }).fail(function(data) { + }).fail(function (data) { template_data = {}; parse_template(); }); @@ -180,22 +180,25 @@ else template_data['relative_path'] = RELATIVE_PATH; - document.getElementById('content').innerHTML = templates[tpl_url].parse(template_data); - jQuery('#content [template-variable]').each(function(index, element) { + translator.translate(templates[tpl_url].parse(template_data), function (translatedTemplate) { + document.getElementById('content').innerHTML = translatedTemplate; + }); + + jQuery('#content [template-variable]').each(function (index, element) { var value = null; switch (element.getAttribute('template-type')) { - case 'boolean': - value = (element.value === 'true' || element.value === '1') ? true : false; - break; - case 'int': // Intentional fall-through - case 'integer': - value = parseInt(element.value); - break; - default: - value = element.value; - break; + case 'boolean': + value = (element.value === 'true' || element.value === '1') ? true : false; + break; + case 'int': // Intentional fall-through + case 'integer': + value = parseInt(element.value); + break; + default: + value = element.value; + break; } templates.set(element.getAttribute('template-variable'), value); @@ -208,20 +211,20 @@ } - templates.flush = function() { + templates.flush = function () { parsed_variables = {}; } - templates.get = function(key) { + templates.get = function (key) { return parsed_variables[key]; } - templates.set = function(key, value) { + templates.set = function (key, value) { parsed_variables[key] = value; } //modified from https://github.com/psychobunny/dcp.templates - var parse = function(data) { + var parse = function (data) { var self = this; function replace(key, value, template) { diff --git a/public/src/translator.js b/public/src/translator.js new file mode 100644 index 0000000000..b94b846c12 --- /dev/null +++ b/public/src/translator.js @@ -0,0 +1,75 @@ +(function (module) { + "use strict"; + /*global RELATIVE_PATH*/ + + var translator = {}, + loaded = {}; + + module.exports = translator; + + + translator.load = function (file, callback) { + if (loaded[file]) { + callback(loaded[file]); + } else { + var timestamp = new Date().getTime(); //debug + + jQuery.getJSON(RELATIVE_PATH + '/language/en/' + file + '.json?v=' + timestamp, function (language) { + loaded[file] = language; + callback(language); + }); + } + }; + + + + + translator.translate = function (data, callback) { + var keys = data.match(/\[\[.*?\]\]/g), + loading = 0; + + + for (var key in keys) { + if (keys.hasOwnProperty(key)) { + var parsedKey = keys[key].replace('[[', '').replace(']]', '').split(':'), + languageFile = parsedKey[0]; + + parsedKey = parsedKey[1]; + + if (loaded[languageFile]) { + data = data.replace(keys[key], loaded[file][parsedKey]); + } else { + loading++; + + (function (languageKey, parsedKey) { + translator.load(languageFile, function (languageData) { + data = data.replace(languageKey, languageData[parsedKey]); + loading--; + checkComplete(); + }); + }(keys[key], parsedKey)); + + } + } + + checkComplete(); + } + + function checkComplete() { + + if (loading === 0) { + callback(data); + } + } + + }; + + if ('undefined' !== typeof window) { + window.translator = module.exports; + } + +})('undefined' === typeof module ? { + module: { + exports: {} + } +} : module); \ No newline at end of file diff --git a/public/templates/header.tpl b/public/templates/header.tpl index 0efb66394d..a364ddcbd9 100644 --- a/public/templates/header.tpl +++ b/public/templates/header.tpl @@ -24,6 +24,7 @@ + diff --git a/public/templates/login.tpl b/public/templates/login.tpl index 4298194ee5..11d0b86566 100644 --- a/public/templates/login.tpl +++ b/public/templates/login.tpl @@ -1,9 +1,9 @@
  1. - +
  2. - Login + [[login:login]]
@@ -13,18 +13,18 @@
- +
- +
- +
@@ -33,14 +33,14 @@
-   Forgot Password? +   [[login:forgot_password]]
@@ -48,10 +48,10 @@
- +
-

Alternative Logins

+

[[login:alternative_logins]]

- +
From 35b40ef650c64e935944f46ba5d453f501c4e370 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Fri, 20 Sep 2013 17:03:30 -0400 Subject: [PATCH 07/18] internationalization: unread.tpl --- public/language/en/unread.json | 5 +++++ public/templates/unread.tpl | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 public/language/en/unread.json diff --git a/public/language/en/unread.json b/public/language/en/unread.json new file mode 100644 index 0000000000..f8d5ccfbc3 --- /dev/null +++ b/public/language/en/unread.json @@ -0,0 +1,5 @@ +{ + "no_unread_topics": "There are no unread topics.", + "mark_all_read": "Mark all as Read", + "load_more": "Load More" +} \ No newline at end of file diff --git a/public/templates/unread.tpl b/public/templates/unread.tpl index e44f479982..4131be1d1f 100644 --- a/public/templates/unread.tpl +++ b/public/templates/unread.tpl @@ -1,6 +1,6 @@
    -
  1. Home
    2. +
  2. [[global:home]]
  3. {category_name}
@@ -10,10 +10,10 @@
- There are no unread topics. + [[unread:no_unread_topics]]
- +
@@ -45,7 +45,7 @@ - +
From 5e89caf358cac0f83ee65645e62987c61fd238d7 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Fri, 20 Sep 2013 17:16:01 -0400 Subject: [PATCH 08/18] internationalization: topic.json --- public/language/en/global.json | 3 +- public/language/en/topic.json | 17 +++++++++++ public/src/translator.js | 4 +++ public/templates/topic.tpl | 54 +++++++++++++++++----------------- 4 files changed, 50 insertions(+), 28 deletions(-) diff --git a/public/language/en/global.json b/public/language/en/global.json index 618afaaf2d..6acd249cc6 100644 --- a/public/language/en/global.json +++ b/public/language/en/global.json @@ -1,3 +1,4 @@ { - "home": "Home" + "home": "Home", + "buttons.close": "Close" } \ No newline at end of file diff --git a/public/language/en/topic.json b/public/language/en/topic.json index d83049ef5c..a00c1e6f60 100644 --- a/public/language/en/topic.json +++ b/public/language/en/topic.json @@ -1,4 +1,21 @@ { + "profile": "Profile", + "chat": "Chat", + "notify_me": "Be notified of new replies in this topic", + "favourite": "Favourite", + "quote": "Quote", + "reply": "Reply", + "edit": "Edit", + "delete": "Delete", + "banned": "banned", + "link": "Link", + "thread_tools.title": "Thread Tools", + "thread_tools.pin": "Pin Thread", + "thread_tools.lock": "Lock Thread", + "thread_tools.move": "Move Thread", + "thread_tools.delete": "Delete Thread", + "load_categories": "Loading Categories", + "confirm_move": "Move", "favourites.not_logged_in.title": "Not Logged In", "favourites.not_logged_in.message": "Please log in in order to favourite this post" } \ No newline at end of file diff --git a/public/src/translator.js b/public/src/translator.js index 17d0cb030d..4e8bec7fdd 100644 --- a/public/src/translator.js +++ b/public/src/translator.js @@ -6,7 +6,11 @@ * TODO: * * 1. language en is hardcoded while system is developed. + * b. need to write fallback system to default language * 2. recursion needed when parsing language keys (ex. topics:modal.delete.title), right now json is all one level deep + * 3. server side settings for default language + * 4. user side settings for preferred language + * */ var translator = {}, diff --git a/public/templates/topic.tpl b/public/templates/topic.tpl index 2a5b329056..307e8fe11e 100644 --- a/public/templates/topic.tpl +++ b/public/templates/topic.tpl @@ -1,7 +1,7 @@
  1. - +
  2. @@ -32,27 +32,27 @@
- - + +
- - - + + +
@@ -82,7 +82,7 @@ - banned + [[topic:banned]]
@@ -94,26 +94,26 @@
- - + +
- - - + + +
@@ -142,16 +142,16 @@
- +
@@ -175,7 +175,7 @@

Move Thread

-

Loading Categories

+

[[topic:load_categories]]

-
From 5a10f7fcfe262ea31fdabbbc4472655ff588024a Mon Sep 17 00:00:00 2001 From: psychobunny Date: Fri, 20 Sep 2013 17:31:53 -0400 Subject: [PATCH 09/18] init variables in translator --- public/src/translator.js | 2 ++ public/templates/topic.tpl | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/public/src/translator.js b/public/src/translator.js index 4e8bec7fdd..bd38862c31 100644 --- a/public/src/translator.js +++ b/public/src/translator.js @@ -108,6 +108,8 @@ for (var key in keys) { if (keys.hasOwnProperty(key)) { + //check for additional variables then keys[key].split(/[,][?\s+]/); + var parsedKey = keys[key].replace('[[', '').replace(']]', '').split(':'), languageFile = parsedKey[0]; diff --git a/public/templates/topic.tpl b/public/templates/topic.tpl index 307e8fe11e..e1a13d95e6 100644 --- a/public/templates/topic.tpl +++ b/public/templates/topic.tpl @@ -27,7 +27,7 @@
- From c11920ac088afaf06f62befbc7345e872af29d5e Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 24 Sep 2013 13:22:10 -0400 Subject: [PATCH 10/18] internationalization: 404 and 403 --- public/language/en/global.json | 6 +++++- public/templates/403.tpl | 4 ++-- public/templates/404.tpl | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/public/language/en/global.json b/public/language/en/global.json index 6acd249cc6..bb73c3f6d0 100644 --- a/public/language/en/global.json +++ b/public/language/en/global.json @@ -1,4 +1,8 @@ { "home": "Home", - "buttons.close": "Close" + "buttons.close": "Close", + "403.title": "Access Denied", + "403.message": "You seem to have stumbled upon a page that you do not have access to. Perhaps you should try logging in?", + "404.title": "Not Found", + "404.message": "You seem to have stumbled upon a page that does not exist. Return to the home page." } \ No newline at end of file diff --git a/public/templates/403.tpl b/public/templates/403.tpl index 62b460deb3..46478a224c 100644 --- a/public/templates/403.tpl +++ b/public/templates/403.tpl @@ -1,4 +1,4 @@
- Access Denied -

You seem to have stumbled upon a page that you do not have access to. Perhaps you should try logging in?

+ [[global:403.title]] +

[[global:403.message]]

\ No newline at end of file diff --git a/public/templates/404.tpl b/public/templates/404.tpl index 1825280f6f..95cd1b9383 100644 --- a/public/templates/404.tpl +++ b/public/templates/404.tpl @@ -1,4 +1,4 @@
- Not found -

You seem to have stumbled upon a page that does not exist. Return to the home page

+ [[global:404.title]] +

[[global:404.message]]

\ No newline at end of file From 2d8e6bd98019246f450157739e4da275ecb75b99 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 24 Sep 2013 13:31:44 -0400 Subject: [PATCH 11/18] category language --- public/language/en/category.json | 7 +++++++ public/templates/category.tpl | 13 ++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) create mode 100644 public/language/en/category.json diff --git a/public/language/en/category.json b/public/language/en/category.json new file mode 100644 index 0000000000..73d3bef853 --- /dev/null +++ b/public/language/en/category.json @@ -0,0 +1,7 @@ +{ + "new_topic_button": "New Topic", + "no_topics": "There are no topics in this category.
Why don't you try posting one?", + "sidebar.recent_replies": "Recent Replies", + "sidebar.active_participants": "Active Participants", + "sidebar.moderators": "Moderators" +} \ No newline at end of file diff --git a/public/templates/category.tpl b/public/templates/category.tpl index 0a6a5f34f8..bbfd941de8 100644 --- a/public/templates/category.tpl +++ b/public/templates/category.tpl @@ -1,6 +1,6 @@
  1. - +
  2. {category_name} @@ -9,7 +9,7 @@
- +
  @@ -21,8 +21,7 @@
- There are no topics in this category.
- Why don't you try posting one? + [[category:no_topics]]
@@ -59,7 +58,7 @@
- Recent Replies + [[category:sidebar.recent_replies]]
    @@ -67,7 +66,7 @@
    - Active Participants + [[category:sidebar.active_participants]]
    @@ -77,7 +76,7 @@
    - Moderators + [[category:sidebar.moderators]]
    From 5c7da4b686ad4610a1582b964b0c9874b74a8403 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 24 Sep 2013 14:14:26 -0400 Subject: [PATCH 12/18] fixed serverside templating; footer, logout internationalization; updated more global lang keys --- app.js | 1 + public/language/en/footer.json | 12 ++++ public/language/en/global.json | 5 +- public/src/language.js | 12 ---- public/src/translator.js | 117 ++++++++++++++++----------------- public/templates/footer.tpl | 20 +++--- public/templates/logout.tpl | 8 +-- src/webserver.js | 19 ++++-- 8 files changed, 101 insertions(+), 93 deletions(-) create mode 100644 public/language/en/footer.json delete mode 100644 public/src/language.js diff --git a/app.js b/app.js index 1e46c3c667..7b9196361c 100644 --- a/app.js +++ b/app.js @@ -85,6 +85,7 @@ plugins = require('./src/plugins'); // Don't remove this - plugins initializes itself global.templates = {}; + global.translator = translator; translator.loadServer(); diff --git a/public/language/en/footer.json b/public/language/en/footer.json new file mode 100644 index 0000000000..2655ac2795 --- /dev/null +++ b/public/language/en/footer.json @@ -0,0 +1,12 @@ +{ + "disconnect.title": "Socket Disconnect", + "disconnect.message": "Looks like you disconnected, try reloading the page.", + "disconnect.reload_button": "Reload", + "chat.chatting_with": "Chat with ", + "chat.placeholder": "type chat message, here press enter to send", + "chat.send": "Send", + "stats.online": "Online", + "stats.users": "Users", + "stats.topics": "Topics", + "stats.posts": "Posts" +} \ No newline at end of file diff --git a/public/language/en/global.json b/public/language/en/global.json index bb73c3f6d0..804c3a2f21 100644 --- a/public/language/en/global.json +++ b/public/language/en/global.json @@ -4,5 +4,8 @@ "403.title": "Access Denied", "403.message": "You seem to have stumbled upon a page that you do not have access to. Perhaps you should try logging in?", "404.title": "Not Found", - "404.message": "You seem to have stumbled upon a page that does not exist. Return to the home page." + "404.message": "You seem to have stumbled upon a page that does not exist. Return to the home page.", + "logout": "Logout", + "logout.title": "You are now logged out.", + "logout.message": "You have successfully logged out of NodeBB" } \ No newline at end of file diff --git a/public/src/language.js b/public/src/language.js deleted file mode 100644 index 8a2c610169..0000000000 --- a/public/src/language.js +++ /dev/null @@ -1,12 +0,0 @@ -(function (module) { - - - - - - -})('undefined' === typeof module ? { - module: { - exports: {} - } -} : module); \ No newline at end of file diff --git a/public/src/translator.js b/public/src/translator.js index bd38862c31..8ee16f398a 100644 --- a/public/src/translator.js +++ b/public/src/translator.js @@ -17,69 +17,12 @@ files = { loaded: {}, loading: {}, - callbacks: {} + callbacks: {} // could be combined with "loading" in future. }, isServer = false; module.exports = translator; - translator.load = function (filename, callback) { - if (isServer === true) { - if (callback) { - callback(files.loaded[filename]); - } - - return files.loaded[filename]; - } - - if (files.loaded[filename] && !files.loading[filename]) { - if (callback) { - callback(files.loaded[filename]); - } - } else if (files.loading[filename]) { - if (callback) { - files.callbacks[filename] = files.callbacks[filename] || []; - files.callbacks[filename].push(callback); - } - } else { - var timestamp = new Date().getTime(); //debug - - files.loading[filename] = true; - - jQuery.getJSON(RELATIVE_PATH + '/language/en/' + filename + '.json?v=' + timestamp, function (language) { - files.loaded[filename] = language; - - if (callback) { - callback(language); - } - - while (files.callbacks[filename] && files.callbacks[filename].length) { - files.callbacks[filename].pop()(language); - } - - files.loading[filename] = false; - }); - } - }; - - translator.loadServer = function () { - isServer = true; - - var utils = require('./utils.js'), - path = require('path'), - fs = require('fs'); - - utils.walk(path.join(__dirname, '../../', 'public/language/en'), function (err, data) { - var loaded = data.length; - - for (var d in data) { - if (data.hasOwnProperty(d)) { - files.loaded[path.basename(data[d]).replace('.json', '')] = require(data[d]); - } - } - }); - }; - /* * TODO: DRY, see translator.translate. The hard part is to make sure both work node.js / js side */ @@ -97,7 +40,6 @@ }); }; - /* * TODO: Not fully converted to server side yet, ideally server should be able to parse whole templates on demand if necessary * fix: translator.load should determine if server side and immediately return appropriate language file. @@ -142,6 +84,63 @@ }; + translator.load = function (filename, callback) { + if (isServer === true) { + if (callback) { + callback(files.loaded[filename]); + } + + return files.loaded[filename]; + } + + if (files.loaded[filename] && !files.loading[filename]) { + if (callback) { + callback(files.loaded[filename]); + } + } else if (files.loading[filename]) { + if (callback) { + files.callbacks[filename] = files.callbacks[filename] || []; + files.callbacks[filename].push(callback); + } + } else { + var timestamp = new Date().getTime(); //debug + + files.loading[filename] = true; + + jQuery.getJSON(RELATIVE_PATH + '/language/en/' + filename + '.json?v=' + timestamp, function (language) { + files.loaded[filename] = language; + + if (callback) { + callback(language); + } + + while (files.callbacks[filename] && files.callbacks[filename].length) { + files.callbacks[filename].pop()(language); + } + + files.loading[filename] = false; + }); + } + }; + + translator.loadServer = function () { + isServer = true; + + var utils = require('./utils.js'), + path = require('path'), + fs = require('fs'); + + utils.walk(path.join(__dirname, '../../', 'public/language/en'), function (err, data) { + var loaded = data.length; + + for (var d in data) { + if (data.hasOwnProperty(d)) { + files.loaded[path.basename(data[d]).replace('.json', '')] = require(data[d]); + } + } + }); + }; + if ('undefined' !== typeof window) { window.translator = module.exports; } diff --git a/public/templates/footer.tpl b/public/templates/footer.tpl index 13fd820609..ea47c97d86 100644 --- a/public/templates/footer.tpl +++ b/public/templates/footer.tpl @@ -6,13 +6,13 @@
    -

    Socket Disconnect

    +

    [[footer:disconnect.title]]

    - Looks like you disconnected, try reloading the page. + [[footer:disconnect.message]]
    - Reload + [[footer:disconnect.reload_button]]
    @@ -23,15 +23,15 @@
    -

    Chat with

    +

    [[footer:chat.chatting_with]]


    - +
    + ">[[footer:chat.send]]
    @@ -45,22 +45,22 @@
    -


    Online

    +


    [[footer:stats.online]]

    -


    Users

    +


    [[footer:stats.users]]

    -


    Topics

    +


    [[footer:stats.topics]]

    -


    Posts

    +


    [[footer:stats.posts]]

    diff --git a/public/templates/logout.tpl b/public/templates/logout.tpl index 79391db4ce..1704a611e0 100644 --- a/public/templates/logout.tpl +++ b/public/templates/logout.tpl @@ -1,13 +1,13 @@
    1. - +
    2. - Logout + [[global:logout]]
    -

    You are now logged out.

    -

    You have successfully logged out of NodeBB

    +

    [[global:logout.title]]

    +

    [[global:logout.message]]

    diff --git a/src/webserver.js b/src/webserver.js index 6a85c3f71e..db1826da73 100644 --- a/src/webserver.js +++ b/src/webserver.js @@ -55,13 +55,9 @@ var express = require('express'), meta_tags: metaString }; - // meta.build_title(options.title, (options.req.user ? options.req.user.uid : 0), function(err, title) { - // if (!err) templateValues.browserTitle = title; - - // callback(null, templates['header'].parse(templateValues)); - // }); - - callback(null, templates['header'].parse(templateValues)); + translator.translate(templates['header'].parse(templateValues), function(template) { + callback(null, template); + }); }; // Middlewares @@ -117,6 +113,15 @@ var express = require('express'), module.exports.init = function() { templates = global.templates; + + // translate all static templates served by webserver here. ex. footer, logout + translator.translate(templates['footer'].toString(), function(parsedTemplate) { + templates['footer'] = parsedTemplate; + }); + translator.translate(templates['logout'].toString(), function(parsedTemplate) { + templates['logout'] = parsedTemplate; + }); + server.listen(nconf.get('PORT') || nconf.get('port')); } From 1a1fea535b47a7aad62f83cddc586cd1eb760d52 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 24 Sep 2013 14:17:36 -0400 Subject: [PATCH 13/18] header language --- public/language/en/global.json | 8 +++++++- public/templates/header.tpl | 16 ++++++++-------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/public/language/en/global.json b/public/language/en/global.json index 804c3a2f21..c0a97b3c75 100644 --- a/public/language/en/global.json +++ b/public/language/en/global.json @@ -1,5 +1,6 @@ { "home": "Home", + "search": "Search", "buttons.close": "Close", "403.title": "Access Denied", "403.message": "You seem to have stumbled upon a page that you do not have access to. Perhaps you should try logging in?", @@ -7,5 +8,10 @@ "404.message": "You seem to have stumbled upon a page that does not exist. Return to the home page.", "logout": "Logout", "logout.title": "You are now logged out.", - "logout.message": "You have successfully logged out of NodeBB" + "logout.message": "You have successfully logged out of NodeBB", + "header.recent": "Recent", + "header.unread": "Unread", + "header.users": "Users", + "header.search": "Search", + "notifications.loading": "Loading Notifications" } \ No newline at end of file diff --git a/public/templates/header.tpl b/public/templates/header.tpl index a364ddcbd9..9f172b30a6 100644 --- a/public/templates/header.tpl +++ b/public/templates/header.tpl @@ -47,17 +47,17 @@
    @@ -78,7 +78,7 @@ From b8037845d6a6b4ff7f9bc76cff0471c9dd8b3400 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 24 Sep 2013 14:50:38 -0400 Subject: [PATCH 14/18] registration.tpl; translator variable system --- public/language/en/register.json | 16 ++++++++++++++++ public/src/translator.js | 18 +++++++++++++++--- public/templates/register.tpl | 30 +++++++++++++++--------------- 3 files changed, 46 insertions(+), 18 deletions(-) create mode 100644 public/language/en/register.json diff --git a/public/language/en/register.json b/public/language/en/register.json new file mode 100644 index 0000000000..6b8a26f282 --- /dev/null +++ b/public/language/en/register.json @@ -0,0 +1,16 @@ +{ + "register": "Register", + "help.email": "By default, your email will be hidden from the public.", + "help.username_restrictions": "A unique username between %1 and %2 characters. Others can mention you with @username.", + "help.minimum_password_length": "Your password's length must be at least %1 characters.", + "email_address": "Email Address", + "email_address_placeholder": "Enter Email Address", + "username": "Username", + "username_placeholder": "Enter Username", + "password": "Password", + "password_placeholder": "Enter Password", + "confirm_password": "Confirm Password", + "confirm_password_placeholder": "Confirm Password", + "register_now_button": "Register Now", + "alternative_registration": "Alternative Registration" +} \ No newline at end of file diff --git a/public/src/translator.js b/public/src/translator.js index 8ee16f398a..a1ebc017a8 100644 --- a/public/src/translator.js +++ b/public/src/translator.js @@ -47,24 +47,36 @@ translator.translate = function (data, callback) { var keys = data.match(/\[\[.*?\]\]/g), loading = 0; + + function insertLanguage(text, key, value, variables) { + for (var i = 1, ii = variables.length; i < ii; i++) { + var variable = variables[i].replace(']]', ''); + value = value.replace('%' + i, variable); + } + + text = text.replace(key, value); + + return text; + } 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(':'), languageFile = parsedKey[0]; - parsedKey = parsedKey[1]; + parsedKey = parsedKey[1].split(',')[0]; if (files.loaded[languageFile]) { - data = data.replace(keys[key], files.loaded[languageFile][parsedKey]); + data = insertLanguage(data, keys[key], files.loaded[languageFile][parsedKey], variables); } else { loading++; (function (languageKey, parsedKey) { translator.load(languageFile, function (languageData) { - data = data.replace(languageKey, languageData[parsedKey]); + data = insertLanguage(data, languageKey, languageData[parsedKey], variables); loading--; checkComplete(); }); diff --git a/public/templates/register.tpl b/public/templates/register.tpl index 7cb72b39d3..6003d203f9 100644 --- a/public/templates/register.tpl +++ b/public/templates/register.tpl @@ -1,9 +1,9 @@
    1. - +
    2. - Register + [[register:register]]
    @@ -12,46 +12,46 @@
    - +
    - +
    - By default, your email will be hidden from the public. + [[register:help.email]]
    - +
    - +
    - A unique username. {minimumUsernameLength}-{maximumUsernameLength} characters. Others can mention you with @username. + [[register:help.username_restrictions, {minimumUsernameLength}, {maximumUsernameLength}]]
    - +
    - +
    - Your password's length must be at least {minimumPasswordLength} characters. + [[register:help.minimum_password_length, {minimumPasswordLength}]]
    - +
    - + @@ -61,7 +61,7 @@
    - +
    @@ -70,7 +70,7 @@
    -

    Alternative Registration

    +

    [[register:alternative_registration]]

      • From 5abf02c6d1e6fcf1955cb5c0c18b37e0f6e2dba1 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 24 Sep 2013 14:55:46 -0400 Subject: [PATCH 15/18] 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) { From cd63dd429b09af4160fd522d4a2efcce38497f07 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 24 Sep 2013 14:59:13 -0400 Subject: [PATCH 16/18] finalizing todo's before merging --- public/src/translator.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/public/src/translator.js b/public/src/translator.js index 28b3f01e17..234ad5853b 100644 --- a/public/src/translator.js +++ b/public/src/translator.js @@ -5,8 +5,8 @@ /* * TODO: * - * 1. language en is hardcoded while system is developed. - * b. need to write fallback system to default language + * 1. language en is hardcoded while system is developed. to switch language packs for now please edit DEFAULT_LANGUAGE + * b. need to write fallback system to default language if keys are missing (is this even necessary?) * 2. recursion needed when parsing language keys (ex. topics:modal.delete.title), right now json is all one level deep * 3. server side settings for default language * 4. user side settings for preferred language @@ -25,9 +25,6 @@ module.exports = translator; - /* - * TODO: DRY, see translator.translate. The hard part is to make sure both work node.js / js side - */ translator.get = function (key, callback) { var parsedKey = key.split(':'), languageFile = parsedKey[0]; From de1e3230f5d157dbdc4d44d23820ae2ae9ff3eda Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 24 Sep 2013 15:23:16 -0400 Subject: [PATCH 17/18] fixed topics and admin views, broken after merge --- public/src/translator.js | 13 ++++++++----- public/templates/admin/header.tpl | 1 + 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/public/src/translator.js b/public/src/translator.js index 234ad5853b..37f4486feb 100644 --- a/public/src/translator.js +++ b/public/src/translator.js @@ -48,12 +48,15 @@ loading = 0; function insertLanguage(text, key, value, variables) { - for (var i = 1, ii = variables.length; i < ii; i++) { - var variable = variables[i].replace(']]', ''); - value = value.replace('%' + i, variable); - } + if (value) { + for (var i = 1, ii = variables.length; i < ii; i++) { + var variable = variables[i].replace(']]', ''); + value = value.replace('%' + i, variable); + } - text = text.replace(key, value); + text = text.replace(key, value); + } + return text; } diff --git a/public/templates/admin/header.tpl b/public/templates/admin/header.tpl index 7c236cff58..3a2c7b4768 100644 --- a/public/templates/admin/header.tpl +++ b/public/templates/admin/header.tpl @@ -16,6 +16,7 @@ + From 1ae51ef5ea8913f9cb69e65ef88ebebb29f5dbe4 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 24 Sep 2013 15:36:17 -0400 Subject: [PATCH 18/18] redis export function (commented out for now) --- src/meta.js | 22 ++++++++++++++++ src/routes/admin.js | 62 ++++++++++++++++++++++++++++++++------------- 2 files changed, 66 insertions(+), 18 deletions(-) diff --git a/src/meta.js b/src/meta.js index cdc4c14b3d..97cfe65789 100644 --- a/src/meta.js +++ b/src/meta.js @@ -223,4 +223,26 @@ var utils = require('./../public/src/utils.js'), }); } }; + + Meta.db = { + getFile: function (callback) { + var multi = RDB.multi(); + + multi.config('get', 'dir'); + multi.config('get', 'dbfilename'); + multi.exec(function (err, results) { + if (err) { + return callback(err); + } else { + results = results.reduce(function (memo, config) { + memo[config[0]] = config[1]; + return memo; + }, {}); + + var dbFile = path.join(results.dir, results.dbfilename); + callback(null, dbFile); + } + }); + } + }; }(exports)); \ No newline at end of file diff --git a/src/routes/admin.js b/src/routes/admin.js index 43896e3857..b6db9cf925 100644 --- a/src/routes/admin.js +++ b/src/routes/admin.js @@ -4,9 +4,11 @@ var user = require('./../user.js'), RDB = require('./../redis.js'), pkg = require('./../../package.json'), categories = require('./../categories.js'), + Meta = require('../meta'), plugins = require('../plugins'), winston = require('winston'), - nconf = require('nconf'); + nconf = require('nconf'), + fs = require('fs'); (function (Admin) { Admin.isAdmin = function (req, res, next) { @@ -153,31 +155,55 @@ var user = require('./../user.js'), }); }); - app.get('/redis', function (req, res) { - RDB.info(function (err, data) { - data = data.split("\r\n"); - var finalData = {}; + app.namespace('/redis', function () { + app.get('/', function (req, res) { + RDB.info(function (err, data) { + data = data.split("\r\n"); + var finalData = {}; - for (var i in data) { + for (var i in data) { - if (data[i].indexOf(':') == -1 || !data[i]) - continue; + if (data[i].indexOf(':') == -1 || !data[i]) + continue; - try { - data[i] = data[i].replace(/:/, "\":\""); - var json = "{\"" + data[i] + "\"}"; + try { + data[i] = data[i].replace(/:/, "\":\""); + var json = "{\"" + data[i] + "\"}"; - var jsonObject = JSON.parse(json); - for (var key in jsonObject) { - finalData[key] = jsonObject[key]; + var jsonObject = JSON.parse(json); + for (var key in jsonObject) { + finalData[key] = jsonObject[key]; + } + } catch (err) { + winston.warn('can\'t parse redis status variable, ignoring', i, data[i], err); } - } catch (err) { - winston.warn('can\'t parse redis status variable, ignoring', i, data[i], err); } - } - res.json(finalData); + res.json(finalData); + }); }); + + // app.get('/export', Admin.isAdmin, function (req, res) { + // Meta.db.getFile(function (err, dbFile) { + // if (!err) { + // res.download(dbFile, 'redis.rdb', function (err) { + // console.log(err); + // res.send(500); + // if (err) { + // res.send(500); + // switch (err.code) { + // case 'EACCES': + // res.send(500, 'Require permissions from Redis database file: ', dbFile); + // break; + // default: + // res.send(500); + // break; + // } + // } + // }); + // } else res.send(500); + // }); + // }); }); app.get('/plugins', function (req, res) {