* Proper namespacing * Fixed phpdocs Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>tags/v13.0.0beta1
@@ -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); | |||
} | |||
} | |||
} |
@@ -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(); | |||
} |
@@ -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; | |||
} | |||
} |
@@ -47,7 +47,7 @@ interface IL10N { | |||
* 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 | |||
* @return string Translation or the same text | |||
* | |||
* Returns the translation. If no translation is found, $text will be | |||
* returned. | |||
@@ -61,7 +61,7 @@ interface IL10N { | |||
* @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 | |||
* @return 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. |
@@ -102,7 +102,7 @@ function human_file_size($bytes) { | |||
* Return the relative date in relation to today. Returns something like "last hour" or "two month ago" | |||
* @param int $timestamp unix timestamp | |||
* @param boolean $dateOnly | |||
* @return \OC_L10N_String human readable interpretation of the timestamp | |||
* @return string human readable interpretation of the timestamp | |||
* | |||
* @deprecated 8.0.0 Use \OCP\Template::relative_modified_date() instead | |||
*/ |