diff options
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/L10N/L10N.php | 8 | ||||
| -rw-r--r-- | lib/private/L10N/L10NString.php (renamed from lib/private/legacy/l10n/string.php) | 10 | ||||
| -rw-r--r-- | lib/private/legacy/json.php | 2 |
3 files changed, 14 insertions, 6 deletions
diff --git a/lib/private/L10N/L10N.php b/lib/private/L10N/L10N.php index c83b6ea3960..b933048982f 100644 --- a/lib/private/L10N/L10N.php +++ b/lib/private/L10N/L10N.php @@ -82,7 +82,7 @@ class L10N implements IL10N { * returned. */ public function t($text, $parameters = array()) { - return (string) new \OC_L10N_String($this, $text, $parameters); + return (string) new L10NString($this, $text, $parameters); } /** @@ -103,12 +103,12 @@ class L10N implements IL10N { public function n($text_singular, $text_plural, $count, $parameters = array()) { $identifier = "_${text_singular}_::_${text_plural}_"; if (isset($this->translations[$identifier])) { - return (string) new \OC_L10N_String($this, $identifier, $parameters, $count); + return (string) new L10NString($this, $identifier, $parameters, $count); } else { if ($count === 1) { - return (string) new \OC_L10N_String($this, $text_singular, $parameters, $count); + return (string) new L10NString($this, $text_singular, $parameters, $count); } else { - return (string) new \OC_L10N_String($this, $text_plural, $parameters, $count); + return (string) new L10NString($this, $text_plural, $parameters, $count); } } } diff --git a/lib/private/legacy/l10n/string.php b/lib/private/L10N/L10NString.php index 1410db6d730..fd2f14f9f28 100644 --- a/lib/private/legacy/l10n/string.php +++ b/lib/private/L10N/L10NString.php @@ -26,7 +26,9 @@ * */ -class OC_L10N_String implements JsonSerializable { +namespace OC\L10N; + +class L10NString implements \JsonSerializable { /** @var \OC\L10N\L10N */ protected $l10n; @@ -52,6 +54,9 @@ class OC_L10N_String implements JsonSerializable { $this->count = $count; } + /** + * @return string + */ public function __toString() { $translations = $this->l10n->getTranslations(); @@ -73,6 +78,9 @@ class OC_L10N_String implements JsonSerializable { } + /** + * @return string + */ public function jsonSerialize() { return $this->__toString(); } 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; } } |