Merge pull request #1948 from nextcloud/move_away_lagacy_oc_l10n

Move away from legacy OC_L10N

7 files changed, 12 insertions, 351 deletions

diff --git a/lib/private/AppFramework/DependencyInjection/DIContainer.php b/lib/private/AppFramework/DependencyInjection/DIContainer.php
index 671093ff08b..a1e845f132e 100644
--- a/lib/private/AppFramework/DependencyInjection/DIContainer.php
+++ b/lib/private/AppFramework/DependencyInjection/DIContainer.php
@@ -533,6 +533,9 @@ class DIContainer extends SimpleContainer implements IAppContainer {
 		$this->query('OC\CapabilitiesManager')->registerCapability(function() use ($serviceName) {
 			return $this->query($serviceName);
 		});
+	}
 
+	public function query($name) {
+		return parent::query($name);
 	}
 }
diff --git a/lib/private/Setup/AbstractDatabase.php b/lib/private/Setup/AbstractDatabase.php
index 47c3e5ee1c6..2b9d7afb367 100644
--- a/lib/private/Setup/AbstractDatabase.php
+++ b/lib/private/Setup/AbstractDatabase.php
@@ -29,12 +29,13 @@ namespace OC\Setup;
 use OC\AllConfig;
 use OC\DB\ConnectionFactory;
 use OCP\IConfig;
