From 39c8baea318e740111b1c748718c3203a61b4cdf Mon Sep 17 00:00:00 2001 From: Olivier Combe Date: Mon, 25 Jun 2018 17:17:56 +0200 Subject: [PATCH] fix(common): use correct ICU plural for locale mk (#24659) PR Close #24659 --- package.json | 2 +- packages/common/locales/closure-locale.ts | 2 +- packages/common/locales/mk.ts | 2 +- yarn.lock | 87 ++++++++++++++--------- 4 files changed, 55 insertions(+), 38 deletions(-) diff --git a/package.json b/package.json index ad6fc0b735..2fa3a75d71 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "canonical-path": "0.0.2", "chokidar": "1.7.0", "clang-format": "1.0.41", - "cldr": "4.8.0", + "cldr": "4.10.0", "cldr-data-downloader": "0.3.2", "cldrjs": "0.5.0", "conventional-changelog": "1.1.0", diff --git a/packages/common/locales/closure-locale.ts b/packages/common/locales/closure-locale.ts index 2437b3e38d..ec757cb71c 100644 --- a/packages/common/locales/closure-locale.ts +++ b/packages/common/locales/closure-locale.ts @@ -2947,7 +2947,7 @@ export const locale_lv = [ function plural_mk(n: number): number { let i = Math.floor(Math.abs(n)), v = n.toString().replace(/^[^.]*\.?/, '').length, f = parseInt(n.toString().replace(/^[^.]*\.?/, ''), 10) || 0; - if (v === 0 && i % 10 === 1 || f % 10 === 1) return 1; + if (v === 0 && i % 10 === 1 && !(i % 100 === 11) || f % 10 === 1 && !(f % 100 === 11)) return 1; return 5; } diff --git a/packages/common/locales/mk.ts b/packages/common/locales/mk.ts index 6a08342051..aa328a9752 100644 --- a/packages/common/locales/mk.ts +++ b/packages/common/locales/mk.ts @@ -14,7 +14,7 @@ const u = undefined; function plural(n: number): number { let i = Math.floor(Math.abs(n)), v = n.toString().replace(/^[^.]*\.?/, '').length, f = parseInt(n.toString().replace(/^[^.]*\.?/, ''), 10) || 0; - if (v === 0 && i % 10 === 1 || f % 10 === 1) return 1; + if (v === 0 && i % 10 === 1 && !(i % 100 === 11) || f % 10 === 1 && !(f % 100 === 11)) return 1; return 5; } diff --git a/yarn.lock b/yarn.lock index 66cfc72758..47f5573040 100644 --- a/yarn.lock +++ b/yarn.lock @@ -484,12 +484,18 @@ async@^1.3.0, async@^1.4.0, async@^1.5.2, async@~1.5.2: version "1.5.2" resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" -async@^2.0.0, async@^2.0.1: +async@^2.0.0: version "2.5.0" resolved "https://registry.yarnpkg.com/async/-/async-2.5.0.tgz#843190fd6b7357a0b9e1c956edddd5ec8462b54d" dependencies: lodash "^4.14.0" +async@^2.0.1: + version "2.6.1" + resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610" + dependencies: + lodash "^4.17.10" + async@~0.2.6: version "0.2.10" resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1" @@ -943,19 +949,19 @@ cldr-data-downloader@0.3.2: request "~2.74.0" request-progress "0.3.1" -cldr@4.8.0: - version "4.8.0" - resolved "https://registry.yarnpkg.com/cldr/-/cldr-4.8.0.tgz#ae7c9ae322c75ac0eac4d4825dcad0394e97b860" +cldr@4.10.0: + version "4.10.0" + resolved "https://registry.yarnpkg.com/cldr/-/cldr-4.10.0.tgz#5a72a693728eca491bc8ee027d60fa4dc750a24f" dependencies: - memoizeasync "1.0.0" - passerror "1.1.1" - pegjs "0.9.0" - seq "0.3.5" - uglify-js "1.3.3" - underscore "1.3.3" - unicoderegexp "0.4.1" - xmldom "0.1.27" - xpath "0.0.24" + lodash "^4.17.10" + memoizeasync "^1.1.0" + passerror "^1.1.1" + pegjs "^0.10.0" + seq "^0.3.5" + uglify-js "^1.3.3" + unicoderegexp "^0.4.1" + xmldom "^0.1.27" + xpath "^0.0.27" cldrjs@0.5.0: version "0.5.0" @@ -2978,7 +2984,11 @@ inherits@2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1" -ini@^1.2.0, ini@^1.3.2, ini@^1.3.4, ini@~1.3.0, ini@~1.3.3: +ini@^1.2.0: + version "1.3.5" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" + +ini@^1.3.2, ini@^1.3.4, ini@~1.3.0, ini@~1.3.3: version "1.3.4" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e" @@ -3745,6 +3755,10 @@ lodash@^4.0.0, lodash@^4.14.0, lodash@^4.2.1, lodash@^4.8.0, lodash@~4.17.2: version "4.17.4" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae" +lodash@^4.17.10: + version "4.17.10" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7" + lodash@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/lodash/-/lodash-1.0.2.tgz#8f57560c83b59fc270bd3d561b690043430e2551" @@ -3864,9 +3878,9 @@ mem@^1.1.0: dependencies: mimic-fn "^1.0.0" -memoizeasync@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/memoizeasync/-/memoizeasync-1.0.0.tgz#7b02a346f3885abb5dc37c0a43c1d202de8cb40a" +memoizeasync@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/memoizeasync/-/memoizeasync-1.1.0.tgz#9d7028a6f266deb733510bb7dbba5f51878c561e" dependencies: lru-cache "2.5.0" passerror "1.1.1" @@ -4397,7 +4411,14 @@ os-tmpdir@^1.0.0, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" -osenv@^0.1.0, osenv@^0.1.4: +osenv@^0.1.0: + version "0.1.5" + resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" + dependencies: + os-homedir "^1.0.0" + os-tmpdir "^1.0.0" + +osenv@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.4.tgz#42fe6d5953df06c8064be6f176c3d05aaaa34644" dependencies: @@ -4483,7 +4504,7 @@ parseurl@~1.3.0, parseurl@~1.3.1, parseurl@~1.3.2: version "1.3.2" resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3" -passerror@1.1.1: +passerror@1.1.1, passerror@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/passerror/-/passerror-1.1.1.tgz#a25b88dbdd910a29603aec7dcb96e9a7a97687b4" @@ -4555,9 +4576,9 @@ pbkdf2-compat@2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/pbkdf2-compat/-/pbkdf2-compat-2.0.1.tgz#b6e0c8fa99494d94e0511575802a59a5c142f288" -pegjs@0.9.0: - version "0.9.0" - resolved "https://registry.yarnpkg.com/pegjs/-/pegjs-0.9.0.tgz#f6aefa2e3ce56169208e52179dfe41f89141a369" +pegjs@^0.10.0: + version "0.10.0" + resolved "https://registry.yarnpkg.com/pegjs/-/pegjs-0.10.0.tgz#cf8bafae6eddff4b5a7efb185269eaaf4610ddbd" performance-now@^2.1.0: version "2.1.0" @@ -5248,7 +5269,7 @@ send@0.13.2: range-parser "~1.0.3" statuses "~1.2.1" -seq@0.3.5: +seq@^0.3.5: version "0.3.5" resolved "https://registry.yarnpkg.com/seq/-/seq-0.3.5.tgz#ae02af3a424793d8ccbf212d69174e0c54dffe38" dependencies: @@ -6008,9 +6029,9 @@ uglify-js@1.2.6, uglify-js@~1.2.5: version "1.2.6" resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-1.2.6.tgz#d354b2d3c1cf10ebc18fa78c11a28bdd9ce1580d" -uglify-js@1.3.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-1.3.3.tgz#ddd3e98aa27f5f47e589cfb3f95cddba26096190" +uglify-js@^1.3.3: + version "1.3.5" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-1.3.5.tgz#4b5bfff9186effbaa888e4c9e94bd9fc4c94929d" uglify-js@^2.6: version "2.8.29" @@ -6066,15 +6087,11 @@ underscore.string@~3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/underscore.string/-/underscore.string-3.0.3.tgz#4617b8c1a250cf6e5064fbbb363d0fa96cf14552" -underscore@1.3.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.3.3.tgz#47ac53683daf832bfa952e1774417da47817ae42" - underscore@1.x: version "1.8.3" resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz#4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022" -unicoderegexp@0.4.1: +unicoderegexp@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/unicoderegexp/-/unicoderegexp-0.4.1.tgz#afb10e4ef1eeddc711417bbb652bc885da9d4171" @@ -6447,7 +6464,7 @@ xmlbuilder@^4.1.0: dependencies: lodash "^4.0.0" -xmldom@0.1.27: +xmldom@^0.1.27: version "0.1.27" resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.27.tgz#d501f97b3bdb403af8ef9ecc20573187aadac0e9" @@ -6455,9 +6472,9 @@ xmlhttprequest-ssl@1.5.3: version "1.5.3" resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz#185a888c04eca46c3e4070d99f7b49de3528992d" -xpath@0.0.24: - version "0.0.24" - resolved "https://registry.yarnpkg.com/xpath/-/xpath-0.0.24.tgz#1ade162e1cc523c8d39fc7d06afc16ea216f29fb" +xpath@^0.0.27: + version "0.0.27" + resolved "https://registry.yarnpkg.com/xpath/-/xpath-0.0.27.tgz#dd3421fbdcc5646ac32c48531b4d7e9d0c2cfa92" "xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.1: version "4.0.1"