diff options
| author | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-01-11 09:53:12 +0100 |
|---|---|---|
| committer | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-01-11 09:53:12 +0100 |
| commit | 23896a72906f1dca08d8413ea9a339b5d74aa658 (patch) | |
| tree | 89edfcc629cfe1aac7787448338432875df63bed /apps/files/ajax | |
| parent | bae175518427de1f43ac23dbc1e06a15f6933370 (diff) | |
| parent | 60489764f37a6f344fa20e361a26c7a6006f9c97 (diff) | |
| download | nextcloud-server-23896a72906f1dca08d8413ea9a339b5d74aa658.tar.gz nextcloud-server-23896a72906f1dca08d8413ea9a339b5d74aa658.zip | |
Merge branch 'master' into fixing-784-master
Conflicts:
apps/files/js/files.js
Diffstat (limited to 'apps/files/ajax')
| -rw-r--r-- | apps/files/ajax/move.php | 5 | ||||
| -rw-r--r-- | apps/files/ajax/rename.php | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/apps/files/ajax/move.php b/apps/files/ajax/move.php index 5612716b7e4..4ebc3f42d9f 100644 --- a/apps/files/ajax/move.php +++ b/apps/files/ajax/move.php @@ -11,14 +11,15 @@ $dir = stripslashes($_GET["dir"]); $file = stripslashes($_GET["file"]); $target = stripslashes(rawurldecode($_GET["target"])); +$l=OC_L10N::get('files'); if(OC_Filesystem::file_exists($target . '/' . $file)) { - OCP\JSON::error(array("data" => array( "message" => "Could not move $file - File with this name already exists" ))); + OCP\JSON::error(array("data" => array( "message" => $l->t("Could not move %s - File with this name already exists", array($file)) ))); exit; } if(OC_Files::move($dir, $file, $target, $file)) { OCP\JSON::success(array("data" => array( "dir" => $dir, "files" => $file ))); } else { - OCP\JSON::error(array("data" => array( "message" => "Could not move $file" ))); + OCP\JSON::error(array("data" => array( "message" => $l->t("Could not move %s", array($file)) ))); } diff --git a/apps/files/ajax/rename.php b/apps/files/ajax/rename.php index cb0bec399d1..89b4d4bba73 100644 --- a/apps/files/ajax/rename.php +++ b/apps/files/ajax/rename.php @@ -14,7 +14,7 @@ $newname = stripslashes($_GET["newname"]); // Delete if( $newname !== '.' and OC_Files::move( $dir, $file, $dir, $newname )) { OCP\JSON::success(array("data" => array( "dir" => $dir, "file" => $file, "newname" => $newname ))); -} -else{ - OCP\JSON::error(array("data" => array( "message" => "Unable to rename file" ))); +} else { + $l=OC_L10N::get('files'); + OCP\JSON::error(array("data" => array( "message" => $l->t("Unable to rename file") ))); } |