mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1131 from owncloud/more_translations 

translate move and rename error messages
This commit is contained in:
Lukas Reschke 2013-01-09 12:07:39 -08:00
parent ca027f3749 a40c95242f
commit fda1ada4f0
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/files/ajax/move.php
View File

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

6
apps/files/ajax/rename.php
View File

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