[Rt-commit] rt branch, 4.2/translate-full-string, created. rt-4.2.3-84-g1d0b918

[Alex Vandiver]

The branch, 4.2/translate-full-string has been created
        at  1d0b91823db7856be3727fd351a3d7d3d5a9a2c5 (commit)

- Log -----------------------------------------------------------------
commit 1d0b91823db7856be3727fd351a3d7d3d5a9a2c5
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Tue Apr 15 16:42:33 2014 -0400

    Translate the full title string, not as piecemeal bits
    
    Not all languages have the same singular and plural forms of
    open/closed; see I#14736.

diff --git a/share/html/SelfService/Closed.html b/share/html/SelfService/Closed.html
index d69153e..19aae86 100644
--- a/share/html/SelfService/Closed.html
+++ b/share/html/SelfService/Closed.html
@@ -50,7 +50,7 @@
 <& /SelfService/Elements/MyRequests,
     %ARGS,
     status          => [ RT::Queue->InactiveStatusArray ],
-    friendly_status => loc('closed'), 
+    title           => loc('My closed tickets'),
     BaseURL         => RT->Config->Get('WebPath') ."/SelfService/Closed.html?",
     Page            => $Page,
 &>
diff --git a/share/html/SelfService/Elements/MyRequests b/share/html/SelfService/Elements/MyRequests
index d38a7ae..ab8c9b3 100644
--- a/share/html/SelfService/Elements/MyRequests
+++ b/share/html/SelfService/Elements/MyRequests
@@ -59,7 +59,7 @@
 </&>
 
 <%INIT>
-my $title = loc("My [_1] tickets", $friendly_status);
+$title ||= loc("My [_1] tickets", $friendly_status);
 my $id = $session{'CurrentUser'}->id;
 my $Query = "( Watcher.id = $id )";
 if ( @status ) {
@@ -69,6 +69,7 @@ if ( @status ) {
 my $Format = RT->Config->Get('DefaultSelfServiceSearchResultFormat');
 </%INIT>
 <%ARGS>
+$title => undef
 $friendly_status => loc('open')
 @status => ()
 $BaseURL => undef
diff --git a/share/html/SelfService/index.html b/share/html/SelfService/index.html
index c30bf88..5a0c132 100644
--- a/share/html/SelfService/index.html
+++ b/share/html/SelfService/index.html
@@ -49,7 +49,7 @@
 <& /SelfService/Elements/MyRequests,
     %ARGS,
     status          => [ RT::Queue->ActiveStatusArray() ],
-    friendly_status => loc('open'),
+    title   => loc('My open tickets'),
     BaseURL => RT->Config->Get('WebPath') ."/SelfService/?",
     Page    => $Page, 
 &>

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