mirror of
https://github.com/PrivateBin/PrivateBin.git
synced 2026-04-18 21:48:24 -04:00
add basic RTL support, drop default language key
This commit is contained in:
+16
-1
@@ -790,6 +790,18 @@ jQuery.PrivateBin = (function($, RawDeflate) {
|
||||
return output;
|
||||
};
|
||||
|
||||
/**
|
||||
* get currently loaded language
|
||||
*
|
||||
* @name I18n.getLanguage
|
||||
* @function
|
||||
* @return {string}
|
||||
*/
|
||||
me.getLanguage = function()
|
||||
{
|
||||
return language;
|
||||
};
|
||||
|
||||
/**
|
||||
* per language functions to use to determine the plural form
|
||||
*
|
||||
@@ -847,7 +859,10 @@ jQuery.PrivateBin = (function($, RawDeflate) {
|
||||
|
||||
// auto-select language based on browser settings
|
||||
if (newLanguage.length === 0) {
|
||||
newLanguage = (navigator.language || navigator.userLanguage || 'en').substring(0, 2);
|
||||
newLanguage = (navigator.language || navigator.userLanguage || 'en');
|
||||
if (newLanguage.indexOf('-') > 0) {
|
||||
newLanguage = newLanguage.split('-')[0];
|
||||
}
|
||||
}
|
||||
|
||||
// if language is already used skip update
|
||||
|
||||
+7
-7
@@ -193,10 +193,11 @@ describe('I18n', function () {
|
||||
// mock
|
||||
clean = jsdom('', {cookie: ['lang=' + language]});
|
||||
$.PrivateBin.I18n.reset(language, require('../../i18n/' + language + '.json'));
|
||||
var result = $.PrivateBin.I18n.translate('en'),
|
||||
alias = $.PrivateBin.I18n._('en');
|
||||
var loadedLang = $.PrivateBin.I18n.getLanguage(),
|
||||
result = $.PrivateBin.I18n.translate('Never'),
|
||||
alias = $.PrivateBin.I18n._('Never');
|
||||
clean();
|
||||
return language === result && language === alias;
|
||||
return language === loadedLang && result === alias;
|
||||
}
|
||||
);
|
||||
|
||||
@@ -216,13 +217,12 @@ describe('I18n', function () {
|
||||
|
||||
$.PrivateBin.I18n.reset('en');
|
||||
$.PrivateBin.I18n.loadTranslations();
|
||||
var result = $.PrivateBin.I18n.translate('en'),
|
||||
alias = $.PrivateBin.I18n._('en');
|
||||
var result = $.PrivateBin.I18n.translate('Never'),
|
||||
alias = $.PrivateBin.I18n._('Never');
|
||||
|
||||
clean();
|
||||
return 'en' === result && 'en' === alias;
|
||||
return 'Never' === result && 'Never' === alias;
|
||||
}
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user