From ae60108692a2c34b0ab474e7d9fa35bb8b689992 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 20 Feb 2015 11:51:36 +0100
Subject: [PATCH] Revert "Correctly fallback to english, if the plural case is
 not translated"

This reverts commit cbad5c998b260040523ac8e6a2797591d0086938.
---
 lib/private/l10n.php        |  2 +-
 lib/private/l10n/string.php | 22 ++--------------------
 tests/data/l10n/ru.json     |  3 +--
 tests/lib/l10n.php          | 18 ------------------
 4 files changed, 4 insertions(+), 41 deletions(-)

diff --git a/lib/private/l10n.php b/lib/private/l10n.php
index 6c66bee3e79..3c759a9e3a2 100644
--- a/lib/private/l10n.php
+++ b/lib/private/l10n.php
@@ -238,7 +238,7 @@ class OC_L10N implements \OCP\IL10N {
 		$this->init();
 		$identifier = "_${text_singular}_::_${text_plural}_";
 		if( array_key_exists($identifier, $this->translations)) {
-			return new OC_L10N_String($this, $identifier, $parameters, $count, array($text_singular, $text_plural));
+			return new OC_L10N_String( $this, $identifier, $parameters, $count );
 		}else{
 			if($count === 1) {
 				return new OC_L10N_String($this, $text_singular, $parameters, $count);
diff --git a/lib/private/l10n/string.php b/lib/private/l10n/string.php
index 5f5452ad16d..04eaacab57b 100644
--- a/lib/private/l10n/string.php
+++ b/lib/private/l10n/string.php
@@ -22,11 +22,6 @@ class OC_L10N_String{
 	 */
 	protected $parameters;
 
-	/**
-	 * @var array
-	 */
-	protected $plurals;
-
 	/**
 	 * @var integer
 	 */
@@ -35,12 +30,11 @@ class OC_L10N_String{
 	/**
 	 * @param OC_L10N $l10n
 	 */
-	public function __construct($l10n, $text, $parameters, $count = 1, $plurals = array()) {
+	public function __construct($l10n, $text, $parameters, $count = 1) {
 		$this->l10n = $l10n;
 		$this->text = $text;
 		$this->parameters = $parameters;
 		$this->count = $count;
-		$this->plurals = $plurals;
 	}
 
 	public function __toString() {
@@ -51,19 +45,7 @@ class OC_L10N_String{
 			if(is_array($translations[$this->text])) {
 				$fn = $this->l10n->getPluralFormFunction();
 				$id = $fn($this->count);
-
-				if ($translations[$this->text][$id] !== '') {
-					// The translation of this plural case is not empty, so use it
-					$text = $translations[$this->text][$id];
-				} else {
-					// We didn't find the plural in the language,
-					// so we fall back to english.
-					$id = ($id != 0) ? 1 : 0;
-					if (isset($this->plurals[$id])) {
-						// Fallback to the english plural
-						$text = $this->plurals[$id];
-					}
-				}
+				$text = $translations[$this->text][$id];
 			}
 			else{
 				$text = $translations[$this->text];
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 2235581add8..68f43b76f51 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';
-- 
2.39.5