Skip to content

Choice locale parameter #63

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
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Choice locale parameter #63

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b607383
Default Plural Form Support
aalmonte Nov 29, 2017
879dfc8
Locale parameter
aalmonte Nov 29, 2017
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
23 changes: 16 additions & 7 deletions src/lang.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,9 +221,13 @@
}
}

var pluralForm = this._getPluralForm(number);
var pluralForm = this._getPluralForm(number, locale);
//Check if pluralForm exists
if (messageParts.length > pluralForm) {
return messageParts[pluralForm];
}

return messageParts[pluralForm];
return messageParts[0];
};

/**
Expand All @@ -232,11 +236,12 @@
* @param key {string} The key of the message.
* @param count {number} The number of elements.
* @param replacements {object} The replacements to be done in the message.
* @param locale {string} The locale to use, if not passed use the default locale.
*
* @return {string} The translation message according to an integer value.
*/
Lang.prototype.transChoice = function(key, count, replacements) {
return this.choice(key, count, replacements);
Lang.prototype.transChoice = function(key, count, replacements, locale) {
return this.choice(key, count, replacements, locale);
};

/**
Expand Down Expand Up @@ -454,8 +459,9 @@
* @param {Number} count
* @return {Number}
*/
Lang.prototype._getPluralForm = function(count) {
switch (this.locale) {
Lang.prototype._getPluralForm = function(count, locale) {
locale = locale || this.getLocale();
switch (locale) {
case 'az':
case 'bo':
case 'dz':
Expand Down Expand Up @@ -645,7 +651,10 @@
: 5))));

default:
return 0;
//By default supports two plural forms
return (count == 1)
? 0
: 1;
}
};

Expand Down