Skip to content
Snippets Groups Projects
Commit fda1ada4 authored by Lukas Reschke's avatar Lukas Reschke
Browse files

Merge pull request #1131 from owncloud/more_translations

translate move and rename error messages
parents ca027f37 a40c9524
Branches
No related tags found
No related merge requests found
......@@ -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)) )));
}
......@@ -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") )));
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment