nextcloud / server

core/templates/internalaltmail.php

Indentation +2 added lines, -2 removed lines

@@ -1,8 +1,8 @@
 <?php
 print_unescaped($l->t("Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n", array($_['user_displayname'], $_['filename'], $_['link'])));
 if ( isset($_['expiration']) ) {
-	print_unescaped($l->t("The share will expire on %s.", array($_['expiration'])));
-	print_unescaped("\n\n");
+    print_unescaped($l->t("The share will expire on %s.", array($_['expiration'])));
+    print_unescaped("\n\n");
 }
 // TRANSLATORS term at the end of a mail
 p($l->t("Cheers!"));

core/templates/internalmail.php

Indentation +2 added lines, -2 removed lines

@@ -13,8 +13,8 @@
 <?php
 print_unescaped($l->t('Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href="%s">View it!</a><br><br>', array($_['user_displayname'], $_['filename'], $_['link'])));
 if ( isset($_['expiration']) ) {
-	p($l->t("The share will expire on %s.", array($_['expiration'])));
-	print_unescaped('<br><br>');
+    p($l->t("The share will expire on %s.", array($_['expiration'])));
+    print_unescaped('<br><br>');
 }
 // TRANSLATORS term at the end of a mail
 p($l->t('Cheers!'));

core/ajax/appconfig.php

Indentation +24 added lines, -24 removed lines

@@ -29,7 +29,7 @@ 
 $action=isset($_POST['action'])?$_POST['action']:$_GET['action'];
 
 if(isset($_POST['app']) || isset($_GET['app'])) {
-	$app=OC_App::cleanAppId(isset($_POST['app'])? (string)$_POST['app']: (string)$_GET['app']);
+    $app=OC_App::cleanAppId(isset($_POST['app'])? (string)$_POST['app']: (string)$_GET['app']);
 }
 
 // An admin should not be able to add remote and public services
@@ -37,34 +37,34 @@ 
 // This change is due the fact that an admin may not be expected 
 // to execute arbitrary code in every environment.
 if($app === 'core' && isset($_POST['key']) &&(substr((string)$_POST['key'],0,7) === 'remote_' || substr((string)$_POST['key'],0,7) === 'public_')) {
-	OC_JSON::error(array('data' => array('message' => 'Unexpected error!')));
-	return;
+    OC_JSON::error(array('data' => array('message' => 'Unexpected error!')));
+    return;
 }
 
 $result=false;
 $appConfig = \OC::$server->getAppConfig();
 switch($action) {
-	case 'getValue':
-		$result=$appConfig->getValue($app, (string)$_GET['key'], (string)$_GET['defaultValue']);
-		break;
-	case 'setValue':
-		$result=$appConfig->setValue($app, (string)$_POST['key'], (string)$_POST['value']);
-		break;
-	case 'getApps':
-		$result=$appConfig->getApps();
-		break;
-	case 'getKeys':
-		$result=$appConfig->getKeys($app);
-		break;
-	case 'hasKey':
-		$result=$appConfig->hasKey($app, (string)$_GET['key']);
-		break;
-	case 'deleteKey':
-		$result=$appConfig->deleteKey($app, (string)$_POST['key']);
-		break;
-	case 'deleteApp':
-		$result=$appConfig->deleteApp($app);
-		break;
+    case 'getValue':
+        $result=$appConfig->getValue($app, (string)$_GET['key'], (string)$_GET['defaultValue']);
+        break;
+    case 'setValue':
+        $result=$appConfig->setValue($app, (string)$_POST['key'], (string)$_POST['value']);
+        break;
+    case 'getApps':
+        $result=$appConfig->getApps();
+        break;
+    case 'getKeys':
+        $result=$appConfig->getKeys($app);
+        break;
+    case 'hasKey':
+        $result=$appConfig->hasKey($app, (string)$_GET['key']);
+        break;
+    case 'deleteKey':
+        $result=$appConfig->deleteKey($app, (string)$_POST['key']);
+        break;
+    case 'deleteApp':
+        $result=$appConfig->deleteApp($app);
+        break;
 }
 OC_JSON::success(array('data'=>$result));
 

core/js/config.php

Indentation +120 added lines, -120 removed lines

@@ -34,7 +34,7 @@ 
  */
 
 if(!\OC::$server->getRequest()->passesStrictCookieCheck()) {
-	die();
+    die();
 }
 
 // Set the content type to Javascript
@@ -53,7 +53,7 @@ 
 // Get the config
 $apps_paths = array();
 foreach(OC_App::getEnabledApps() as $app) {
-	$apps_paths[$app] = OC_App::getAppWebPath($app);
+    $apps_paths[$app] = OC_App::getAppWebPath($app);
 }
 
 $config = \OC::$server->getConfig();
@@ -61,9 +61,9 @@ 
 $defaultExpireDateEnabled = ($value === 'yes') ? true :false;
 $defaultExpireDate = $enforceDefaultExpireDate = null;
 if ($defaultExpireDateEnabled) {
-	$defaultExpireDate = (int) $config->getAppValue('core', 'shareapi_expire_after_n_days', '7');
-	$value = $config->getAppValue('core', 'shareapi_enforce_expire_date', 'no');
-	$enforceDefaultExpireDate = ($value === 'yes') ? true : false;
+    $defaultExpireDate = (int) $config->getAppValue('core', 'shareapi_expire_after_n_days', '7');
+    $value = $config->getAppValue('core', 'shareapi_enforce_expire_date', 'no');
+    $enforceDefaultExpireDate = ($value === 'yes') ? true : false;
 }
 $outgoingServer2serverShareEnabled = $config->getAppValue('files_sharing', 'outgoing_server2server_share_enabled', 'yes') === 'yes';
 
