Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-07-10 07:33:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into v0.7.x

Browse Source
This commit is contained in:
Julian Lam
2015-08-18 11:35:41 -04:00
parent 6fff745c5c a990e9c3bf
commit 2a99721d01
4 changed files with 39 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@@ -49,8 +49,8 @@
"nodebb-plugin-spam-be-gone": "0.4.1",
"nodebb-rewards-essentials": "0.0.3",
"nodebb-theme-lavender": "1.0.49",
"nodebb-theme-persona": "2.0.12",
"nodebb-theme-vanilla": "3.0.6",
"nodebb-theme-persona": "2.0.13",
"nodebb-theme-vanilla": "3.0.7",
"nodebb-widget-essentials": "1.0.4",
"npm": "^2.1.4",
"passport": "^0.2.1",

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

@@ -47,33 +47,38 @@
// Load the appropriate timeago locale file, and correct NodeBB language codes to timeago codes, if necessary
var languageCode;
switch(config.userLang) {
case 'cs':
languageCode = 'cz';
break;
case 'en_GB':
case 'en_US':
languageCode = 'en';
break;
case 'fa_IR':
languageCode = 'fa';
break;
case 'cs':
languageCode = 'cz';
break;
case 'pt_BR':
languageCode = 'pt-br';
break;
case 'fa_IR':
languageCode = 'fa';
break;
case 'nb':
languageCode = 'no';
break;
case 'pt_BR':
languageCode = 'pt-br';
break;
case 'zh_TW':
languageCode = 'zh-TW';
break;
case 'nb':
languageCode = 'no';
break;
case 'zh_CN':
languageCode = 'zh-CN';
break;
case 'zh_TW':
languageCode = 'zh-TW';
break;
default:
languageCode = config.userLang;
break;
case 'zh_CN':
languageCode = 'zh-CN';
break;
default:
languageCode = config.userLang;
break;
}
$.getScript(RELATIVE_PATH + '/vendor/jquery/timeago/locales/jquery.timeago.' + languageCode + '.js').success(function() {

10
public/src/utils.js
View File

@@ -206,9 +206,13 @@
overrideTimeago: function() {
var timeagoFn = $.fn.timeago;
$.fn.timeago = function() {
timeagoFn.apply(this, arguments).each(function() {
$(this).attr('title', (new Date($(this).attr('title'))).toString());
});
var els = timeagoFn.apply(this, arguments);
if (els) {
els.each(function() {
$(this).attr('title', (new Date($(this).attr('title'))).toString());
});
}
};
},

5
src/controllers/index.js
View File

@@ -110,6 +110,9 @@ Controllers.register = function(req, res, next) {
}
},
function(next) {
plugins.fireHook('filter:parse.post', {postData: {content: meta.config.termsOfUse}}, next);
},
function(tos, next) {
var loginStrategies = require('../routes/authentication').getLoginStrategies();
var data = {
'register_window:spansize': loginStrategies.length ? 'col-md-6' : 'col-md-12',
@@ -121,7 +124,7 @@ Controllers.register = function(req, res, next) {
data.minimumUsernameLength = meta.config.minimumUsernameLength;
data.maximumUsernameLength = meta.config.maximumUsernameLength;
data.minimumPasswordLength = meta.config.minimumPasswordLength;
data.termsOfUse = meta.config.termsOfUse;
data.termsOfUse = tos.postData.content;
data.breadcrumbs = helpers.buildBreadcrumbs([{text: '[[register:register]]'}]);
data.regFormEntry = [];
data.error = req.flash('error')[0];