Skip to content

[stable15] Fix plural rule detection for languages #14867

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

Merged
rullzer merged 3 commits into from
Mar 28, 2019
Merged

[stable15] Fix plural rule detection for languages #14867

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b9684ee
Fix plural rule detection for languages
nickvergessen Mar 11, 2019
156419a
Rename the variable aswell
nickvergessen Mar 12, 2019
7b23324
Fix behaviour of plural default rule
MorrisJobke Mar 15, 2019
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
14 changes: 7 additions & 7 deletions core/js/l10n.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,26 +167,26 @@ OC.L10N = {
* @private
*/
_getPlural: function(number) {
var locale = OC.getLocale();
if ('pt_BR' === locale) {
var language = OC.getLanguage();
if ('pt_BR' === language) {
// temporary set a locale for brazilian
locale = 'xbr';
language = 'xbr';
}

if (typeof locale === 'undefined') {
if (typeof language === 'undefined' || language === '') {
return (1 == number) ? 0 : 1;
}

if (locale.length > 3) {
locale = locale.substring(0, locale.lastIndexOf('_'));
if (language.length > 3) {
language = language.substring(0, language.lastIndexOf('_'));
}

/*
* The plural rules are derived from code of the Zend Framework (2010-09-25),
* which is subject to the new BSD license (http://framework.zend.com/license/new-bsd).
* Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
*/
switch (locale) {
switch (language) {
case 'az':
case 'bo':
case 'dz':
Expand Down