Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 06:11:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1133289 - Remove nonstandard expression closures from intl/locale. r=smontagu

Browse Source
This commit is contained in:
Chris Peterson 2015-01-24 23:53:08 -08:00
parent 114cf02d2b
commit 87ba345f81
2 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
intl/locale/PluralForm.jsm
View File

@ -37,39 +37,39 @@ const kIntlProperties = "chrome://global/locale/intl.properties";
// of plural forms and the second is the function to figure out the index.
let gFunctions = [
// 0: Chinese
[1, function(n) 0],
[1, (n) => 0],
// 1: English
[2, function(n) n!=1?1:0],
[2, (n) => n!=1?1:0],
// 2: French
[2, function(n) n>1?1:0],
[2, (n) => n>1?1:0],
// 3: Latvian
[3, function(n) n%10==1&&n%100!=11?1:n!=0?2:0],
[3, (n) => n%10==1&&n%100!=11?1:n!=0?2:0],
// 4: Scottish Gaelic
[4, function(n) n==1||n==11?0:n==2||n==12?1:n>0&&n<20?2:3],
[4, (n) => n==1||n==11?0:n==2||n==12?1:n>0&&n<20?2:3],
// 5: Romanian
[3, function(n) n==1?0:n==0||n%100>0&&n%100<20?1:2],
[3, (n) => n==1?0:n==0||n%100>0&&n%100<20?1:2],
// 6: Lithuanian
[3, function(n) n%10==1&&n%100!=11?0:n%10>=2&&(n%100<10||n%100>=20)?2:1],
[3, (n) => n%10==1&&n%100!=11?0:n%10>=2&&(n%100<10||n%100>=20)?2:1],
// 7: Russian
[3, function(n) n%10==1&&n%100!=11?0:n%10>=2&&n%10<=4&&(n%100<10||n%100>=20)?1:2],
[3, (n) => n%10==1&&n%100!=11?0:n%10>=2&&n%10<=4&&(n%100<10||n%100>=20)?1:2],
// 8: Slovak
[3, function(n) n==1?0:n>=2&&n<=4?1:2],
[3, (n) => n==1?0:n>=2&&n<=4?1:2],
// 9: Polish
[3, function(n) n==1?0:n%10>=2&&n%10<=4&&(n%100<10||n%100>=20)?1:2],
[3, (n) => n==1?0:n%10>=2&&n%10<=4&&(n%100<10||n%100>=20)?1:2],
// 10: Slovenian
[4, function(n) n%100==1?0:n%100==2?1:n%100==3||n%100==4?2:3],
[4, (n) => n%100==1?0:n%100==2?1:n%100==3||n%100==4?2:3],
// 11: Irish Gaeilge
[5, function(n) n==1?0:n==2?1:n>=3&&n<=6?2:n>=7&&n<=10?3:4],
[5, (n) => n==1?0:n==2?1:n>=3&&n<=6?2:n>=7&&n<=10?3:4],
// 12: Arabic
[6, function(n) n==0?5:n==1?0:n==2?1:n%100>=3&&n%100<=10?2:n%100>=11&&n%100<=99?3:4],
[6, (n) => n==0?5:n==1?0:n==2?1:n%100>=3&&n%100<=10?2:n%100>=11&&n%100<=99?3:4],
// 13: Maltese
[4, function(n) n==1?0:n==0||n%100>0&&n%100<=10?1:n%100>10&&n%100<20?2:3],
[4, (n) => n==1?0:n==0||n%100>0&&n%100<=10?1:n%100>10&&n%100<20?2:3],
// 14: Macedonian
[3, function(n) n%10==1?0:n%10==2?1:2],
[3, (n) => n%10==1?0:n%10==2?1:2],
// 15: Icelandic
[2, function(n) n%10==1&&n%100!=11?0:1],
[2, (n) => n%10==1&&n%100!=11?0:1],
// 16: Breton
[5, function(n) n%10==1&&n%100!=11&&n%100!=71&&n%100!=91?0:n%10==2&&n%100!=12&&n%100!=72&&n%100!=92?1:(n%10==3||n%10==4||n%10==9)&&n%100!=13&&n%100!=14&&n%100!=19&&n%100!=73&&n%100!=74&&n%100!=79&&n%100!=93&&n%100!=94&&n%100!=99?2:n%1000000==0&&n!=0?3:4],
[5, (n) => n%10==1&&n%100!=11&&n%100!=71&&n%100!=91?0:n%10==2&&n%100!=12&&n%100!=72&&n%100!=92?1:(n%10==3||n%10==4||n%10==9)&&n%100!=13&&n%100!=14&&n%100!=19&&n%100!=73&&n%100!=74&&n%100!=79&&n%100!=93&&n%100!=94&&n%100!=99?2:n%1000000==0&&n!=0?3:4],
];
this.PluralForm = {
@ -146,7 +146,7 @@ this.PluralForm = {
}
return ret;
}, function() numForms];
}, () => numForms];
},
/**

11
intl/locale/tests/unit/test_bug22310.js
View File

@ -1,11 +1,16 @@
String.prototype.has = function(s) this.indexOf(s) != -1;
String.prototype.has = function(s) { return this.indexOf(s) != -1; }
const Cc = Components.classes;
const Ci = Components.interfaces;
const dts = Cc["@mozilla.org/intl/scriptabledateformat;1"]
.getService(Ci.nsIScriptableDateFormat);
function dt(locale) dts.FormatDateTime(locale, dts.dateFormatLong,
dts.timeFormatSeconds, 2008, 6, 30, 13, 56, 34);
function dt(locale) {
return dts.FormatDateTime(locale, dts.dateFormatLong,
dts.timeFormatSeconds, 2008, 6, 30, 13, 56, 34);
}
var all_passed = true;
const tests =
[