@@ -71,123 +71,123 @@ 
 
 $dataLocation = str_replace(OC::$SERVERROOT .'/', '', $config->getSystemValue('datadirectory', ''), $countOfDataLocation);
 if($countOfDataLocation !== 1 || !OC_User::isAdminUser(OC_User::getUser())){
-	$dataLocation = false;
+    $dataLocation = false;
 }
 
 $array = array(
-	"oc_debug" => $config->getSystemValue('debug', false) ? 'true' : 'false',
-	"oc_isadmin" => OC_User::isAdminUser(OC_User::getUser()) ? 'true' : 'false',
-	"oc_dataURL" => is_string($dataLocation) ? "\"".$dataLocation."\"" : 'false',
-	"oc_webroot" => "\"".OC::$WEBROOT."\"",
-	"oc_appswebroots" =>  str_replace('\\/', '/', json_encode($apps_paths)), // Ugly unescape slashes waiting for better solution
-	"datepickerFormatDate" => json_encode($l->l('jsdate', null)),
-	"dayNames" =>  json_encode(
-		array(
-			(string)$l->t('Sunday'),
-			(string)$l->t('Monday'),
-			(string)$l->t('Tuesday'),
-			(string)$l->t('Wednesday'),
-			(string)$l->t('Thursday'),
-			(string)$l->t('Friday'),
-			(string)$l->t('Saturday')
-		)
-	),
-	"dayNamesShort" =>  json_encode(
-		array(
-			(string)$l->t('Sun.'),
-			(string)$l->t('Mon.'),
-			(string)$l->t('Tue.'),
-			(string)$l->t('Wed.'),
-			(string)$l->t('Thu.'),
-			(string)$l->t('Fri.'),
-			(string)$l->t('Sat.')
-		)
-	),
-	"dayNamesMin" =>  json_encode(
-		array(
-			(string)$l->t('Su'),
-			(string)$l->t('Mo'),
-			(string)$l->t('Tu'),
-			(string)$l->t('We'),
-			(string)$l->t('Th'),
-			(string)$l->t('Fr'),
-			(string)$l->t('Sa')
-		)
-	),
-	"monthNames" => json_encode(
-		array(
-			(string)$l->t('January'),
-			(string)$l->t('February'),
-			(string)$l->t('March'),
-			(string)$l->t('April'),
-			(string)$l->t('May'),
-			(string)$l->t('June'),
-			(string)$l->t('July'),
-			(string)$l->t('August'),
-			(string)$l->t('September'),
-			(string)$l->t('October'),
-			(string)$l->t('November'),
-			(string)$l->t('December')
-		)
-	),
-	"monthNamesShort" => json_encode(
-		array(
-			(string)$l->t('Jan.'),
-			(string)$l->t('Feb.'),
-			(string)$l->t('Mar.'),
-			(string)$l->t('Apr.'),
-			(string)$l->t('May.'),
-			(string)$l->t('Jun.'),
-			(string)$l->t('Jul.'),
-			(string)$l->t('Aug.'),
-			(string)$l->t('Sep.'),
-			(string)$l->t('Oct.'),
-			(string)$l->t('Nov.'),
-			(string)$l->t('Dec.')
-		)
-	),
-	"firstDay" => json_encode($l->l('firstday', null)) ,
-	"oc_config" => json_encode(
-		array(
-			'session_lifetime'	=> min(\OCP\Config::getSystemValue('session_lifetime', OC::$server->getIniWrapper()->getNumeric('session.gc_maxlifetime')), OC::$server->getIniWrapper()->getNumeric('session.gc_maxlifetime')),
-			'session_keepalive'	=> \OCP\Config::getSystemValue('session_keepalive', true),
-			'version'			=> implode('.', \OCP\Util::getVersion()),
-			'versionstring'		=> OC_Util::getVersionString(),
-			'enable_avatars'	=> \OC::$server->getConfig()->getSystemValue('enable_avatars', true) === true,
-			'lost_password_link'=> \OC::$server->getConfig()->getSystemValue('lost_password_link', null),
-			'modRewriteWorking'	=> (getenv('front_controller_active') === 'true'),
-		)
-	),
-	"oc_appconfig" => json_encode(
-			array("core" => array(
-				'defaultExpireDateEnabled' => $defaultExpireDateEnabled,
-				'defaultExpireDate' => $defaultExpireDate,
-				'defaultExpireDateEnforced' => $enforceDefaultExpireDate,
-				'enforcePasswordForPublicLink' => \OCP\Util::isPublicLinkPasswordRequired(),
-				'sharingDisabledForUser' => \OCP\Util::isSharingDisabledForUser(),
-				'resharingAllowed' => \OCP\Share::isResharingAllowed(),
-				'remoteShareAllowed' => $outgoingServer2serverShareEnabled,
-				'federatedCloudShareDoc' => \OC::$server->getURLGenerator()->linkToDocs('user-sharing-federated'),
-				'allowGroupSharing' => \OC::$server->getShareManager()->allowGroupSharing()
-				)
-			)
-	),
-	"oc_defaults" => json_encode(
-		array(
-			'entity' => $defaults->getEntity(),
-			'name' => $defaults->getName(),
-			'title' => $defaults->getTitle(),
-			'baseUrl' => $defaults->getBaseUrl(),
-			'syncClientUrl' => $defaults->getSyncClientUrl(),
-			'docBaseUrl' => $defaults->getDocBaseUrl(),
-			'docPlaceholderUrl' => $defaults->buildDocLinkToKey('PLACEHOLDER'),
-			'slogan' => $defaults->getSlogan(),
-			'logoClaim' => $defaults->getLogoClaim(),
-			'shortFooter' => $defaults->getShortFooter(),
-			'longFooter' => $defaults->getLongFooter(),
-			'folder' => OC_Util::getTheme(),
-		)
-	)
+    "oc_debug" => $config->getSystemValue('debug', false) ? 'true' : 'false',
+    "oc_isadmin" => OC_User::isAdminUser(OC_User::getUser()) ? 'true' : 'false',
+    "oc_dataURL" => is_string($dataLocation) ? "\"".$dataLocation."\"" : 'false',
+    "oc_webroot" => "\"".OC::$WEBROOT."\"",
+    "oc_appswebroots" =>  str_replace('\\/', '/', json_encode($apps_paths)), // Ugly unescape slashes waiting for better solution
+    "datepickerFormatDate" => json_encode($l->l('jsdate', null)),
+    "dayNames" =>  json_encode(
+        array(
+            (string)$l->t('Sunday'),
+            (string)$l->t('Monday'),
+            (string)$l->t('Tuesday'),
+            (string)$l->t('Wednesday'),
+            (string)$l->t('Thursday'),
+            (string)$l->t('Friday'),
+            (string)$l->t('Saturday')
+        )
+    ),
+    "dayNamesShort" =>  json_encode(
+        array(
+            (string)$l->t('Sun.'),
+            (string)$l->t('Mon.'),
+            (string)$l->t('Tue.'),
+            (string)$l->t('Wed.'),
+            (string)$l->t('Thu.'),
+            (string)$l->t('Fri.'),
+            (string)$l->t('Sat.')
+        )
+    ),
+    "dayNamesMin" =>  json_encode(
+        array(
+            (string)$l->t('Su'),
+            (string)$l->t('Mo'),
+            (string)$l->t('Tu'),
+            (string)$l->t('We'),
+            (string)$l->t('Th'),
+            (string)$l->t('Fr'),
+            (string)$l->t('Sa')
+        )
+    ),
+    "monthNames" => json_encode(
+        array(
+            (string)$l->t('January'),
+            (string)$l->t('February'),
+            (string)$l->t('March'),
+            (string)$l->t('April'),
+            (string)$l->t('May'),
+            (string)$l->t('June'),
+            (string)$l->t('July'),
+            (string)$l->t('August'),
+            (string)$l->t('September'),
+            (string)$l->t('October'),
+            (string)$l->t('November'),
+            (string)$l->t('December')
+        )
+    ),
+    "monthNamesShort" => json_encode(
+        array(
+            (string)$l->t('Jan.'),
+            (string)$l->t('Feb.'),
+            (string)$l->t('Mar.'),
+            (string)$l->t('Apr.'),
+            (string)$l->t('May.'),
+            (string)$l->t('Jun.'),
+            (string)$l->t('Jul.'),
+            (string)$l->t('Aug.'),
+            (string)$l->t('Sep.'),
+            (string)$l->t('Oct.'),
+            (string)$l->t('Nov.'),
+            (string)$l->t('Dec.')
+        )
+    ),
+    "firstDay" => json_encode($l->l('firstday', null)) ,
+    "oc_config" => json_encode(
+        array(
+            'session_lifetime'	=> min(\OCP\Config::getSystemValue('session_lifetime', OC::$server->getIniWrapper()->getNumeric('session.gc_maxlifetime')), OC::$server->getIniWrapper()->getNumeric('session.gc_maxlifetime')),
+            'session_keepalive'	=> \OCP\Config::getSystemValue('session_keepalive', true),
+            'version'			=> implode('.', \OCP\Util::getVersion()),
+            'versionstring'		=> OC_Util::getVersionString(),
+            'enable_avatars'	=> \OC::$server->getConfig()->getSystemValue('enable_avatars', true) === true,
+            'lost_password_link'=> \OC::$server->getConfig()->getSystemValue('lost_password_link', null),
+            'modRewriteWorking'	=> (getenv('front_controller_active') === 'true'),
+        )
+    ),
+    "oc_appconfig" => json_encode(
+            array("core" => array(
+                'defaultExpireDateEnabled' => $defaultExpireDateEnabled,
+                'defaultExpireDate' => $defaultExpireDate,
+                'defaultExpireDateEnforced' => $enforceDefaultExpireDate,
+                'enforcePasswordForPublicLink' => \OCP\Util::isPublicLinkPasswordRequired(),
+                'sharingDisabledForUser' => \OCP\Util::isSharingDisabledForUser(),
+                'resharingAllowed' => \OCP\Share::isResharingAllowed(),
+                'remoteShareAllowed' => $outgoingServer2serverShareEnabled,
+                'federatedCloudShareDoc' => \OC::$server->getURLGenerator()->linkToDocs('user-sharing-federated'),
+                'allowGroupSharing' => \OC::$server->getShareManager()->allowGroupSharing()
+                )
+            )
+    ),
+    "oc_defaults" => json_encode(
+        array(
+            'entity' => $defaults->getEntity(),
+            'name' => $defaults->getName(),
+            'title' => $defaults->getTitle(),
+            'baseUrl' => $defaults->getBaseUrl(),
+            'syncClientUrl' => $defaults->getSyncClientUrl(),
+            'docBaseUrl' => $defaults->getDocBaseUrl(),
+            'docPlaceholderUrl' => $defaults->buildDocLinkToKey('PLACEHOLDER'),
+            'slogan' => $defaults->getSlogan(),
+            'logoClaim' => $defaults->getLogoClaim(),
+            'shortFooter' => $defaults->getShortFooter(),
+            'longFooter' => $defaults->getLongFooter(),
+            'folder' => OC_Util::getTheme(),
+        )
+    )
 );
 
 // Allow hooks to modify the output values
