[Rt-commit] rt branch, 4.0/loc-cleanups, created. rt-4.0.1rc1-7-g4d23f98
Shawn Moore
sartak at bestpractical.com
Mon May 23 17:48:20 EDT 2011
The branch, 4.0/loc-cleanups has been created
at 4d23f98154da7d84e86ddd29980a5e4165461eb2 (commit)
- Log -----------------------------------------------------------------
commit 323087c3a637d406ee3740093b7f9389b9c92e1c
Author: Shawn M Moore <sartak at bestpractical.com>
Date: Mon May 23 16:21:57 2011 -0400
Remove an extraneous </a> tag in our GPL link loc text
We pass </a> as the second loc parameter with the intent of having
less HTML directly in our loc strings. So we don't need this second
one, which defeats the purpose of parameterizing the HTML.
diff --git a/share/html/Elements/Footer b/share/html/Elements/Footer
index c685bc0..4c76612 100755
--- a/share/html/Elements/Footer
+++ b/share/html/Elements/Footer
@@ -56,7 +56,7 @@
<p id="bpscredits"><span><&|/l, '»|«', $RT::VERSION, '2011', '<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, '<a href="http://www.gnu.org/licenses/gpl-2.0.html">', '</a>' &>Distributed under [_1]version 2 of the GNU GPL[_2].</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 /></p>
+ <p id="legal"><&|/l, '<a href="http://www.gnu.org/licenses/gpl-2.0.html">', '</a>' &>Distributed under [_1]version 2 of the GNU GPL[_2].</&><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 /></p>
% }
</div>
% if ($Debug >= 2 ) {
commit 45fc17aa683e8416aeb17fd0af34b38e6a6bd05b
Author: Shawn M Moore <sartak at bestpractical.com>
Date: Mon May 23 16:49:51 2011 -0400
Refactor the create-ticket loc string to have less HTML
The old version required translators to keep our HTML exactly
correct, which is prone to error and looks gross.
diff --git a/share/html/Elements/CreateTicket b/share/html/Elements/CreateTicket
index 221c4cb..e6a695c 100755
--- a/share/html/Elements/CreateTicket
+++ b/share/html/Elements/CreateTicket
@@ -48,7 +48,10 @@
<form action="<% RT->Config->Get('WebPath') %><% $SendTo %>" name="CreateTicketInQueue" id="CreateTicketInQueue" \
% $m->callback(CallbackName => 'InFormElement');
>
-<&|/l, $m->scomp('/Elements/SelectNewTicketQueue', OnChange => 'document.CreateTicketInQueue.submit()', SendTo => $SendTo ) &><input type="submit" class="button" value="New ticket in" /> [_1]</&>
+% my $button_start = '<input type="submit" class="button" value="';
+% my $button_end = '" />';
+% my $queue_selector = $m->scomp('/Elements/SelectNewTicketQueue', OnChange => 'document.CreateTicketInQueue.submit()', SendTo => $SendTo );
+<&|/l, $button_start, $button_end, $queue_selector &>[_1]New ticket in[_2] [_3]</&>
% $m->callback(CallbackName => 'BeforeFormEnd');
</form>
<%ARGS>
commit 4ccab9be34ca500d84a51dea3af67baec778c716
Author: Shawn M Moore <sartak at bestpractical.com>
Date: Mon May 23 17:38:58 2011 -0400
Skip StyleGuide from loc extraction
There's no reason to translate the couple of strings in this file,
they are not executed.
diff --git a/devel/tools/extract-message-catalog b/devel/tools/extract-message-catalog
index 3b66ae7..b3392ef 100755
--- a/devel/tools/extract-message-catalog
+++ b/devel/tools/extract-message-catalog
@@ -125,6 +125,7 @@ sub extract_strings_from_code {
qr!lib/blib|lib/t/autogen|var|m4|local|share/fonts! );
return if ( /\.(?:pot|po|bak|gif|png|psd|jpe?g|svg|css|js)$/ );
return if ( /~|,D|,B$|extract-message-catalog$|tweak-template-locstring$/ );
+ return if ( /StyleGuide.pod/ );
return if ( /^[\.#]/ );
return if ( -f "$_.in" );
commit 73d4de1b86379abfac4cc458d474029659cdad75
Author: Shawn M Moore <sartak at bestpractical.com>
Date: Mon May 23 17:41:08 2011 -0400
Move <p> tags outside of a loc string
diff --git a/share/html/User/Prefs.html b/share/html/User/Prefs.html
index 0ace58a..702b760 100755
--- a/share/html/User/Prefs.html
+++ b/share/html/User/Prefs.html
@@ -177,7 +177,7 @@
<tr><td colspan="2" valign="top" class="boxcontainer">
<&| /Widgets/TitleBox, title => loc('Secret authentication token'), id => "user-prefs-feeds" &>
-<&|/l&><p>All iCal feeds embed a secret token which authorizes you. If the URL one of your iCal feeds got exposed to the outside world, you can get a new secret, <b>breaking all existing iCal feeds</b> below.</p></&>
+<p><&|/l&>All iCal feeds embed a secret token which authorizes you. If the URL one of your iCal feeds got exposed to the outside world, you can get a new secret, <b>breaking all existing iCal feeds</b> below.</&></p>
<& /Elements/Submit, Label => loc('Reset secret authentication token'), Name => "ResetAuthToken" &>
</&>
commit 4d23f98154da7d84e86ddd29980a5e4165461eb2
Author: Shawn M Moore <sartak at bestpractical.com>
Date: Mon May 23 17:43:15 2011 -0400
Move a stray </p> tag out of the loc string
diff --git a/share/html/Install/index.html b/share/html/Install/index.html
index 3372572..66034b1 100644
--- a/share/html/Install/index.html
+++ b/share/html/Install/index.html
@@ -80,7 +80,8 @@
</b>
</p>
<p>
-<&|/l&>If you already have a working RT server and database, you should take this opportunity to make sure that your database server is running and that the RT server can connect to it. Once you've done that, stop and start the RT server.</p></&>
+<&|/l&>If you already have a working RT server and database, you should take this opportunity to make sure that your database server is running and that the RT server can connect to it. Once you've done that, stop and start the RT server.</&>
+</p>
</div>
<& /Elements/Submit, Label => loc( "Let's go!"), Name => 'Run' &>
-----------------------------------------------------------------------
More information about the Rt-commit
mailing list