From a2262c56b987b0ec587f0790fc74e6590bccce71 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Mon, 29 Dec 2014 22:05:14 +0100
Subject: [PATCH] msg for user

---
 src/locales/en.json         | 1 +
 src/static/js/pad_impexp.js | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/src/locales/en.json b/src/locales/en.json
index 5e074e387..17a83b466 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -130,6 +130,7 @@
   "pad.impexp.importing": "Importing...",
   "pad.impexp.confirmimport": "Importing a file will overwrite the current text of the pad. Are you sure you want to proceed?",
   "pad.impexp.convertFailed": "We were not able to import this file. Please use a different document format or copy paste manually",
+  "pad.impexp.padHasData": "We were not able to import this file because this Pad has already had changes, please import to a new pad",
   "pad.impexp.uploadFailed": "The upload failed, please try again",
   "pad.impexp.importfailed": "Import failed",
   "pad.impexp.copypaste": "Please copy paste",
diff --git a/src/static/js/pad_impexp.js b/src/static/js/pad_impexp.js
index 2548b8bb8..d9a8953d2 100644
--- a/src/static/js/pad_impexp.js
+++ b/src/static/js/pad_impexp.js
@@ -109,6 +109,8 @@ var padimpexp = (function()
       msg = html10n.get("pad.impexp.convertFailed");
     } else if(status === "uploadFailed"){
       msg = html10n.get("pad.impexp.uploadFailed");
+    } else if(status === "padHasData"){
+      msg = html10n.get("pad.impexp.padHasData");
     }
   
     function showError(fade)