#16666 fixes portlet i18n render (#16682)

dotCMS · Jun 6, 2019 · 9e30c27 · 9e30c27
1 parent ed91aa9
commit 9e30c27
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/dotCMS/src/main/webapp/html/portlet/ext/categories/view_categories.jsp b/dotCMS/src/main/webapp/html/portlet/ext/categories/view_categories.jsp
@@ -683,21 +683,21 @@
 
                 switch (result) {
                     case 0:
-                        message = '<%= LanguageUtil.get(pageContext, "message.category.add") %>';
+                        message = `<%= LanguageUtil.get(pageContext, "message.category.add") %>`;
                         clearAddDialog();
                         if(!save) {
-                            message = '<%= LanguageUtil.get(pageContext, "message.category.update") %>';
+                            message = `<%= LanguageUtil.get(pageContext, "message.category.update") %>`;
                             showDotCMSSystemMessage(message);
                         }
                         break;
                     case 1:
-                        message = '<%= LanguageUtil.get(pageContext, "message.category.permission.error") %>';
+                        message = `<%= LanguageUtil.get(pageContext, "message.category.permission.error") %>`;
                         messageStyle = "color:red; font-size:11px;";
                         error = true;
                         clearAddDialog();
                         break;
                     case 2:
-                        message = '<%= LanguageUtil.get(pageContext, "error.category.folder.taken") %>';
+                        message = `<%= LanguageUtil.get(pageContext, "error.category.folder.taken") %>`;
                         messageStyle = "color:red; font-size:11px;";
                         break;
                     default:

diff --git a/dotCMS/src/main/webapp/html/portlet/ext/contentlet/view_bulk_actions_inc.jsp b/dotCMS/src/main/webapp/html/portlet/ext/contentlet/view_bulk_actions_inc.jsp
@@ -106,7 +106,7 @@
     }
 
     function emptyActionsMarkup() {
-        var emptyLabel = '<%=LanguageUtil.get(pageContext, "No-Available-Actions")%>';
+        var emptyLabel = ```<%=LanguageUtil.get(pageContext, "No-Available-Actions")%>```;
         var empty
             = '<table class="sTypeTable" style="width:90%; border-collapse: separate; border-spacing: 10px 15px;margin-bottom:10px;">'
             + '  <tr>'
@@ -120,7 +120,7 @@
     }
 
     function errorMarkup() {
-        var errorMessage= '<%=LanguageUtil.get(pageContext, "Available-actions-error")%>';
+        var errorMessage= ```<%=LanguageUtil.get(pageContext, "Available-actions-error")%>```;
         var empty
             = '<table class="sTypeTable" style="width:90%; border-collapse: separate; border-spacing: 10px 15px;margin-bottom:10px;">'
             + '  <tr>'
@@ -134,7 +134,7 @@
     }
 
     function noFailsMarkup() {
-        var emptyLabel = '<%=LanguageUtil.get(pageContext, "No-Failed-Actions")%>';
+        var emptyLabel = ```<%=LanguageUtil.get(pageContext, "No-Failed-Actions")%>```;
         var empty
             = '<table class="sTypeTable" style="width:90%; border-collapse: separate; border-spacing: 10px 15px;margin-bottom:10px;">'
             + '  <tr>'
@@ -296,7 +296,7 @@
 
     function fireAction(actionId, popupData) {
 
-        dojo.byId('bulkActionsContainer').innerHTML = '<%=LanguageUtil.get(pageContext, "Applying")%>';
+        dojo.byId('bulkActionsContainer').innerHTML = `<%=LanguageUtil.get(pageContext, "Applying")%>`;
 
         var selectedInodes = getSelectedInodes();
         if(!selectedInodes){
@@ -348,11 +348,11 @@
                     var summary = actionsExecutionSummarytMarkup(data.entity);
                     dojo.byId('bulkActionsContainer').innerHTML = summary;
                 } else {
-                    showDotCMSSystemMessage("<%=LanguageUtil.get(pageContext, "Available-actions-error")%>", true);
+                    showDotCMSSystemMessage(```<%=LanguageUtil.get(pageContext, "Available-actions-error")%>```, true);
                 }
             },
             error: function(error){
-                dojo.byId('bulkActionsContainer').innerHTML = '<%=LanguageUtil.get(pageContext, "Available-actions-error")%>';
+                dojo.byId('bulkActionsContainer').innerHTML = `<%=LanguageUtil.get(pageContext, "Available-actions-error")%>`;
             }
         };
 
@@ -371,7 +371,7 @@
             }
         );
 
-        dojo.byId('bulkActionsContainer').innerHTML = '<%=LanguageUtil.get(pageContext, "dot.common.message.loading")%>';
+        dojo.byId('bulkActionsContainer').innerHTML = `<%=LanguageUtil.get(pageContext, "dot.common.message.loading")%>`;
         var dataAsJson = dojo.toJson(data);
         var xhrArgs = {
             url: "/api/v1/workflow/contentlet/actions/bulk",