Move \OC_L10N_String to proper \OC\L10N\L10NString

* Proper namespacing
* Fixed phpdocs

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

2 files changed, 1 insertions, 80 deletions

diff --git a/lib/private/legacy/json.php b/lib/private/legacy/json.php
index 0e598a68ee1..9b90daccac9 100644
--- a/lib/private/legacy/json.php
+++ b/lib/private/legacy/json.php
@@ -159,7 +159,7 @@ class OC_JSON{
 	 * Convert OC_L10N_String to string, for use in json encodings
 	 */
 	protected static function to_string(&$value) {
-		if ($value instanceof OC_L10N_String) {
+		if ($value instanceof \OC\L10N\L10NString) {
 			$value = (string)$value;
 		}
 	}
diff --git a/lib/private/legacy/l10n/string.php b/lib/private/legacy/l10n/string.php
deleted file mode 100644
index 1410db6d730..00000000000
--- a/lib/private/legacy/l10n/string.php
+++ /dev/null
@@ -1,79 +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 Joas Schilling <coding@schilljs.com>
- * @author Jörn Friedrich Dreyer <jfd@butonic.de>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- *
- * @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/>
- *
- */
-
-class OC_L10N_String implements JsonSerializable {
-	/** @var \OC\L10N\L10N */
-	protected $l10n;
-
-	/** @var string */
-	protected $text;
-
-	/** @var array */
-	protected $parameters;
-
-	/** @var integer */
-	protected $count;
-
-	/**
-	 * @param \OC\L10N\L10N $l10n
-	 * @param string|string[] $text
-	 * @param array $parameters
-	 * @param int $count
-	 */
-	public function __construct(\OC\L10N\L10N $l10n, $text, $parameters, $count = 1) {
-		$this->l10n = $l10n;
-		$this->text = $text;
-		$this->parameters = $parameters;
-		$this->count = $count;
-	}
-
-	public function __toString() {
-		$translations = $this->l10n->getTranslations();
-
-		$text = $this->text;
-		if(array_key_exists($this->text, $translations)) {
-			if(is_array($translations[$this->text])) {
-				$fn = $this->l10n->getPluralFormFunction();
-				$id = $fn($this->count);
-				$text = $translations[$this->text][$id];
-			}
-			else{
-				$text = $translations[$this->text];
-			}
-		}
-
-		// Replace %n first (won't interfere with vsprintf)
-		$text = str_replace('%n', $this->count, $text);
-		return vsprintf($text, $this->parameters);
-	}
-
-
-	public function jsonSerialize() {
-		return $this->__toString();
-	}
-}