SAK-38096 - Cancel and Delete comment are hardcoded (sakaiproject#5560)

* SAK-38096 - Cancel and Delete comment are hardcoded * Update messages.properties
chundcm · May 3, 2018 · ab0ff6e · ab0ff6e
1 parent 29c975f
commit ab0ff6e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/lessonbuilder/tool/src/resources/messages.properties b/lessonbuilder/tool/src/resources/messages.properties
@@ -138,6 +138,7 @@ simplepage.cancel_message=Cancel
 simplepage.continue_message=Continue
 simplepage.has_prerequistes=Before viewing page, you must complete the following pages:
 simplepage.has_prerequistes_2=You need to complete a previous item before doing this one. Return to this page to do it. Look for an item with an asterisk to the left of it.
+simplepage.delete_comment=Delete Comment
 
 simplepage.resource=Add Content Links
 simplepage.resource.tooltip=Add links: Upload files, link to existing files in Resources or address of a page on the web.

diff --git a/lessonbuilder/tool/src/webapp/js/comments.js b/lessonbuilder/tool/src/webapp/js/comments.js
@@ -66,19 +66,21 @@ $(function() {
 		width: 400,
 		modal: false,
 		resizable: false,
-		buttons: {
-			"Cancel": function() {
+		buttons:[{
+			text: msg("simplepage.cancel_message"),
+			click: function() {
 				if(originalDeleteDialogText !== null) {
 					$("#delete-comment-confirm").text(originalDeleteDialogText);
 				}
-
-				$(this).dialog("close");
-			},
 
-			"Delete Comment": function() {
+				$(this).dialog("close");
+			}
+		},{
+			text: msg("simplepage.delete_comment"),
+			click: function() {
 				deleteButton();
 			}
-		}
+		}]
 	});
 });
 

diff --git a/lessonbuilder/tool/src/webapp/templates/ShowPage.html b/lessonbuilder/tool/src/webapp/templates/ShowPage.html
@@ -1063,6 +1063,7 @@ <h3 class="questionText" rsf:id="questionText"></h3>
 			  <p rsf:id="msg=simplepage.delete_page_confirm" id="simplepage.delete_page_confirm"></p>
 			  <p rsf:id="msg=simplepage.delete" id="simplepage.delete"></p>
 			  <p rsf:id="msg=simplepage.cancel_message" id="simplepage.cancel_message"></p>
+			  <p rsf:id="msg=simplepage.delete_comment" id="simplepage.delete_comment"></p>
 			  <p rsf:id="msg=simplepage.add_caption" id="simplepage.add_caption"></p>
 			  <p rsf:id="msg=simplepage.change_caption" id="simplepage.change_caption"></p>
 			  <p rsf:id="msg=simplepage.join-items" id="simplepage.join-items"></p>