Skip to content

Allow specifying the locale on 'get' #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rgfcg wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow specifying the locale on 'get' #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion examples/hello_world.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,26 @@
var dialect = require('..').dialect({
locales: ['es', 'en'],
locales: ['es', 'en','fr'],
current_locale: 'es',
store: {mongodb: {}}
}),
_ = dialect.get,
original = 'Hello World!',
translation = 'Hola Mundo!';
translation_fr = 'Bonjour tout le monde!';

dialect.connect(function () {
console.log(_(original));

dialect.set({original: original, locale: 'fr'}, translation_fr);
dialect.approve({original: original, locale: 'fr'}, true);

dialect.set({original: original, locale: 'es'}, translation);
dialect.approve({original: original, locale: 'es'}, true);

dialect.sync({interval: 3600}, function (err, foo) {
console.log(_(original));
console.log(_(original,'fr'));
console.log(_('Inexistant'));
process.exit();
});
});
9 changes: 5 additions & 4 deletions lib/dialect.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,11 @@ module.exports = function (options) {
* @param {String} original
* String we want to translate.
*/
DIALECT.get = function (original) {
DIALECT.get = function (original,locale) {
var translation = null,
key = null,
current_dictionary = DIALECT.dictionaries[_options.current_locale],
current_locale = locale ? locale : _options.current_locale;
current_dictionary = DIALECT.dictionaries[current_locale],
params = Array.isArray(original) ? original.pop() : {},
needs_plural = Array.isArray(original) && original.length === 2,
index = Array.isArray(original) ? original[0] : original,
Expand All @@ -80,7 +81,7 @@ module.exports = function (options) {
throw Error("Original is not valid");
}

if (!current_dictionary || _options.base_locale === _options.current_locale) {
if (!current_dictionary || _options.base_locale === current_locale) {
return _parse(needs_plural ? original[pluralize(params.count)] : index, params);
} else {

Expand All @@ -96,7 +97,7 @@ module.exports = function (options) {

if (typeof translation !== 'string') {
DIALECT.store.add(
{original: index, locale: _options.current_locale},
{original: index, locale: current_locale},
translation
);
return _parse(needs_plural ? original[pluralize(params.count)] : index, params);
Expand Down