mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5863 from nextcloud/pimp_l10n_string 

Move \OC_L10N_String to proper namespace
This commit is contained in:
Lukas Reschke 2017-07-25 10:29:08 +02:00 committed by GitHub
parent 11e182fff2 52b8542364
commit 8521e79e76
7 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/composer/composer/autoload_classmap.php
View File

@ -664,6 +664,7 @@ return array(
'OC\\IntegrityCheck\\Iterator\\ExcludeFoldersByPathFilterIterator' => $baseDir . '/lib/private/IntegrityCheck/Iterator/ExcludeFoldersByPathFilterIterator.php',
'OC\\L10N\\Factory' => $baseDir . '/lib/private/L10N/Factory.php',
'OC\\L10N\\L10N' => $baseDir . '/lib/private/L10N/L10N.php',
'OC\\L10N\\L10NString' => $baseDir . '/lib/private/L10N/L10NString.php',
'OC\\L10N\\LanguageNotFoundException' => $baseDir . '/lib/private/L10N/LanguageNotFoundException.php',
'OC\\LargeFileHelper' => $baseDir . '/lib/private/LargeFileHelper.php',
'OC\\Lock\\AbstractLockingProvider' => $baseDir . '/lib/private/Lock/AbstractLockingProvider.php',

1
lib/composer/composer/autoload_static.php
View File

@ -694,6 +694,7 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c
'OC\\IntegrityCheck\\Iterator\\ExcludeFoldersByPathFilterIterator' => __DIR__ . '/../../..' . '/lib/private/IntegrityCheck/Iterator/ExcludeFoldersByPathFilterIterator.php',
'OC\\L10N\\Factory' => __DIR__ . '/../../..' . '/lib/private/L10N/Factory.php',
'OC\\L10N\\L10N' => __DIR__ . '/../../..' . '/lib/private/L10N/L10N.php',
'OC\\L10N\\L10NString' => __DIR__ . '/../../..' . '/lib/private/L10N/L10NString.php',
'OC\\L10N\\LanguageNotFoundException' => __DIR__ . '/../../..' . '/lib/private/L10N/LanguageNotFoundException.php',
'OC\\LargeFileHelper' => __DIR__ . '/../../..' . '/lib/private/LargeFileHelper.php',
'OC\\Lock\\AbstractLockingProvider' => __DIR__ . '/../../..' . '/lib/private/Lock/AbstractLockingProvider.php',

8
lib/private/L10N/L10N.php
View File

@ -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);
}
}
}

10
lib/private/legacy/l10n/string.php → lib/private/L10N/L10NString.php
View File

@ -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();
}

2
lib/private/legacy/json.php
View File

@ -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;
}
}

4
lib/public/IL10N.php
View File

@ -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.

2
lib/public/Template.php
View File

@ -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
*/