Move languageExists() to the factory

3 files changed, 27 insertions, 8 deletions

diff --git a/lib/private/l10n.php b/lib/private/l10n.php
index aa19102b70c..085914a68b6 100644
--- a/lib/private/l10n.php
+++ b/lib/private/l10n.php
@@ -462,16 +462,10 @@ class OC_L10N implements \OCP\IL10N {
 	 * @param string $app
 	 * @param string $lang
 	 * @return bool
+	 * @deprecated 9.0.0 Use \OC::$server->getL10NFactory()->languageExists() instead
 	 */
 	public static function languageExists($app, $lang) {
-		if ($lang === 'en') {//english is always available
-			return true;
-		}
-		$dir = self::findI18nDir($app);
-		if(is_dir($dir)) {
-			return file_exists($dir.'/'.$lang.'.json');
-		}
-		return false;
+		return \OC::$server->getL10NFactory()->languageExists($app, $lang);
 	}
 
 	/**
diff --git a/lib/private/l10n/factory.php b/lib/private/l10n/factory.php
index aaa41f5e645..b1304727606 100644
--- a/lib/private/l10n/factory.php
+++ b/lib/private/l10n/factory.php
@@ -37,6 +37,9 @@ class Factory implements IFactory {
 	 */
 	protected $instances = [];
 
+	/**
+	 * @var array Structure: App => string[]
+	 */
 	protected $availableLanguages = [];
 
 	/**
@@ -94,6 +97,20 @@ class Factory implements IFactory {
 	}
 
 	/**
+	 * @param string|null $app App id or null for core
+	 * @param string $lang
+	 * @return bool
+	 */
+	public function languageExists($app, $lang) {
+		if ($lang === 'en') {//english is always available
+			return true;
+		}
+
+		$languages = $this->findAvailableLanguages($app);
+		return array_search($lang, $languages);
+	}
+
+	/**
 	 * find the l10n directory
 	 *
 	 * @param string $app App id or empty string for core
diff --git a/lib/public/l10n/ifactory.php b/lib/public/l10n/ifactory.php
index d6944b375f0..09c75e9af7d 100644
--- a/lib/public/l10n/ifactory.php
+++ b/lib/public/l10n/ifactory.php
@@ -42,4 +42,12 @@ interface IFactory {
 	 * @since 9.0.0
 	 */
 	public function findAvailableLanguages($app = null);
+
+	/**
+	 * @param string|null $app App id or null for core
+	 * @param string $lang
+	 * @return bool
+	 * @since 9.0.0
+	 */
+	public function languageExists($app, $lang);
 }