[freeside-commits] freeside/httemplate/elements dashboard-toplist.html, 1.6, 1.7 error.html, 1.2, 1.3 errorpage.html, 1.4, 1.5 input-date-field.html, 1.2, 1.3 searchbar-cust_main.html, 1.1, 1.2 searchbar-ticket.html, 1.1, 1.2 select-agent.html, 1.9, 1.10 select-part_referral.html, 1.4, 1.5 select-terms.html, 1.5, 1.6 tr-input-money.html, 1.1, 1.2 tr-search-cust_main.html, 1.1, 1.2 tr-select-from_to.html, 1.2, 1.3 tr-select-svc_acct-domain.html, 1.1, 1.2
Erik Levinson
levinse at wavetail.420.am
Sun May 22 13:23:23 PDT 2011
Update of /home/cvs/cvsroot/freeside/httemplate/elements
In directory wavetail.420.am:/tmp/cvs-serv16115/elements
Modified Files:
dashboard-toplist.html error.html errorpage.html
input-date-field.html searchbar-cust_main.html
searchbar-ticket.html select-agent.html
select-part_referral.html select-terms.html
tr-input-money.html tr-search-cust_main.html
tr-select-from_to.html tr-select-svc_acct-domain.html
Log Message:
internationalization/localization, RT12515
Index: tr-input-money.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/tr-input-money.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -d -r1.1 -r1.2
--- tr-input-money.html 1 Aug 2007 22:25:10 -0000 1.1
+++ tr-input-money.html 22 May 2011 20:23:20 -0000 1.2
@@ -1,9 +1,8 @@
-<% include('tr-input-text.html', @_,
+<& tr-input-text.html, @_,
'type' => 'text',
'prefix' => $money_char,
'size' => 8,
- )
-%>
+&>
<%once>
my $conf = new FS::Conf;
Index: searchbar-ticket.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/searchbar-ticket.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -d -r1.1 -r1.2
--- searchbar-ticket.html 25 Mar 2010 20:21:51 -0000 1.1
+++ searchbar-ticket.html 22 May 2011 20:23:20 -0000 1.2
@@ -2,8 +2,8 @@
<FORM ACTION="<% FS::TicketSystem->baseurl %>index.html" METHOD="GET" STYLE="margin:0">
<INPUT NAME="q" TYPE="text" VALUE="<% $ticketing_label |n %>" STYLE="width:<% $width %>" onFocus="clearhint_search_ticket(this);" onClick="clearhint_search_ticket(this);" CLASS="fstext"><BR>
- <A HREF="<% FS::TicketSystem->baseurl %>Search/Build.html" CLASS="fslink" STYLE="font-size:11px">Advanced</A>
- <INPUT TYPE="submit" VALUE="Search tickets" CLASS="fsblackbutton" onMouseOver="this.className='fsblackbuttonselected'; return true;" onMouseOut="this.className='fsblackbutton'; return true;" STYLE="font-size:11px">
+ <A HREF="<% FS::TicketSystem->baseurl %>Search/Build.html" CLASS="fslink" STYLE="font-size:11px"><% mt('Advanced') |h %></A>
+ <INPUT TYPE="submit" VALUE="<% mt('Search tickets') |h %>" CLASS="fsblackbutton" onMouseOver="this.className='fsblackbuttonselected'; return true;" onMouseOut="this.className='fsblackbutton'; return true;" STYLE="font-size:11px">
</FORM>
<% $menu_position eq 'left' ? '<BR>' : '' %>
@@ -19,7 +19,7 @@
</SCRIPT>
<%once>
-my $ticketing_label = '(ticket #, subject, email or fulltext:text)';
+my $ticketing_label = emt('(ticket #, subject, email or fulltext:text)');
</%once>
<%init>
Index: errorpage.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/errorpage.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -d -r1.4 -r1.5
--- errorpage.html 13 Jan 2008 20:50:19 -0000 1.4
+++ errorpage.html 22 May 2011 20:23:20 -0000 1.5
@@ -1,4 +1,4 @@
-<% include("/elements/header.html", "Error") %>
+<& /elements/header.html, emt("Error") &>
% while (@_) {
@@ -8,4 +8,3 @@
% $m->flush_buffer();
% $HTML::Mason::Commands::m->abort();
-% #die "shouldn't fall through to here (mason \$m->abort didn't)";
Index: tr-search-cust_main.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/tr-search-cust_main.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -d -r1.1 -r1.2
--- tr-search-cust_main.html 30 Mar 2010 02:53:10 -0000 1.1
+++ tr-search-cust_main.html 22 May 2011 20:23:21 -0000 1.2
@@ -1,6 +1,6 @@
-<% include('tr-td-label.html', @_ ) %>
+<& tr-td-label.html, @_ &>
- <TD <% $colspan %> <% $cell_style %> ID="<% $opt{input_id} || $opt{id}.'_input0' %>"><% include('search-cust_main.html', @_ ) %></TD>
+ <TD <% $colspan %> <% $cell_style %> ID="<% $opt{input_id} || $opt{id}.'_input0' %>"><& search-cust_main.html, @_ &></TD>
</TR>
Index: input-date-field.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/input-date-field.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -d -r1.2 -r1.3
--- input-date-field.html 12 Oct 2010 01:15:17 -0000 1.2
+++ input-date-field.html 22 May 2011 20:23:20 -0000 1.3
@@ -6,7 +6,7 @@
% }
<INPUT TYPE="text" NAME="<% $name %>" ID="<% $name %>_text" VALUE="<% $value %>">
-<IMG SRC="<%$fsurl%>images/calendar.png" ID="<% $name %>_button" STYLE="cursor: pointer" TITLE="Select date">
+<IMG SRC="<%$fsurl%>images/calendar.png" ID="<% $name %>_button" STYLE="cursor: pointer" TITLE="<% mt('Select date') |h %>">
<SCRIPT TYPE="text/javascript">
Calendar.setup({
Index: select-agent.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/select-agent.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -d -r1.9 -r1.10
--- select-agent.html 14 Feb 2009 00:40:11 -0000 1.9
+++ select-agent.html 22 May 2011 20:23:20 -0000 1.10
@@ -1,15 +1,14 @@
-<% include( '/elements/select-table.html',
+<& /elements/select-table.html,
'table' => 'agent',
'name_col' => 'agent',
'value' => $agentnum || '',
'agent_virt' => 1,
- 'empty_label' => 'all',
+ 'empty_label' => emt('all'),
'hashref' => { 'disabled' => '' },
'order_by' => ' ORDER BY agent',
'disable_empty' => $disable_empty,
%opt,
- )
-%>
+&>
<%init>
my %opt = @_;
Index: dashboard-toplist.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/dashboard-toplist.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -d -r1.6 -r1.7
--- dashboard-toplist.html 4 Mar 2011 02:26:15 -0000 1.6
+++ dashboard-toplist.html 22 May 2011 20:23:20 -0000 1.7
@@ -1,6 +1,6 @@
% if ( $conf->exists('dashboard-toplist') ) {
- <% include('/elements/table-grid.html') %>
+ <& /elements/table-grid.html &>
% my $bgcolor1 = '#eeeeee';
% my $bgcolor2 = '#ffffff';
@@ -24,11 +24,11 @@
<A HREF="view/cust_main.cgi?<% $custnum %>"><% $cust_main->name %></A>
</TD>
<TD CLASS="grid" BGCOLOR="<% $bgcolor %>">
- <% include('/elements/mcp_lint.html', 'cust_main'=>$cust_main) %>
+ <& /elements/mcp_lint.html, 'cust_main'=>$cust_main &>
</TD>
<TD CLASS="grid" BGCOLOR="<% $bgcolor %>" ALIGN="right">
<FONT SIZE="-1">
- <A HREF="<% FS::TicketSystem->href_new_ticket($cust_main) %>">(new ticket)</A>
+ <A HREF="<% FS::TicketSystem->href_new_ticket($cust_main) %>"><% mt('(new ticket)') |h %></A>
</FONT>
</TD>
@@ -51,7 +51,7 @@
<TR>
<TD CLASS="grid" BGCOLOR="<% $bgcolor %>">
- Unknown customer number <% $custnum %>
+ <% mt("Unknown customer number [_1]", $custnum) |h %>
</TD>
</TR>
@@ -75,7 +75,7 @@
<TR>
<TH CLASS="grid" BGCOLOR="#cccccc"><% $line %></TH>
- <TH CLASS="grid" BGCOLOR="#cccccc">Lint</TH>
+ <TH CLASS="grid" BGCOLOR="#cccccc"><% mt('Lint') |h %></TH>
<TH CLASS="grid" BGCOLOR="#cccccc"></TH>
% foreach my $priority ( @custom_priorities, '' ) {
<TH CLASS="grid" BGCOLOR="#cccccc">
Index: tr-select-svc_acct-domain.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/tr-select-svc_acct-domain.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -d -r1.1 -r1.2
--- tr-select-svc_acct-domain.html 12 Apr 2009 06:24:45 -0000 1.1
+++ tr-select-svc_acct-domain.html 22 May 2011 20:23:21 -0000 1.2
@@ -3,14 +3,13 @@
% } else {
<TR>
- <TD ALIGN="right"><% $opt{'label'} || 'Domain' %></TD>
+ <TD ALIGN="right"><% $opt{'label'} || emt('Domain') %></TD>
<TD>
- <% include('/elements/select-svc_acct-domain.html',
+ <& /elements/select-svc_acct-domain.html,
'curr_value' => $domsvc,
'part_svc' => $part_svc,
'cust_pkg' => $cust_pkg,
- )
- %>
+ &>
</TD>
</TR>
% }
Index: error.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/error.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -d -r1.2 -r1.3
--- error.html 25 Dec 2007 23:49:22 -0000 1.2
+++ error.html 22 May 2011 20:23:20 -0000 1.3
@@ -1,4 +1,4 @@
% if ( $cgi->param('error') ) {
- <FONT SIZE="+1" COLOR="#ff0000">Error: <% $cgi->param('error') |h %></FONT>
+ <FONT SIZE="+1" COLOR="#ff0000"><% mt("Error: [_1]", $cgi->param('error')) |h %></FONT>
<BR><BR>
% }
Index: select-terms.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/select-terms.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -d -r1.5 -r1.6
--- select-terms.html 5 May 2011 17:01:10 -0000 1.5
+++ select-terms.html 22 May 2011 20:23:20 -0000 1.6
@@ -26,13 +26,13 @@
my $empty_label =
$opt{'empty_label'}
- || 'Default ('.
- ($conf->config('invoice_default_terms') || 'Payable upon receipt').
+ || emt('Default').' ('.
+ ($conf->config('invoice_default_terms') || emt('Payable upon receipt')).
')';
my $empty_value = $opt{'empty_value'} || '';
-my @terms = ( 'Payable upon receipt',
+my @terms = ( emt('Payable upon receipt'),
( map "Net $_", 0, 3, 9, 10, 15, 20, 30, 45, 60, 90 ),
);
Index: searchbar-cust_main.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/searchbar-cust_main.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -d -r1.1 -r1.2
--- searchbar-cust_main.html 25 Mar 2010 20:21:51 -0000 1.1
+++ searchbar-cust_main.html 22 May 2011 20:23:20 -0000 1.2
@@ -2,8 +2,8 @@
<FORM ACTION="<%$fsurl%>search/cust_main.cgi" METHOD="GET" STYLE="margin:0">
<INPUT NAME="search_cust" TYPE="text" VALUE="<% $cust_label |n %>" STYLE="width:<%$width%>" onFocus="clearhint_search_cust(this);" onClick="clearhint_search_cust(this);" CLASS="fstext"><BR>
- <A HREF="<%$fsurl%>search/report_cust_main.html" CLASS="fslink" STYLE="font-size: 11px">Advanced</A>
- <INPUT TYPE="submit" VALUE="Search customers" CLASS="fsblackbutton" onMouseOver="this.className='fsblackbuttonselected'; return true;" onMouseOut="this.className='fsblackbutton'; return true;" STYLE="font-size:11px">
+ <A HREF="<%$fsurl%>search/report_cust_main.html" CLASS="fslink" STYLE="font-size: 11px"><% mt('Advanced') |h %></A>
+ <INPUT TYPE="submit" VALUE="<% mt('Search customers') |h %>" CLASS="fsblackbutton" onMouseOver="this.className='fsblackbuttonselected'; return true;" onMouseOut="this.className='fsblackbutton'; return true;" STYLE="font-size:11px">
</FORM>
<% $menu_position eq 'left' ? '<BR>' : '' %>
@@ -33,6 +33,8 @@
}
$cust_label .= ' or contact phone)';
+$cust_label = emt($cust_label);
+
my $width = $menu_position eq 'left' ? '190px' : $cust_width.'px';
</%init>
Index: select-part_referral.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/select-part_referral.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -d -r1.4 -r1.5
--- select-part_referral.html 1 Aug 2007 22:25:09 -0000 1.4
+++ select-part_referral.html 22 May 2011 20:23:20 -0000 1.5
@@ -1,14 +1,13 @@
-<% include( '/elements/select-table.html',
+<& /elements/select-table.html,
'table' => 'part_referral',
'name_col' => 'referral',
'value' => $refnum,
- 'empty_label' => 'Select advertising source',
+ 'empty_label' => emt('Select advertising source'),
'hashref' => { 'disabled' => '' },
'extra_sql' => ' AND '.
FS::part_referral->acl_agentnum_sql(1),
%opt,
- )
-%>
+&>
<%init>
my %opt = @_;
Index: tr-select-from_to.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/tr-select-from_to.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -d -r1.2 -r1.3
--- tr-select-from_to.html 23 Aug 2006 22:25:38 -0000 1.2
+++ tr-select-from_to.html 22 May 2011 20:23:21 -0000 1.3
@@ -1,52 +1,45 @@
-%
-%
-% #my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
-% my ($curmon,$curyear) = (localtime(time))[4,5];
-%
-% #find first month
-% my $syear = 1899+$curyear;
-% my $smonth = $curmon+1;
-%
-% #want 12 month by default, not 13
-% $smonth++;
-% if ( $smonth > 12 ) { $smonth-=12; $syear++ }
-%
-% #find last month
-% my $eyear = 1900+$curyear;
-% my $emonth = $curmon+1;
-%
-% my %hash = (
-% 'show_month_abbr' => 1,
-% 'start_year' => '1999',
-% 'end_year' => '2012', #haha, well...
-% @_,
-% );
-%
-%
-
-
<TR>
- <TD ALIGN="right">From: </TD>
+ <TD ALIGN="right"><% mt('From: ') |h %></TD>
<TD>
- <% include('/elements/select-month_year.html',
+ <& /elements/select-month_year.html,
'prefix' => 'start',
'selected_mon' => $smonth,
'selected_year' => $syear,
%hash,
- )
- %>
+ &>
</TD>
</TR>
<TR>
- <TD ALIGN="right">To: </TD>
+ <TD ALIGN="right"><% mt('To: ') |h %></TD>
<TD>
- <% include('/elements/select-month_year.html',
+ <& /elements/select-month_year.html,
'prefix' => 'end',
'selected_mon' => $emonth,
'selected_year' => $eyear,
%hash,
- )
- %>
+ &>
</TD>
</TR>
+<%init>
+ my ($curmon,$curyear) = (localtime(time))[4,5];
+
+ #find first month
+ my $syear = 1899+$curyear;
+ my $smonth = $curmon+1;
+
+ #want 12 month by default, not 13
+ $smonth++;
+ if ( $smonth > 12 ) { $smonth-=12; $syear++ }
+
+ #find last month
+ my $eyear = 1900+$curyear;
+ my $emonth = $curmon+1;
+
+ my %hash = (
+ 'show_month_abbr' => 1,
+ 'start_year' => '1999',
+ 'end_year' => '2012', #haha, well...
+ @_,
+ );
+</%init>
More information about the freeside-commits
mailing list