2 Commits

Author SHA1 Message Date
Simon Vareille
57e3e930a7 Fix travis's syntax conventions errors 2020-06-18 15:24:31 +02:00
Simon Vareille
8112bf929c Fix travis's syntaxe conventions errors 2020-06-18 15:21:06 +02:00

View File

@@ -22,7 +22,7 @@ const DEFAULT_OPTIONS = {
dir: undefined, dir: undefined,
dirs: [path.join(process.cwd(), 'locales')], dirs: [path.join(process.cwd(), 'locales')],
functionName: '__', functionName: '__',
functionnName: '__n' functionnName: '__n',
}; };
module.exports = function (app, options) { module.exports = function (app, options) {
@@ -137,7 +137,6 @@ module.exports = function (app, options) {
app[functionName] = gettext; app[functionName] = gettext;
function gettextn(locale, key, count, value) { function gettextn(locale, key, count, value) {
if (arguments.length === 0 || arguments.length === 1) { if (arguments.length === 0 || arguments.length === 1) {
// __n() // __n()
@@ -158,25 +157,25 @@ module.exports = function (app, options) {
//**************************************************************// //**************************************************************//
// Directly adapted from __n function of i18n module : // Directly adapted from __n function of i18n module :
// https://github.com/mashpie/i18n-node/blob/master/i18n.js // https://github.com/mashpie/i18n-node/blob/master/i18n.js
var p; let p;
// create a new Plural for locale // create a new Plural for locale
// and try to cache instance // and try to cache instance
if (PluralsForLocale[locale]) { if (PluralsForLocale[locale]) {
p = PluralsForLocale[locale]; p = PluralsForLocale[locale];
} else { } else {
// split locales with a region code // split locales with a region code
var lc = locale.toLowerCase().split(/[_-\s]+/) const lc = locale.toLowerCase().split(/[_-\s]+/)
.filter(function(el){ return true && el; }); .filter(function(el){ return true && el; });
// take the first part of locale, fallback to full locale // take the first part of locale, fallback to full locale
p = MakePlural[lc[0] || locale]; p = MakePlural[lc[0] || locale];
PluralsForLocale[locale] = p; PluralsForLocale[locale] = p;
} }
// fallback to 'other' on case of missing translations // fallback to 'other' on case of missing translations
let text = resource[key+"."+p(count)] || resource[key+".other"]; let text = resource[key + '.' + p(count)] || resource[key + '.other'];
//**************************************************************// //**************************************************************//
if (text === undefined && isObject(key)) { if (text === undefined && isObject(key)) {
text = key[p(count)] || key["other"]; text = key[p(count)] || key['other'];
} }
if (text === undefined) { if (text === undefined) {