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

Standard language codes (#5218)

Browse Source 
* Use standard language codes. Fallback for plugins.

* Fix transifex config

* Tab vs space here for some reason

* Remove redundancies

* config.relative_path instead of allcaps

* added upgrade script for existing users' accounts
This commit is contained in:
Peter Jaszkowiak
2016-11-23 09:50:49 -07:00
committed by Julian Lam
parent cafbdfd83e
commit c5237443cd
164 changed files with 301 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/languages.js
View File

@@ -1,14 +1,14 @@
'use strict';
var fs = require('fs'),
path = require('path'),
async = require('async'),
LRU = require('lru-cache'),
_ = require('underscore');
var fs = require('fs');
var path = require('path');
var async = require('async');
var LRU = require('lru-cache');
var plugins = require('./plugins');
var Languages = {};
var languagesPath = path.join(__dirname, '../public/language');
Languages.init = function (next) {
if (Languages.hasOwnProperty('_cache')) {
@@ -20,16 +20,16 @@ Languages.init = function (next) {
next();
};
Languages.get = function (code, key, callback) {
var combined = [code, key].join('/');
Languages.get = function (language, namespace, callback) {
var langNamespace = language + '/' + namespace;
if (Languages._cache && Languages._cache.has(combined)) {
return callback(null, Languages._cache.get(combined));
if (Languages._cache && Languages._cache.has(langNamespace)) {
return callback(null, Languages._cache.get(langNamespace));
}
var languageData;
fs.readFile(path.join(__dirname, '../public/language/', code, key), { encoding: 'utf-8' }, function (err, data) {
fs.readFile(path.join(languagesPath, language, namespace + '.json'), { encoding: 'utf-8' }, function (err, data) {
if (err && err.code !== 'ENOENT') {
return callback(err);
}
@@ -41,12 +41,12 @@ Languages.get = function (code, key, callback) {
languageData = {};
}
if (plugins.customLanguages.hasOwnProperty(combined)) {
_.extendOwn(languageData, plugins.customLanguages[combined]);
if (plugins.customLanguages.hasOwnProperty(langNamespace)) {
Object.assign(languageData, plugins.customLanguages[langNamespace]);
}
if (Languages._cache) {
Languages._cache.set(combined, languageData);
Languages._cache.set(langNamespace, languageData);
}
callback(null, languageData);
@@ -54,8 +54,7 @@ Languages.get = function (code, key, callback) {
};
Languages.list = function (callback) {
var languagesPath = path.join(__dirname, '../public/language'),
languages = [];
var languages = [];
fs.readdir(languagesPath, function (err, files) {
if (err) {