@@ -195,5 +195,5 @@ 
 
 // Echo it
 foreach ($array as  $setting => $value) {
-	echo("var ". $setting ."=".$value.";\n");
+    echo("var ". $setting ."=".$value.";\n");
 }

lib/private/legacy/l10n.php

Indentation +305 added lines, -305 removed lines

@@ -35,309 +35,309 @@
  * @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);
-	}
+    /**
+     * 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);
+    }
 }

settings/templates/email.new_user.php

Indentation +4 added lines, -4 removed lines

@@ -12,11 +12,11 @@
 					<td width="20px">&nbsp;</td>
 					<td style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">
 						<?php
-						print_unescaped($l->t('Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href="%s">%s</a><br><br>', array($theme->getName(), $_['username'], $_['url'], $_['url'])));
+                        print_unescaped($l->t('Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href="%s">%s</a><br><br>', array($theme->getName(), $_['username'], $_['url'], $_['url'])));
 
-						// TRANSLATORS term at the end of a mail
-						p($l->t('Cheers!'));
-						?>
+                        // TRANSLATORS term at the end of a mail
+                        p($l->t('Cheers!'));
+                        ?>
 					</td>
 				</tr>
 				<tr><td colspan="2">&nbsp;</td></tr>

settings/templates/apps.php

Indentation +14 added lines, -14 removed lines

@@ -1,24 +1,24 @@
 <?php
 style('settings', 'settings');
 vendor_style(
-	'core',
-	[
-		'select2/select2',
-	]
+    'core',
+    [
+        'select2/select2',
+    ]
 );
 vendor_script(
-	'core',
-	[
-		'handlebars/handlebars',
-		'select2/select2'
-	]
+    'core',
+    [
+        'handlebars/handlebars',
+        'select2/select2'
+    ]
 );
 script(
-	'settings',
-	[
-		'settings',
-		'apps',
-	]
+    'settings',
+    [
+        'settings',
+        'apps',
+    ]
 );
 /** @var array $_ */
 ?>

