From: Tom Needham <needham.thomas@gmail.com>
Date: Wed, 28 Sep 2011 19:17:45 +0000 (+0100)
Subject: Fixed typo. Added translation support.
X-Git-Tag: v3.0~130
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3129855cc43cf94292623b74b625914578d23316;p=nextcloud-server.git

Fixed typo. Added translation support.
---

diff --git a/apps/editor/ajax/savefile.php b/apps/editor/ajax/savefile.php
index 95afb458837..634197c7a10 100644
--- a/apps/editor/ajax/savefile.php
+++ b/apps/editor/ajax/savefile.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * ownCloud - Addressbook
+ * ownCloud - Editor
  *
  * @author Tom Needham
  * @copyright 2011 Tom Needham contact@tomneedham.com
@@ -57,8 +57,7 @@ if(isset($_SESSION[$sessionname])){
             	OC_JSON::success();
             } else {	
             	// No force
-            	// Show error
-            	OC_JSON::faliure();
+            	OC_JSON::error(array('data' => array( 'message' => $l10n->t('The file has been edited since you opened it. Overwrite the file?'))));
             }
         } else  {
             // No body has edited it whilst you were, so save the file
diff --git a/apps/editor/index.php b/apps/editor/index.php
index 437934b3e85..209bca75ddb 100644
--- a/apps/editor/index.php
+++ b/apps/editor/index.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * ownCloud - Addressbook
+ * ownCloud - Editor
  *
  * @author Tom Needham
  * @copyright 2011 Tom Needham contact@tomneedham.com
diff --git a/apps/editor/js/editor.js b/apps/editor/js/editor.js
index 86b0461c53d..324666110d8 100644
--- a/apps/editor/js/editor.js
+++ b/apps/editor/js/editor.js
@@ -24,8 +24,8 @@ $(document).ready(function(){
 		var dir =  $('#editor').attr('data-dir');
 		var file =  $('#editor').attr('data-file');
 		$.post('ajax/savefile.php',{ filecontents: filecontents, file: file, dir: dir },function(jsondata){
-			if(jsondata.satus == 'failure'){
-				var answer = confirm('The file has been modified after you opened it. Do you want to overwrite the file with your changes?');
+			if(jsondata.status == 'failure'){
+				var answer = confirm(jsondata.data.message);
 				if(answer){
 					$.post('ajax/savefile.php',{ filecontents: filecontents, file: file, dir: dir, force: 'true' },function(jsondata){
 						if(jsondata.status =='success'){
@@ -34,7 +34,7 @@ $(document).ready(function(){
 						} 
 						else {
 							// Save error
-							alert('Error saving the file. Please report this!');	
+							alert(jsondata.data.message);	
 						}
 					}, 'json');
 				}