Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-01 19:46:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #4432

Browse Source
This commit is contained in:
barisusakli
2016-03-22 11:19:33 +02:00
parent 6644c66f94
commit e2f78a9585
3 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
public/src/app.js
View File

@@ -326,7 +326,10 @@ app.cacheBuster = null;
return; return;
} }
require(['translator'], function(translator) { require(['translator'], function(translator) {
title = config.titleLayout.replace(/{/g, '{').replace(/}/g, '}').replace('{pageTitle}', title).replace('{browserTitle}', config.browserTitle); title = config.titleLayout.replace(/{/g, '{').replace(/}/g, '}')
.replace('{pageTitle}', function() { return title; })
.replace('{browserTitle}', function() { return config.browserTitle; });
translator.translate(title, function(translated) { translator.translate(title, function(translated) {
titleObj.titles[0] = translated; titleObj.titles[0] = translated;
app.alternatingTitle(''); app.alternatingTitle('');

13
public/src/modules/translator.js
View File

@@ -213,13 +213,14 @@
function insertLanguage(text, key, value, variables) { function insertLanguage(text, key, value, variables) {
if (value) { if (value) {
var variable; variables.forEach(function(variable, index) {
for (var i = 1, ii = variables.length; i < ii; i++) { if (index > 0) {
variable = S(variables[i]).chompRight(']]').collapseWhitespace().decodeHTMLEntities().escapeHTML().s; variable = S(variable).chompRight(']]').collapseWhitespace().decodeHTMLEntities().escapeHTML().s;
value = value.replace('%' + i, variable); value = value.replace('%' + index, function() { return variable; });
} }
});
text = text.replace(key, value); text = text.replace(key, function() { return value; });
} else { } else {
var string = key.split(':'); var string = key.split(':');
text = text.replace(key, string[string.length-1].replace(regexes.replace, '')); text = text.replace(key, string[string.length-1].replace(regexes.replace, ''));

6
src/controllers/helpers.js
View File

@@ -105,7 +105,11 @@ helpers.buildTitle = function(pageTitle) {
var browserTitle = validator.escape(meta.config.browserTitle || meta.config.title || 'NodeBB'); var browserTitle = validator.escape(meta.config.browserTitle || meta.config.title || 'NodeBB');
pageTitle = pageTitle || ''; pageTitle = pageTitle || '';
var title = titleLayout.replace('{pageTitle}', pageTitle).replace('{browserTitle}', browserTitle); var title = titleLayout.replace('{pageTitle}', function() {
return pageTitle;
}).replace('{browserTitle}', function() {
return browserTitle;
});
return title; return title;
}; };