Changeset 32902 for main/trunk/greenstone3

Timestamp:

2019-03-13T22:48:34+13:00 (5 years ago)

Author:

ak19

Message:

Replacing alerts with fixed language strings with 2 new properties in interface_default2.properties. Not sure how to do newlines in there that won't break the Javascript.

Location:

main/trunk/greenstone3/web

Files:

• WEB-INF/classes/interface_default2.properties (modified) (1 diff)
• interfaces/default/js/documentedit_scripts_util.js (modified) (2 diffs)

main/trunk/greenstone3/web/WEB-INF/classes/interface_default2.properties

@@ -150 +150 @@
 dse.browse_cannot_validate_xml=Your browser cannot handle XML validation
 dse.create_new_document=Create new document
+dse.setarchives_error=An error occurred during setArchivesMetadata. Not proceeding further with saving and rebuilding. See browser's console log for details.
+dse.setarchives_server_error=A server side error occurred during setArchivesMetadata. (Is the server running?) Not proceeding further with saving and rebuilding.
 dse.untitled_section=UNTITLED SECTION
 dse.insert_new_section=Insert new section

main/trunk/greenstone3/web/interfaces/default/js/documentedit_scripts_util.js

@@ -543 +543 @@
     
     var errorCallback = function() {        
-        alert("A server side error occurred during setArchivesMetadata. (Is the server running?)\nNot proceeding further with saving and rebuilding.");
+        alert(gs.text.dse.setarchives_server_error); // "A server side error occurred during setArchivesMetadata. (Is the server running?)\nNot proceeding further with saving and rebuilding."
         return true;
         
@@ -563 +563 @@
             var status_code = xmlDoc.getElementsByTagName("status")[0].getAttribute("code");
             if(status_code === "3") { // status code 3 means error (see GSStatus.java::ERROR)
-                alert("An error occurred during setArchivesMetadata.\nNot proceeding further with saving and rebuilding.\nSee browser's console log for details.");
+                alert(gs.text.dse.setarchives_error); // "An error occurred during setArchivesMetadata.\nNot proceeding further with saving and rebuilding.\nSee browser's console log for details."
                 console.log("@@@ Error on setting archive metadata. Got error message: " + response);
                 return true;