in case a translation javascript is not found we no longer bail out

remove translation.php

3 files changed, 5 insertions, 12 deletions

diff --git a/lib/private/l10n.php b/lib/private/l10n.php
index 0b20eafea32..ee144cd221c 100644
--- a/lib/private/l10n.php
+++ b/lib/private/l10n.php
@@ -266,17 +266,6 @@ class OC_L10N implements \OCP\IL10N {
 	}
 
 	/**
-	 * getPluralFormString
-	 * @return string containing the gettext "Plural-Forms"-string
-	 *
-	 * Returns a string like "nplurals=2; plural=(n != 1);"
-	 */
-	public function getPluralFormString() {
-		$this->init();
-		return $this->plural_form_string;
-	}
-
-	/**
 	 * getPluralFormFunction
 	 * @return string the plural form function
 	 *
diff --git a/lib/private/template/jsresourcelocator.php b/lib/private/template/jsresourcelocator.php
index f8fe3817ce6..507f31327a6 100644
--- a/lib/private/template/jsresourcelocator.php
+++ b/lib/private/template/jsresourcelocator.php
@@ -35,6 +35,10 @@ class JSResourceLocator extends ResourceLocator {
 		) {
 			return;
 		}
+		// missing translations files fill be ignored
+		if (strpos($script, "l10n/") === 0) {
+			return;
+		}
 		throw new \Exception('js file not found: script:'.$script);
 	}
 
diff --git a/lib/private/util.php b/lib/private/util.php
index 5105bb22931..9b8a7a5bc40 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -363,7 +363,7 @@ class OC_Util {
 		if (!empty($application)) {
 			self::$scripts[] = "$application/l10n/$languageCode";
 		} else {
-			self::$scripts[] = "js/$languageCode";
+			self::$scripts[] = "l10n/$languageCode";
 		}
 	}