[Rt-commit] rt branch, 4.4.1-releng, updated. rt-4.4.1rc1-2-gb9560b6

[Shawn Moore]

The branch, 4.4.1-releng has been updated
       via  b9560b6ec037e4b89745a9a77c185e32b52952b5 (commit)
       via  8c6c1319de8d6ba4668c2b5fb3074c5abe939201 (commit)
      from  d17c2df55b1535b3144f565b35ffb45b01657ebb (commit)

Summary of changes:
 share/html/Elements/JavascriptConfig         | 3 +++
 share/html/Ticket/Elements/ScrollShowHistory | 7 +++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit 8c6c1319de8d6ba4668c2b5fb3074c5abe939201
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);
     };
 

commit b9560b6ec037e4b89745a9a77c185e32b52952b5
Merge: d17c2df 8c6c131
Author: Shawn M Moore <shawn at bestpractical.com>
Date:   Mon Jun 20 16:52:53 2016 -0400

    Merge branch '4.4/fix-history-scroll-js' into 4.4.1-releng


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