[Rt-commit] rt branch, 4.4/fix-history-scroll-js, created. rt-4.4.0-249-g4b3cb69

[Dustin Graves]

The branch, 4.4/fix-history-scroll-js has been created
        at  4b3cb69e7eb99ce9483945de42adf9b6481f556f (commit)

- Log -----------------------------------------------------------------
commit 4b3cb69e7eb99ce9483945de42adf9b6481f556f
Author: Dustin Graves <dustin at bestpractical.com>
Date:   Thu Jun 16 17:18:04 2016 +0000

    Fix JS compile errors for translations with apostrophes in ScrollShowHistory
    
    See: c2dfb321b
    Fixes: I#32090

diff --git a/share/html/Elements/JavascriptConfig b/share/html/Elements/JavascriptConfig
index 53046b4..0484957 100644
--- a/share/html/Elements/JavascriptConfig
+++ b/share/html/Elements/JavascriptConfig
@@ -69,6 +69,9 @@ my $Catalog = {
     error => "Error", #loc
     check => "Check", #loc
     remove => "Remove", #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 6d809ae..a6687c3 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);
     };
 

-----------------------------------------------------------------------