Browse Source

Merge pull request #8332 from owncloud/l10n-access-untrusted

This adds one more missing untranslated text from lib/share
tags/v7.0.0alpha2
Thomas Müller 10 years ago
parent
commit
8127e984bd
2 changed files with 7 additions and 5 deletions
  1. 3
    2
      lib/base.php
  2. 4
    3
      lib/private/share/share.php

+ 3
- 2
lib/base.php View File

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

+ 4
- 3
lib/private/share/share.php View File

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


Loading…
Cancel
Save