+use OCP\IL10N;
 use OCP\ILogger;
 use OCP\Security\ISecureRandom;
 
 abstract class AbstractDatabase {
 
-	/** @var \OC_L10N */
+	/** @var IL10N */
 	protected $trans;
 	/** @var string */
 	protected $dbDefinitionFile;
@@ -57,7 +58,7 @@ abstract class AbstractDatabase {
 	/** @var ISecureRandom */
 	protected $random;
 
-	public function __construct($trans, $dbDefinitionFile, IConfig $config, ILogger $logger, ISecureRandom $random) {
+	public function __construct(IL10N $trans, $dbDefinitionFile, IConfig $config, ILogger $logger, ISecureRandom $random) {
 		$this->trans = $trans;
 		$this->dbDefinitionFile = $dbDefinitionFile;
 		$this->config = $config;
diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php
index 9f89174e7f9..7878737bdef 100644
--- a/lib/private/TemplateLayout.php
+++ b/lib/private/TemplateLayout.php
@@ -127,7 +127,7 @@ class TemplateLayout extends \OC_Template {
 
 		}
 		// Send the language to our layouts
-		$this->assign('language', \OC_L10N::findLanguage());
+		$this->assign('language', \OC::$server->getL10NFactory()->findLanguage());
 
 		if(\OC::$server->getSystemConfig()->getValue('installed', false)) {
 			if (empty(self::$versionHash)) {
diff --git a/lib/private/legacy/l10n.php b/lib/private/legacy/l10n.php
deleted file mode 100644
index 94eff197ab6..00000000000
--- a/lib/private/legacy/l10n.php
+++ /dev/null
@@ -1,343 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Bart Visscher <bartv@thisnet.nl>
- * @author Bernhard Posselt <dev@bernhard-posselt.com>
- * @author Jakob Sack <mail@jakobsack.de>
- * @author Jan-Christoph Borchardt <hey@jancborchardt.net>
- * @author Joas Schilling <coding@schilljs.com>
- * @author Lukas Reschke <lukas@statuscode.ch>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Robin Appelman <robin@icewind.nl>
- * @author Robin McCorkell <robin@mccorkell.me.uk>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- * @author Thomas Tanghus <thomas@tanghus.net>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-/**
- * This class is for i18n and l10n
- * @deprecated 9.0.0 Use \OC::$server->getL10NFactory()->get() instead
- */
-class OC_L10N implements \OCP\IL10N {
-	/**
-	 * cache
-	 */
-	protected static $cache = array();
-	protected static $availableLanguages = array();
-
-	/**
-	 * The best language
-	 */
-	protected static $language = '';
-
-	/**
-	 * App of this object
-	 */
-	protected $app;
-
-	/**
-	 * Language of this object
-	 */
-	protected $lang;
-
-	/**
-	 * Translations
-	 */
-	private $translations = array();
-
-	/**
-	 * Plural forms (string)
-	 */
-	private $pluralFormString = 'nplurals=2; plural=(n != 1);';
-
-	/**
-	 * Plural forms (function)
-	 */
-	private $pluralFormFunction = null;
-
-	/**
-	 * The constructor
-	 * @param string $app app requesting l10n
-	 * @param string $lang default: null Language
-	 *
-	 * If language is not set, the constructor tries to find the right
-	 * language.
-	 * @deprecated 9.0.0 Use \OC::$server->getL10NFactory()->get() instead
-	 */
-	public function __construct($app, $lang = null) {
-		$app = \OC_App::cleanAppId($app);
-		$this->app = $app;
-
-		if ($lang !== null) {
-			$lang = str_replace(array('\0', '/', '\\', '..'), '', $lang);
-		}
-
-		// Find the right language
-		if ($app !== 'test' && !\OC::$server->getL10NFactory()->languageExists($app, $lang)) {
-			$lang = \OC::$server->getL10NFactory()->findLanguage($app);
-		}
-
-		$this->lang = $lang;
-	}
-
-	/**
-	 * @param $transFile
-	 * @return bool
-	 */
-	public function load($transFile) {
-		$this->app = true;
-
-		$json = json_decode(file_get_contents($transFile), true);
-		if (!is_array($json)) {
-			$jsonError = json_last_error();
-			\OC::$server->getLogger()->warning("Failed to load $transFile - json error code: $jsonError", ['app' => 'l10n']);
-			return false;
-		}
-
-		$this->pluralFormString = $json['pluralForm'];
-		$translations = $json['translations'];
-
-		$this->translations = array_merge($this->translations, $translations);
-
-		return true;
-	}
-
-	protected function init() {
-		if ($this->app === true) {
-			return;
-		}
-		$app = $this->app;
-		$lang = $this->lang;
-		$this->app = true;
-
-		/** @var \OC\L10N\Factory $factory */
-		$factory = \OC::$server->getL10NFactory();
-		$languageFiles = $factory->getL10nFilesForApp($app, $lang);
-
-		$this->translations = [];
-		foreach ($languageFiles as $languageFile) {
-			$this->load($languageFile);
-		}
-	}
-
-	/**
-	 * Translating
-	 * @param string $text The text we need a translation for
-	 * @param array $parameters default:array() Parameters for sprintf
-	 * @return \OC_L10N_String Translation or the same text
-	 *
-	 * Returns the translation. If no translation is found, $text will be
-	 * returned.
-	 */
-	public function t($text, $parameters = array()) {
-		return new OC_L10N_String($this, $text, $parameters);
-	}
-
-	/**
-	 * Translating
-	 * @param string $text_singular the string to translate for exactly one object
-	 * @param string $text_plural the string to translate for n objects
-	 * @param integer $count Number of objects
-	 * @param array $parameters default:array() Parameters for sprintf
-	 * @return \OC_L10N_String Translation or the same text
-	 *
-	 * Returns the translation. If no translation is found, $text will be
-	 * returned. %n will be replaced with the number of objects.
-	 *
-	 * The correct plural is determined by the plural_forms-function
-	 * provided by the po file.
-	 *
-	 */
-	public function n($text_singular, $text_plural, $count, $parameters = array()) {
-		$this->init();
-		$identifier = "_${text_singular}_::_${text_plural}_";
-		if( array_key_exists($identifier, $this->translations)) {
-			return new OC_L10N_String( $this, $identifier, $parameters, $count );
-		}else{
-			if($count === 1) {
-				return new OC_L10N_String($this, $text_singular, $parameters, $count);
-			}else{
-				return new OC_L10N_String($this, $text_plural, $parameters, $count);
-			}
-		}
-	}
-
-	/**
-	 * getTranslations
-	 * @return array Fetch all translations
-	 *
-	 * Returns an associative array with all translations
-	 */
-	public function getTranslations() {
-		$this->init();
-		return $this->translations;
-	}
-
-	/**
-	 * getPluralFormFunction
-	 * @return string the plural form function
-	 *
-	 * returned function accepts the argument $n
-	 */
-	public function getPluralFormFunction() {
-		$this->init();
-		if (is_null($this->pluralFormFunction)) {
-			$this->pluralFormFunction = \OC::$server->getL10NFactory()->createPluralFunction($this->pluralFormString);
-		}
-		return $this->pluralFormFunction;
-	}
-
-	/**
-	 * Localization
-	 * @param string $type Type of localization
-	 * @param array|int|string $data parameters for this localization
-	 * @param array $options
-	 * @return string|false
-	 *
-	 * Returns the localized data.
-	 *
-	 * Implemented types:
-	 *  - date
-	 *    - Creates a date
-	 *    - params: timestamp (int/string)
-	 *  - datetime
-	 *    - Creates date and time
-	 *    - params: timestamp (int/string)
-	 *  - time
-	 *    - Creates a time
-	 *    - params: timestamp (int/string)
-	 *  - firstday: Returns the first day of the week (0 sunday - 6 saturday)
-	 *  - jsdate: Returns the short JS date format
-	 */
-	public function l($type, $data, $options = array()) {
-		if ($type === 'firstday') {
-			return $this->getFirstWeekDay();
-		}
-		if ($type === 'jsdate') {
-			return $this->getDateFormat();
-		}
-
-		$this->init();
-		$value = new DateTime();
-		if($data instanceof DateTime) {
-			$value = $data;
-		} elseif(is_string($data) && !is_numeric($data)) {
-			$data = strtotime($data);
-			$value->setTimestamp($data);
-		} else {
-			$value->setTimestamp($data);
-		}
-
-		// Use the language of the instance
-		$locale = $this->transformToCLDRLocale($this->getLanguageCode());
-
-		$options = array_merge(array('width' => 'long'), $options);
-		$width = $options['width'];
-		switch($type) {
-			case 'date':
-				return Punic\Calendar::formatDate($value, $width, $locale);
-			case 'datetime':
-				return Punic\Calendar::formatDatetime($value, $width, $locale);
-			case 'time':
-				return Punic\Calendar::formatTime($value, $width, $locale);
-			default:
-				return false;
-		}
-	}
-
-	/**
-	 * The code (en, de, ...) of the language that is used for this OC_L10N object
-	 *
-	 * @return string language
-	 */
-	public function getLanguageCode() {
-		return $this->lang;
-	}
-
-	/**
-	 * @return string
-	 * @throws \Punic\Exception\ValueNotInList
-	 * @deprecated 9.0.0 Use $this->l('jsdate', null) instead
-	 */
-	public function getDateFormat() {
-		$locale = $this->transformToCLDRLocale($this->getLanguageCode());
-		return Punic\Calendar::getDateFormat('short', $locale);
-	}
-
-	/**
-	 * @return int
-	 * @deprecated 9.0.0 Use $this->l('firstday', null) instead
-	 */
-	public function getFirstWeekDay() {
-		$locale = $this->transformToCLDRLocale($this->getLanguageCode());
-		return Punic\Calendar::getFirstWeekday($locale);
-	}
-
-	/**
-	 * @param string $locale
-	 * @return string
-	 */
-	private function transformToCLDRLocale($locale) {
-		if ($locale === 'sr@latin') {
-			return 'sr_latn';
-		}
-
-		return $locale;
-	}
-
-	/**
-	 * find the best language
-	 * @param string $app
-	 * @return string language
-	 *
-	 * If nothing works it returns 'en'
-	 * @deprecated 9.0.0 Use \OC::$server->getL10NFactory()->findLanguage() instead
-	 */
-	public static function findLanguage($app = null) {
-		return \OC::$server->getL10NFactory()->findLanguage($app);
-	}
-
-	/**
-	 * @return string
-	 * @deprecated 9.0.0 Use \OC::$server->getL10NFactory()->setLanguageFromRequest() instead
-	 */
-	public static function setLanguageFromRequest() {
-		return \OC::$server->getL10NFactory()->setLanguageFromRequest();
-	}
-
-	/**
-	 * find all available languages for an app
-	 * @param string $app App that needs to be translated
-	 * @return array an array of available languages
-	 * @deprecated 9.0.0 Use \OC::$server->getL10NFactory()->findAvailableLanguages() instead
-	 */
-	public static function findAvailableLanguages($app=null) {
-		return \OC::$server->getL10NFactory()->findAvailableLanguages($app);
-	}
-
-	/**
-	 * @param string $app
-	 * @param string $lang
-	 * @return bool
-	 * @deprecated 9.0.0 Use \OC::$server->getL10NFactory()->languageExists() instead
-	 */
-	public static function languageExists($app, $lang) {
-		return \OC::$server->getL10NFactory()->languageExists($app, $lang);
-	}
-}
diff --git a/lib/private/legacy/l10n/string.php b/lib/private/legacy/l10n/string.php
index 3d9d72e0690..1410db6d730 100644
--- a/lib/private/legacy/l10n/string.php
+++ b/lib/private/legacy/l10n/string.php
@@ -27,7 +27,7 @@
  */
 
 class OC_L10N_String implements JsonSerializable {
-	/** @var \OC_L10N|\OC\L10N\L10N */
+	/** @var \OC\L10N\L10N */
 	protected $l10n;
 
 	/** @var string */
@@ -40,12 +40,12 @@ class OC_L10N_String implements JsonSerializable {
 	protected $count;
 
 	/**
-	 * @param \OC_L10N|\OC\L10N\L10N $l10n
+	 * @param \OC\L10N\L10N $l10n
 	 * @param string|string[] $text
 	 * @param array $parameters
 	 * @param int $count
 	 */
-	public function __construct($l10n, $text, $parameters, $count = 1) {
+	public function __construct(\OC\L10N\L10N $l10n, $text, $parameters, $count = 1) {
 		$this->l10n = $l10n;
 		$this->text = $text;
 		$this->parameters = $parameters;
diff --git a/lib/private/legacy/util.php b/lib/private/legacy/util.php
index 42fd0ba7db3..e4c2caeafd7 100644
--- a/lib/private/legacy/util.php
+++ b/lib/private/legacy/util.php
@@ -526,7 +526,7 @@ class OC_Util {
 	 */
 	public static function addTranslations($application, $languageCode = null, $prepend = false) {
 		if (is_null($languageCode)) {
-			$languageCode = \OC_L10N::findLanguage($application);
+			$languageCode = \OC::$server->getL10NFactory()->findLanguage($application);
 		}
 		if (!empty($application)) {
 			$path = "$application/l10n/$languageCode";
diff --git a/lib/public/Util.php b/lib/public/Util.php
index d5b0752553d..08661fd88ca 100644
--- a/lib/public/Util.php
+++ b/lib/public/Util.php
@@ -195,7 +195,7 @@ class Util {
 	 * get l10n object
 	 * @param string $application
 	 * @param string|null $language
-	 * @return \OC_L10N
+	 * @return \OCP\IL10N
 	 * @since 6.0.0 - parameter $language was added in 8.0.0
 	 */
 	public static function getL10N($application, $language = null) {