[Rt-commit] r15889 - in rt/branches/3.999-DANGEROUS: share/html/Elements

[sunnavy at bestpractical.com]

Author: sunnavy
Date: Wed Sep 10 12:48:40 2008
New Revision: 15889

Modified:
   rt/branches/3.999-DANGEROUS/   (props changed)
   rt/branches/3.999-DANGEROUS/share/html/Elements/Footer
   rt/branches/3.999-DANGEROUS/share/html/Elements/Header

Log:
 r16574 at sunnavys-mb:  sunnavy | 2008-09-10 23:34:42 +0800
 make i18n from calling /l to calling _(), because /l seems does not do its job within wrapper


Modified: rt/branches/3.999-DANGEROUS/share/html/Elements/Footer
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Elements/Footer	(original)
+++ rt/branches/3.999-DANGEROUS/share/html/Elements/Footer	Wed Sep 10 12:48:40 2008
@@ -56,13 +56,18 @@
 %}
   <p id="bpscredits">
     <span>
-<&|/l,     '&#187;&#124;&#171;', $RT::VERSION, '2008', '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>', &>%1 RT %2 Copyright 1996-%3 %4.</&>
+% $m->print( _('%1 RT %2 Copyright 1996-%3 %4.', '&#187;&#124;&#171;', $RT::VERSION, '2008', '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>' ) );
+%#<&|/l, '&#187;&#124;&#171;', $RT::VERSION, '2008', '<a href="http://www.bestpractical.com?rt='.$RT::VERSION.'">Best Practical Solutions, LLC</a>', &>[%1] RT [%2] Copyright 1996-[%3] [%4].</&>
 </span>
 </p>
 % if (!$menu) {
   <p id="legal">
-<&|/l&>Distributed under version 2 <a href="http://www.gnu.org/copyleft/gpl.html"> of the GNU GPL.</a></&><br />
-<&|/l, '<a href="mailto:sales at bestpractical.com">sales at bestpractical.com</a>' &>to inquire about support, training, custom development or licensing, please contact %1.</&><br />
+%#<&|/l&>Distributed under version 2 <a href="http://www.gnu.org/copyleft/gpl.html"> of the GNU GPL.</a></&><br />
+% $m->print(_('Distributed under version 2 <a href="http://www.gnu.org/copyleft/gpl.html"> of the GNU GPL.</a>'));
+            <br />
+%#<&|/l, '<a href="mailto:sales at bestpractical.com">sales at bestpractical.com</a>' &>to inquire about support, training, custom development or licensing, please contact %1.</&><br />
+% $m->print(_('to inquire about support, training, custom development or licensing, please contact %1.', '<a href="mailto:sales at bestpractical.com">sales at bestpractical.com</a>'));
+<br />
   </p>
 % }
 

Modified: rt/branches/3.999-DANGEROUS/share/html/Elements/Header
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Elements/Header	(original)
+++ rt/branches/3.999-DANGEROUS/share/html/Elements/Header	Wed Sep 10 12:48:40 2008
@@ -87,19 +87,20 @@
 
 <div id="quickbar">
   <div id="quick-personal">
-    <span class="hide"><a href="#skipnav"><&|/l&>Skip Menu</&></a> | </span>
+    <span class="hide"><a href="#skipnav"><% _('Skip Menu') %></a> | </span>
 % if (Jifty->web->current_user->name) {
-    <&|/l, "<span>".Jifty->web->current_user->name."</span>" &>Logged in as %1</&>
+  <% _('Logged in as %1', "<span>".Jifty->web->current_user->name."</span>") |n%>
 %     if ( Jifty->web->current_user->has_right( right => 'ModifySelf', object => RT->system ) ) {
-    | <a href="<%RT->config->get('WebPath')%><%$prefs%>"><&|/l&>Preferences</&></a>
+    | <a href="<%RT->config->get('WebPath')%><%$prefs%>"><% _('Preferences') %></a>
 %     }
 % } else {
-    <&|/l&>Not logged in.</&>
+    <% _('Not logged in.') %>
 % }
 % $m->callback( %ARGS );
 % unless (!Jifty->web->current_user->name
 %         or (RT->config->get('WebExternalAuth') and !RT->config->get('WebFallbackToInternalAuth'))) {
-    | <a  href="<%RT->config->get('WebPath')%>/NoAuth/Logout.html<%$url ? "?URL=".$url : ''%>"><&|/l&>Logout</&></a>
+    | <a  href="<%RT->config->get('WebPath')%>/NoAuth/Logout.html<%$url ?
+"?URL=".$url : ''%>"><% _('Logout') %></a>
 % }
   </div>
 % }