From ff0dab6e92f71dab31d902d2ae9a6ba87f0cea88 Mon Sep 17 00:00:00 2001
From: Volkan Gezer <volkangezer@gmail.com>
Date: Thu, 24 Apr 2014 01:42:18 +0200
Subject: [PATCH] This adds one more missing untranslated text from lib/share
Also displays the untrusted domain warning in English
---
lib/base.php | 5 +++--
lib/private/share/share.php | 7 ++++---
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/lib/base.php b/lib/base.php
index 83f54a8e4db..0f55c1175c7 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -698,6 +698,7 @@ class OC {
* @brief Handle the request
*/
public static function handleRequest() {
+ $l = \OC_L10N::get('lib');
// load all the classpaths from the enabled apps so they are available
// in the routing files of each app
OC::loadAppClassPaths();
@@ -719,8 +720,8 @@ class OC {
header('HTTP/1.1 400 Bad Request');
header('Status: 400 Bad Request');
OC_Template::printErrorPage(
- 'You are accessing the server from an untrusted domain.',
- 'Please contact your administrator'
+ $l->t('You are accessing the server from an untrusted domain.'),
+ $l->t('Please contact your administrator')
);
return;
}
diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index 3751b035bd4..fe756b5ae7f 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -477,9 +477,10 @@ class Share extends \OC\Share\Constants {
if ($itemType === 'file' or $itemType === 'folder') {
$path = \OC\Files\Filesystem::getPath($itemSource);
if (!$path) {
- $message = 'Sharing ' . $itemSourceName . ' failed, because the file does not exist';
- \OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
- throw new \Exception($message);
+ $message = 'Sharing %s failed, because the file does not exist';
+ $message_t = $l->t('Sharing %s failed, because the file does not exist', array($itemSourceName));
+ \OC_Log::write('OCP\Share', sprintf($message, $itemSourceName), \OC_Log::ERROR);
+ throw new \Exception($message_t);
}
}
--
GitLab