Merge pull request #10768 from owncloud/l10n-use-public

Use public api for getting l10n

apps/files/ajax/list.php

@@ -2,7 +2,7 @@
 
 OCP\JSON::checkLoggedIn();
 \OC::$server->getSession()->close();
-$l = OC_L10N::get('files');
+$l = \OC::$server->getL10N('files');
 
 // Load the files
 $dir = isset($_GET['dir']) ? $_GET['dir'] : '';

apps/files/ajax/move.php

@@ -9,7 +9,7 @@ $dir = stripslashes($_POST["dir"]);
 $file = stripslashes($_POST["file"]);
 $target = stripslashes(rawurldecode($_POST["target"]));
 
-$l = OC_L10N::get('files');
+$l = \OC::$server->getL10N('files');
 
 if(\OC\Files\Filesystem::file_exists($target . '/' . $file)) {
 	OCP\JSON::error(array("data" => array( "message" => $l->t("Could not move %s - File with this name already exists", array($file)) )));

apps/files/ajax/newfile.php

@@ -46,7 +46,7 @@ function progress($notification_code, $severity, $message, $message_code, $bytes
 	}
 }
 
-$l10n = \OC_L10n::get('files');
+$l10n = \OC::$server->getL10N('files');
 
 $result = array(
 	'success' 	=> false,

apps/files/ajax/newfolder.php

@@ -11,7 +11,7 @@ OCP\JSON::callCheck();
 $dir = isset( $_POST['dir'] ) ? stripslashes($_POST['dir']) : '';
 $foldername = isset( $_POST['foldername'] ) ? stripslashes($_POST['foldername']) : '';
 
-$l10n = \OC_L10n::get('files');
+$l10n = \OC::$server->getL10N('files');
 
 $result = array(
 	'success' 	=> false,

apps/files/ajax/rename.php

@@ -27,7 +27,7 @@ OCP\JSON::callCheck();
 
 $files = new \OCA\Files\App(
 	\OC\Files\Filesystem::getView(),
-	\OC_L10n::get('files')
+	\OC::$server->getL10N('files')
 );
 $result = $files->rename(
 	$_GET["dir"],

apps/files/ajax/upload.php

@@ -10,7 +10,7 @@ OCP\JSON::setContentTypeHeader('text/plain');
 $allowedPermissions = OCP\PERMISSION_ALL;
 $errorCode = null;
 
-$l = OC_L10N::get('files');
+$l = \OC::$server->getL10N('files');
 if (empty($_POST['dirToken'])) {
 	// The standard case, files are uploaded through logged in users :)
 	OCP\JSON::checkLoggedIn();

apps/files/appinfo/app.php

 <?php
 
-$l = OC_L10N::get('files');
+$l = \OC::$server->getL10N('files');
 
 OCP\App::registerAdmin('files', 'admin');
 

apps/files_encryption/ajax/adminrecovery.php

@@ -13,7 +13,7 @@ use OCA\Encryption;
 \OCP\JSON::checkAppEnabled('files_encryption');
 \OCP\JSON::callCheck();
 
-$l = OC_L10N::get('files_encryption');
+$l = \OC::$server->getL10N('files_encryption');
 
 $return = false;
 // Enable recoveryAdmin

apps/files_encryption/ajax/changeRecoveryPassword.php

@@ -15,7 +15,7 @@ use OCA\Encryption;
 \OCP\JSON::checkAppEnabled('files_encryption');
 \OCP\JSON::callCheck();
 
-$l = OC_L10N::get('core');
+$l = \OC::$server->getL10N('core');
 
 $return = false;
 

apps/files_encryption/ajax/updatePrivateKeyPassword.php

@@ -15,7 +15,7 @@ use OCA\Encryption;
 \OCP\JSON::checkAppEnabled('files_encryption');
 \OCP\JSON::callCheck();
 
-$l = OC_L10N::get('core');
+$l = \OC::$server->getL10N('core');
 
 $return = false;
 

apps/files_encryption/files/error.php

@@ -4,7 +4,7 @@ if (!isset($_)) { //also provide standalone error page
 	require_once __DIR__ . '/../../../lib/base.php';
 	require_once __DIR__ . '/../lib/crypt.php';
 
-	$l = OC_L10N::get('files_encryption');
+	$l = \OC::$server->getL10N('files_encryption');
 
 	if (isset($_GET['errorCode'])) {
 		$errorCode = $_GET['errorCode'];

apps/files_external/ajax/dropbox.php

@@ -5,7 +5,7 @@ require_once __DIR__ . '/../3rdparty/Dropbox/autoload.php';
 OCP\JSON::checkAppEnabled('files_external');
 OCP\JSON::checkLoggedIn();
 OCP\JSON::callCheck();
-$l = OC_L10N::get('files_external');
+$l = \OC::$server->getL10N('files_external');
 
 if (isset($_POST['app_key']) && isset($_POST['app_secret'])) {
 	$oauth = new Dropbox_OAuth_Curl($_POST['app_key'], $_POST['app_secret']);

apps/files_external/ajax/google.php

@@ -6,7 +6,7 @@ require_once 'Google_Client.php';
 OCP\JSON::checkAppEnabled('files_external');
 OCP\JSON::checkLoggedIn();
 OCP\JSON::callCheck();
-$l = OC_L10N::get('files_external');
+$l = \OC::$server->getL10N('files_external');
 
 if (isset($_POST['client_id']) && isset($_POST['client_secret']) && isset($_POST['redirect'])) {
 	$client = new Google_Client();

apps/files_external/appinfo/app.php

@@ -6,7 +6,7 @@
  * later.
  * See the COPYING-README file.
  */
-$l = \OC_L10N::get('files_external');
+$l = \OC::$server->getL10N('files_external');
 
 OC::$CLASSPATH['OC\Files\Storage\StreamWrapper'] = 'files_external/lib/streamwrapper.php';
 OC::$CLASSPATH['OC\Files\Storage\FTP'] = 'files_external/lib/ftp.php';

apps/files_sharing/ajax/external.php

@@ -10,7 +10,7 @@ OCP\JSON::callCheck();
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('files_sharing');
 
-$l = OC_L10N::get('files_sharing');
+$l = \OC::$server->getL10N('files_sharing');
 
 // check if server admin allows to mount public links from other servers
 if (OCA\Files_Sharing\Helper::isIncomingServer2serverShareEnabled() === false) {

apps/files_sharing/appinfo/app.php

 <?php
-$l = OC_L10N::get('files_sharing');
+$l = \OC::$server->getL10N('files_sharing');
 
 OC::$CLASSPATH['OC_Share_Backend_File'] = 'files_sharing/lib/share/file.php';
 OC::$CLASSPATH['OC_Share_Backend_Folder'] = 'files_sharing/lib/share/folder.php';

apps/files_trashbin/ajax/delete.php

@@ -55,7 +55,7 @@ if ( $error ) {
 	foreach ( $error as $e ) {
 		$filelist .= $e.', ';
 	}
-	$l = OC_L10N::get('files_trashbin');
+	$l = \OC::$server->getL10N('files_trashbin');
 	$message = $l->t("Couldn't delete %s permanently", array(rtrim($filelist, ', ')));
 	OCP\JSON::error(array("data" => array("message" => $message,
 			                               "success" => $success, "error" => $error)));

apps/files_trashbin/ajax/undelete.php

@@ -60,7 +60,7 @@ if ( $error ) {
 	foreach ( $error as $e ) {
 		$filelist .= $e.', ';
 	}
-	$l = OC_L10N::get('files_trashbin');
+	$l = OC::$server->getL10N('files_trashbin');
 	$message = $l->t("Couldn't restore %s", array(rtrim($filelist, ', ')));
 	OCP\JSON::error(array("data" => array("message" => $message,
 										  "success" => $success, "error" => $error)));

apps/files_trashbin/appinfo/app.php

 <?php
-$l = OC_L10N::get('files_trashbin');
+$l = \OC::$server->getL10N('files_trashbin');
 
 OC::$CLASSPATH['OCA\Files_Trashbin\Exceptions\CopyRecursiveException'] = 'files_trashbin/lib/exceptions.php';
 

apps/files_trashbin/lib/trashbin.php

@@ -891,7 +891,7 @@ class Trashbin {
 	private static function getUniqueFilename($location, $filename, $view) {
 		$ext = pathinfo($filename, PATHINFO_EXTENSION);
 		$name = pathinfo($filename, PATHINFO_FILENAME);
-		$l = \OC_L10N::get('files_trashbin');
+		$l = \OC::$server->getL10N('files_trashbin');
 
 		// if extension is not empty we set a dot in front of it
 		if ($ext !== '') {