summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorLukas Reschke <lukas@owncloud.com>2015-03-26 20:15:33 +0100
committerLukas Reschke <lukas@owncloud.com>2015-03-26 20:15:33 +0100
commit74a9fc29b43b54ec8aa9f6b9cac1cbfa4a5136e2 (patch)
tree9489220921b93420730b13a9dd7c23a1d0e6ec29 /tests
parentc8c722bc6de3a58e10ba42a55a178d3ba9308bae (diff)
parentae60108692a2c34b0ab474e7d9fa35bb8b689992 (diff)
downloadnextcloud-server-74a9fc29b43b54ec8aa9f6b9cac1cbfa4a5136e2.tar.gz
nextcloud-server-74a9fc29b43b54ec8aa9f6b9cac1cbfa4a5136e2.zip
Merge pull request #14399 from owncloud/ignore-empty-plurals
Ignore empty plurals just like with singulars
Diffstat (limited to 'tests')
-rw-r--r--tests/data/l10n/ru.json3
-rw-r--r--tests/lib/l10n.php18
2 files changed, 1 insertions, 20 deletions
diff --git a/tests/data/l10n/ru.json b/tests/data/l10n/ru.json
index 7041205e761..177b14a6b20 100644
--- a/tests/data/l10n/ru.json
+++ b/tests/data/l10n/ru.json
@@ -1,7 +1,6 @@
{
"translations" : {
- "_%n file_::_%n files_" : ["%n файл", "%n файла", "%n файлов"],
- "_%n missing plural_::_%n missing plurals_" : ["", "", ""]
+ "_%n file_::_%n files_" : ["%n файл", "%n файла", "%n файлов"]
},
"pluralForm" : "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
}
diff --git a/tests/lib/l10n.php b/tests/lib/l10n.php
index 0307dd459e5..d5f9a5ca3fa 100644
--- a/tests/lib/l10n.php
+++ b/tests/lib/l10n.php
@@ -42,24 +42,6 @@ class Test_L10n extends \Test\TestCase {
*/
}
- public function russianMissingPluralTranslationsData() {
- return array(
- array(1, '1 missing plural'),
- array(2, '2 missing plurals'),
- array(6, '6 missing plurals'),
- );
- }
-
- /**
- * @dataProvider russianMissingPluralTranslationsData
- */
- public function testRussianMissingPluralTranslations($count, $expected) {
- $l = new OC_L10N('test');
- $l->load(OC::$SERVERROOT.'/tests/data/l10n/ru.json');
-
- $this->assertEquals($expected, (string)$l->n('%n missing plural', '%n missing plurals', $count));
- }
-
public function testCzechPluralTranslations() {
$l = new OC_L10N('test');
$transFile = OC::$SERVERROOT.'/tests/data/l10n/cs.json';