fix translations

diff --git a/apps/files/ajax/newfile.php b/apps/files/ajax/newfile.php
index a58948bf68c2e3dae0c81d5d6b843421e3c7be92..d1183089b4ff31f000a39b8176dacfe4715712e8 100644 (file)
--- a/apps/files/ajax/newfile.php
+++ b/apps/files/ajax/newfile.php
@@ -35,7 +35,7 @@ function progress($notification_code, $severity, $message, $message_code, $bytes
                                if (!isset($filesize)) {
                                } else {
                                        $progress = (int)(($bytes_transferred/$filesize)*100);
-                                       if($progress>$lastsize) {//limit the number or messages send
+                                       if($progress>$lastsize) { //limit the number or messages send
                                                $eventSource->send('progress', $progress);
                                        }
                                        $lastsize=$progress;
@@ -53,13 +53,13 @@ $result = array(
        );
 
 if(trim($filename) === '') {
-       $result['data'] = array('message' => $l10n->t('Filename cannot not be empty.'));
+       $result['data'] = array('message' => $l10n->t('File name cannot not be empty.'));
        OCP\JSON::error($result);
        exit();
 }
 
 if(strpos($filename, '/') !== false) {
-       $result['data'] = array('message' => $l10n->t('Filename must not contain /. Please choose a different name.'));
+       $result['data'] = array('message' => $l10n->t('File name must not contain "/". Please choose a different name.'));
        OCP\JSON::error($result);
        exit();
 }
@@ -69,7 +69,7 @@ $target = $dir.'/'.$filename;
 
 if (\OC\Files\Filesystem::file_exists($target)) {
        $result['data'] = array('message' => $l10n->t(
-                       "The name %s is already used in the folder %s. Please choose a different name.",
+                       'The name %s is already used in the folder %s. Please choose a different name.',
                        array($filename, $dir))
                );
        OCP\JSON::error($result);
@@ -78,7 +78,7 @@ if (\OC\Files\Filesystem::file_exists($target)) {
 
 if($source) {
        if(substr($source, 0, 8)!='https://' and substr($source, 0, 7)!='http://') {
-               OCP\JSON::error(array("data" => array( "message" => "Not a valid source" )));
+               OCP\JSON::error(array('data' => array( 'message' => $l10n->t('Not a valid source') )));
                exit();
        }
 
@@ -91,7 +91,7 @@ if($source) {
                $id = $meta['fileid'];
                $eventSource->send('success', array('mime'=>$mime, 'size'=>\OC\Files\Filesystem::filesize($target), 'id' => $id));
        } else {
-               $eventSource->send('error', "Error while downloading ".$source. ' to '.$target);
+               $eventSource->send('error', $l10n->t('Error while downloading %s to %s', array($source, $target)));
        }
        $eventSource->close();
        exit();
@@ -124,4 +124,4 @@ if($source) {
        }
 }
 
-OCP\JSON::error(array("data" => array( "message" => "Error when creating the file" )));
+OCP\JSON::error(array('data' => array( 'message' => $l10n->t('Error when creating the file') )));

diff --git a/apps/files/ajax/newfolder.php b/apps/files/ajax/newfolder.php
index 531759dc048c7616d2dba47bae4ad0a3c42cb5d8..1fd5359896e97cac48e16fc9eeb352f7d171c4e8 100644 (file)
--- a/apps/files/ajax/newfolder.php
+++ b/apps/files/ajax/newfolder.php
@@ -18,13 +18,13 @@ $result = array(
        );
 
 if(trim($foldername) === '') {
-       $result['data'] = array('message' => $l10n->t('Foldername cannot not be empty.'));
+       $result['data'] = array('message' => $l10n->t('Folder name cannot not be empty.'));
        OCP\JSON::error($result);
        exit();
 }
 
 if(strpos($foldername, '/') !== false) {
-       $result['data'] = array('message' => $l10n->t('Foldername must not contain /. Please choose a different name.'));
+       $result['data'] = array('message' => $l10n->t('Folder name must not contain "/". Please choose a different name.'));
        OCP\JSON::error($result);
        exit();
 }
@@ -53,4 +53,4 @@ if(\OC\Files\Filesystem::mkdir($target)) {
        exit();
 }
 
-OCP\JSON::error(array('data' => array( 'message' => 'Error when creating the folder' )));
+OCP\JSON::error(array('data' => array( 'message' => $l10n->t('Error when creating the folder') )));