settings/templates/personal.php

Indentation +9 added lines, -9 removed lines

@@ -11,12 +11,12 @@ 
 <div id="app-navigation">
 	<ul>
 	<?php foreach($_['forms'] as $form) {
-		if (isset($form['anchor'])) {
-			$anchor = '#' . $form['anchor'];
-			$sectionName = $form['section-name'];
-			print_unescaped(sprintf("<li><a href='%s'>%s</a></li>", \OCP\Util::sanitizeHTML($anchor), \OCP\Util::sanitizeHTML($sectionName)));
-		}
-	}?>
+        if (isset($form['anchor'])) {
+            $anchor = '#' . $form['anchor'];
+            $sectionName = $form['section-name'];
+            print_unescaped(sprintf("<li><a href='%s'>%s</a></li>", \OCP\Util::sanitizeHTML($anchor), \OCP\Util::sanitizeHTML($sectionName)));
+        }
+    }?>
 	</ul>
 </div>
 
@@ -27,7 +27,7 @@ 
 		<?php if($_['usage_relative'] > 80): ?> class="quota-warning" <?php endif; ?>>
 		<p id="quotatext">
 			<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong>',
-			array($_['usage'], $_['total_space'])));?>
+            array($_['usage'], $_['total_space'])));?>
 		</p>
 	</div>
 </div>
@@ -114,7 +114,7 @@ 
 
 <?php
 if($_['passwordChangeSupported']) {
-	script('jquery-showpassword');
+    script('jquery-showpassword');
 ?>
 <form id="passwordform" class="section">
 	<h2 class="inlineblock"><?php p($l->t('Password'));?></h2>
@@ -250,7 +250,7 @@ 
 </div>
 
 <?php foreach($_['forms'] as $form) {
-	if (isset($form['form'])) {?>
+    if (isset($form['form'])) {?>
 	<div id="<?php isset($form['anchor']) ? p($form['anchor']) : p('');?>"><?php print_unescaped($form['form']);?></div>
 	<?php }
 };?>

settings/ajax/setlanguage.php

Indentation +9 added lines, -9 removed lines

@@ -33,14 +33,14 @@
 
 // Get data
 if( isset( $_POST['lang'] ) ) {
-	$languageCodes = \OC::$server->getL10NFactory()->findAvailableLanguages();
-	$lang = (string)$_POST['lang'];
-	if(array_search($lang, $languageCodes) or $lang === 'en') {
-		\OC::$server->getConfig()->setUserValue( OC_User::getUser(), 'core', 'lang', $lang );
-		OC_JSON::success(array("data" => array( "message" => $l->t("Language changed") )));
-	}else{
-		OC_JSON::error(array("data" => array( "message" => $l->t("Invalid request") )));
-	}
+    $languageCodes = \OC::$server->getL10NFactory()->findAvailableLanguages();
+    $lang = (string)$_POST['lang'];
+    if(array_search($lang, $languageCodes) or $lang === 'en') {
+        \OC::$server->getConfig()->setUserValue( OC_User::getUser(), 'core', 'lang', $lang );
+        OC_JSON::success(array("data" => array( "message" => $l->t("Language changed") )));
+    }else{
+        OC_JSON::error(array("data" => array( "message" => $l->t("Invalid request") )));
+    }
 }else{
-	OC_JSON::error(array("data" => array( "message" => $l->t("Invalid request") )));
+    OC_JSON::error(array("data" => array( "message" => $l->t("Invalid request") )));
 }