From 40d3d5d54c2081a16ca4cba6df09ae3bdd5c0cee Mon Sep 17 00:00:00 2001
From: Dustin Graves <dustin@bestpractical.com>
Date: Thu, 16 Jun 2016 17:18:04 +0000
Subject: [PATCH] Fix JS compile errors for translations with apostrophes in
 ScrollShowHistory

See: c2dfb321b
Fixes: I#32090
---
 share/html/Elements/JavascriptConfig         | 3 +++
 share/html/Ticket/Elements/ScrollShowHistory | 7 +++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/share/html/Elements/JavascriptConfig b/share/html/Elements/JavascriptConfig
index 0f81805..b81ea4e 100644
--- a/share/html/Elements/JavascriptConfig
+++ b/share/html/Elements/JavascriptConfig
@@ -66,6 +66,9 @@ my $Catalog = {
     quote_in_filename => "Filenames with double quotes can not be uploaded.", #loc
     attachment_warning_regex => "\\battach", #loc
     shortcut_help_error => "Unable to open shortcut help. Reason:", #loc
+    loading => "Loading...", #loc
+    try_again => "Try again", #loc
+    history_scroll_error => "Could not load ticket history. Reason:", #loc
 };
 $_ = loc($_) for values %$Catalog;
 
diff --git a/share/html/Ticket/Elements/ScrollShowHistory b/share/html/Ticket/Elements/ScrollShowHistory
index 5c7875f..fcab4d9 100644
--- a/share/html/Ticket/Elements/ScrollShowHistory
+++ b/share/html/Ticket/Elements/ScrollShowHistory
@@ -100,7 +100,8 @@ jQuery(function(){
 
     var showLoadingMessage = function() {
         removeLoadingMessage();
-        var loadingMessage = jQuery('<span class="loading-message"><&|/l&>Loading...</&></span>');
+        var loadingMessage = jQuery('<span class="loading-message">' +
+            loc_key('loading') + '</span>');
         jQuery(".history-container").append(loadingMessage);
     };
 
@@ -108,7 +109,9 @@ jQuery(function(){
         removeLoadingMessage();
         disableLoading = true;
         removeLoadLink();
-        var loadLink = jQuery('<div class="error-load-history"><&|/l&>Could not load ticket history. Reason:</&> ' + reason + '<br/><a href="#"><&|/l&>Try again</&></a></div>');
+        var loadLink = jQuery('<div class="error-load-history">' +
+            loc_key('history_scroll_error') + ' ' + reason +
+            '<br/><a href="#">' + loc_key('try_again') + '</a></div>');
         jQuery(".history-container").append(loadLink);
     };
 
-- 
1.9.1