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

Fixes, passes tests

Browse Source
This commit is contained in:
Peter Jaszkowiak
2016-11-28 18:16:13 -07:00
parent fd4d53e42c
commit 77e58f31c5
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
public/language/en_GB/admin/appearance/themes.json → public/language/en-GB/admin/appearance/themes.json
View File

10
src/admin/search.js
View File

@@ -6,7 +6,7 @@ var sanitizeHTML = require('sanitize-html');
var languages = require('../languages');
var utils = require('../../public/src/utils');
var Translator = require('../../public/src/modules/translator');
var Translator = require('../../public/src/modules/translator').Translator;
function walk(directory) {
return new Promise(function (resolve, reject) {
@@ -32,9 +32,9 @@ function readFile(path) {
});
}
function loadLanguage(language, filename) {
function loadLanguage(language, namespace) {
return new Promise(function (resolve, reject) {
languages.get(language, filename + '.json', function (err, data) {
languages.get(language, namespace, function (err, data) {
if (err || !data || !Object.keys(data).length) {
reject(err);
} else {
@@ -56,7 +56,7 @@ function filterDirectories(directories) {
}
function getAdminNamespaces() {
return walk(path.resolve('./public/templates/admin'))
return walk(path.resolve(__dirname, '../../public/templates/admin'))
.then(filterDirectories);
}
@@ -81,7 +81,7 @@ function simplify(translations) {
var fallbackCache = {};
function initFallback(namespace) {
return readFile(path.resolve('./public/templates/', namespace + '.tpl'))
return readFile(path.resolve(__dirname, '../../public/templates/', namespace + '.tpl'))
.then(function (template) {
var translations = sanitize(template);
translations = simplify(translations);

2
src/languages.js
View File

@@ -75,7 +75,7 @@ Languages.list = function (callback) {
fs.readFile(configPath, function (err, stream) {
if (err) {
next();
return next(err);
}
languages.push(JSON.parse(stream.toString()));
next();

2
src/socket.io/admin.js
View File

@@ -283,7 +283,7 @@ SocketAdmin.getSearchDict = function (socket, data, callback) {
if (err) {
return callback(err);
}
var lang = settings.userLang || meta.config.defaultLang || 'en_GB';
var lang = settings.userLang || meta.config.defaultLang || 'en-GB';
getAdminSearchDict(lang)
.then(function (results) {
callback(null, results);