[freeside-commits] branch FREESIDE_4_BRANCH updated. 01c085c7bb70af2eafd5c6bb545a2e51a720623d
Ivan
ivan at 420.am
Thu Aug 18 14:57:53 PDT 2016
The branch, FREESIDE_4_BRANCH has been updated
via 01c085c7bb70af2eafd5c6bb545a2e51a720623d (commit)
via b6985d605ab82cb1821807ef50ce359546c13243 (commit)
via 30c9a71ef6f389f1fb70b1551635c9268f3be94c (commit)
from df2d61c5308891cc5d4fe7df9cdaef623a16fce3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 01c085c7bb70af2eafd5c6bb545a2e51a720623d
Author: Ivan Kohler <ivan at freeside.biz>
Date: Thu Aug 18 14:52:35 2016 -0700
localize header / merge github#56
diff --git a/httemplate/elements/header-full.html b/httemplate/elements/header-full.html
index 07595a5..a645e61 100644
--- a/httemplate/elements/header-full.html
+++ b/httemplate/elements/header-full.html
@@ -73,10 +73,10 @@ Example:
<td align="right" BGCOLOR="#ffffff">
<& notify-tickets.html &>
</td>
- <td align=right valign=top BGCOLOR="#ffffff"><FONT SIZE="-1">Logged in as <b><% $FS::CurrentUser::CurrentUser->username |h %> </b> <FONT SIZE="-2"><a href="<%$fsurl%>loginout/logout.html">logout</a></FONT><br></FONT><FONT SIZE="-2"><a href="<%$fsurl%>pref/pref.html" STYLE="color: #000000">Preferences</a>
+ <td align=right valign=top BGCOLOR="#ffffff"><FONT SIZE="-1"><% mt('Logged in as') |h %><b><% $FS::CurrentUser::CurrentUser->username |h %> </b> <FONT SIZE="-2"><a href="<%$fsurl%>loginout/logout.html"><% mt('logout' |h %></a></FONT><br></FONT><FONT SIZE="-2"><a href="<%$fsurl%>pref/pref.html" STYLE="color: #000000"><% mt('Preferences') |h %></a>
% if ( $conf->config("ticket_system")
% && FS::TicketSystem->access_right(\%session, 'ModifySelf') ) {
- | <a href="<%$fsurl%>rt/Prefs/Other.html" STYLE="color: #000000">Ticketing preferences</a>
+ | <a href="<%$fsurl%>rt/Prefs/Other.html" STYLE="color: #000000"><% mt('Ticketing preferences') |h %></a>
% }
<BR></FONT>
</td>
diff --git a/httemplate/elements/menu.html b/httemplate/elements/menu.html
index 5b6aa5a..933728f 100644
--- a/httemplate/elements/menu.html
+++ b/httemplate/elements/menu.html
@@ -981,11 +981,11 @@ sub submenu {
my($subhtml, $submenuname ) = submenu($url_or_submenu, $_); #mmm, recursion
"$subhtml\n".
- "myMenu$menunum.add(new WebFXMenuItem(\"$_\", null, \"$tooltip\", $submenuname ));";
+ "myMenu$menunum.add(new WebFXMenuItem(\"".mt($_)."\", null, \"".mt($tooltip)."\", $submenuname ));";
} else {
- "myMenu$menunum.add(new WebFXMenuItem(\"$_\", \"$url_or_submenu\", \"$tooltip\" ));";
+ "myMenu$menunum.add(new WebFXMenuItem(\"".mt($_)."\", \"$url_or_submenu\", \"".mt($tooltip)."\" ));";
}
diff --git a/httemplate/elements/searchbar-address2.html b/httemplate/elements/searchbar-address2.html
index 5f3b1f2..047db89 100644
--- a/httemplate/elements/searchbar-address2.html
+++ b/httemplate/elements/searchbar-address2.html
@@ -4,7 +4,7 @@
<INPUT TYPE="hidden" NAME="address2_on" VALUE="1">
<INPUT NAME="address2_text" TYPE="text" VALUE="<% $address2_label |n %>" STYLE="width:67px" onFocus="clearhint_search_address2(this);" onClick="clearhint_search_address2(this);" CLASS="fstext">
<BR>
- <INPUT TYPE="submit" VALUE="Search units" CLASS="fsblackbutton" onMouseOver="this.className='fsblackbuttonselected'; return true;" onMouseOut="this.className='fsblackbutton'; return true;" STYLE="font-size:11px;padding-left:1px;padding-right:1px;margin-top:3px">
+ <INPUT TYPE="submit" VALUE="<% mt("Search units") %>" CLASS="fsblackbutton" onMouseOver="this.className='fsblackbuttonselected'; return true;" onMouseOut="this.className='fsblackbutton'; return true;" STYLE="font-size:11px;padding-left:1px;padding-right:1px;margin-top:3px">
</FORM>
<% $menu_position eq 'left' ? '<BR>' : '' |n %>
@@ -20,7 +20,7 @@
</SCRIPT>
<%once>
-my $address2_label = '(Unit #)';
+my $address2_label = mt('(Unit #)');
</%once>
<%init>
diff --git a/httemplate/elements/searchbar-cust_svc.html b/httemplate/elements/searchbar-cust_svc.html
index e4c2dc6..8d5ca40 100644
--- a/httemplate/elements/searchbar-cust_svc.html
+++ b/httemplate/elements/searchbar-cust_svc.html
@@ -1,7 +1,7 @@
% if ( $curuser->access_right('View customer services') ) {
<FORM ACTION="<%$fsurl%>search/cust_svc.html" METHOD="GET" STYLE="margin:0">
- <INPUT NAME="search_svc" TYPE="text" VALUE="<% $svc_label |n %>" STYLE="width:<% $width %>" onFocus="clearhint_search_svc(this);" onClick="clearhint_search_svc(this);" CLASS="fstext"><BR>
+ <INPUT NAME="search_svc" TYPE="text" VALUE="<% mt("$svc_label |n") %>" STYLE="width:<% $width %>" onFocus="clearhint_search_svc(this);" onClick="clearhint_search_svc(this);" CLASS="fstext"><BR>
<A NOTYET="<%$fsurl%>search/svc_Smarter.html" STYLE="color: #cccccc; font-size:11px"><% mt('Advanced') |h %></A>
<INPUT TYPE="submit" VALUE="<% mt('Search services') |h %>" CLASS="fsblackbutton" onMouseOver="this.className='fsblackbuttonselected'; return true;" onMouseOut="this.className='fsblackbutton'; return true;" STYLE="font-size:11px">
</FORM>
@@ -12,7 +12,7 @@
<SCRIPT TYPE="text/javascript">
function clearhint_search_svc (what) {
- if ( what.value == '<% $svc_label |n %>' )
+ if ( what.value == '<% mt("$svc_label |n") %>' )
what.value = '';
}
diff --git a/httemplate/elements/searchbar-prospect.html b/httemplate/elements/searchbar-prospect.html
index a604467..25883bb 100644
--- a/httemplate/elements/searchbar-prospect.html
+++ b/httemplate/elements/searchbar-prospect.html
@@ -3,7 +3,7 @@
<FORM ACTION="<%$fsurl%>search/prospect_main.html" METHOD="GET" STYLE="margin:0">
<INPUT NAME="search_prospect" TYPE="text" VALUE="<% $prospect_label |n %>" STYLE="width:<%$width%>" onFocus="clearhint_search_prospect(this);" onClick="clearhint_search_prospect(this);" CLASS="fstext"><BR>
<A HREF="<%$fsurl%>search/report_prospect_main.html" CLASS="fslink" STYLE="font-size: 11px"><% mt('Adv') |h %></A>
- <INPUT TYPE="submit" VALUE="Search prospects" CLASS="fsblackbutton" onMouseOver="this.className='fsblackbuttonselected'; return true;" onMouseOut="this.className='fsblackbutton'; return true;" STYLE="font-size:11px;padding-left:1px;padding-right:1px">
+ <INPUT TYPE="submit" VALUE="<% mt("Search prospects") %>" CLASS="fsblackbutton" onMouseOver="this.className='fsblackbuttonselected'; return true;" onMouseOut="this.className='fsblackbutton'; return true;" STYLE="font-size:11px;padding-left:1px;padding-right:1px">
</FORM>
<% $menu_position eq 'left' ? '<BR>' : '' |n %>
@@ -19,7 +19,7 @@
</SCRIPT>
<%once>
-my $prospect_label = '(name, company or phone)';
+my $prospect_label = mt('(name, company or phone)');
</%once>
<%init>
commit b6985d605ab82cb1821807ef50ce359546c13243
Author: Ivan Kohler <ivan at freeside.biz>
Date: Thu Aug 18 14:41:05 2016 -0700
Merge branch 'github/pr/57'
diff --git a/httemplate/misc/delete-ftp_target.html b/httemplate/misc/delete-upload_target.html
similarity index 71%
rename from httemplate/misc/delete-ftp_target.html
rename to httemplate/misc/delete-upload_target.html
index c8bd297..2626e1d 100644
--- a/httemplate/misc/delete-ftp_target.html
+++ b/httemplate/misc/delete-upload_target.html
@@ -1,7 +1,7 @@
% if ( $error ) {
% errorpage($error);
% } else {
-<% $cgi->redirect("${p}browse/ftp_target.html") %>
+<% $cgi->redirect("${p}browse/upload_target.html") %>
% }
<%init>
@@ -12,7 +12,7 @@ my($query) = $cgi->keywords;
$query =~ /^(\d+)$/ || die "Illegal targetnum";
my $targetnum = $1;
-my $target = qsearchs('ftp_target',{'targetnum'=>$targetnum});
+my $target = qsearchs('upload_target',{'targetnum'=>$targetnum});
my $error = $target->delete;
</%init>
commit 30c9a71ef6f389f1fb70b1551635c9268f3be94c
Author: Ivan Kohler <ivan at freeside.biz>
Date: Thu Aug 18 14:24:41 2016 -0700
Merge branch 'github/pr/55_reprise'
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index eda0880..a391a98 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -981,7 +981,7 @@ my $validate_email = sub { $_[0] =~
'section' => 'credit_cards',
'description' => 'Currency parameter for Business::OnlinePayment transactions.',
'type' => 'select',
- 'select_enum' => [ '', qw( USD AUD CAD DKK EUR GBP ILS JPY NZD ) ],
+ 'select_enum' => [ '', qw( USD AUD CAD DKK EUR GBP ILS JPY NZD ARS ) ],
},
{
@@ -996,7 +996,7 @@ my $validate_email = sub { $_[0] =~
'section' => 'localization',
'description' => 'Main accounting currency',
'type' => 'select',
- 'select_enum' => [ '', qw( USD AUD CAD DKK EUR GBP ILS JPY NZD XAF ) ],
+ 'select_enum' => [ '', qw( USD AUD CAD DKK EUR GBP ILS JPY NZD XAF ARS ) ],
},
{
diff --git a/FS/FS/L10N/es_ar.pm b/FS/FS/L10N/es_ar.pm
new file mode 100644
index 0000000..0b50ca0
--- /dev/null
+++ b/FS/FS/L10N/es_ar.pm
@@ -0,0 +1,6 @@
+package FS::L10N::es_ar;
+use base qw(FS::L10N::es_es);
+
+our %Lexicon = ();
+
+1;
diff --git a/FS/FS/Locales.pm b/FS/FS/Locales.pm
index 23a95ca..d1f3eed 100644
--- a/FS/FS/Locales.pm
+++ b/FS/FS/Locales.pm
@@ -32,6 +32,7 @@ tie our %locales, 'Tie::IxHash',
'en_AU', { name => 'English', country => 'Australia', },
'en_CA', { name => 'English', country => 'Canada', },
'es_ES', { name => 'Spanish', country => 'Spain', },
+ 'es_AR', { name => 'Spanish', country => 'Argentina', },
'es_CU', { name => 'Spanish', country => 'Cuba', },
'es_MX', { name => 'Spanish', country => 'Mexico', },
'es_PA', { name => 'Spanish', country => 'Panama', },
diff --git a/httemplate/pref/pref.html b/httemplate/pref/pref.html
index c6bcf6f..93c7199 100644
--- a/httemplate/pref/pref.html
+++ b/httemplate/pref/pref.html
@@ -36,7 +36,7 @@ Interface
<TH ALIGN="right">Locale: </TH>
<TD COLSPAN=2>
<SELECT NAME="locale">
-% foreach my $locale ( FS::Locales->locales ) {
+% foreach my $locale ( @locales ) {
% my %info = FS::Locales->locale_info($locale);
% my $selected = ($locale eq $curuser->option('locale'))
% ? 'SELECTED' : '';
@@ -287,4 +287,14 @@ my $menu_position = $1;
=~ /^([,\w\@.\-]*)$/ or die "illegal email_address"; #too late
my $email_address = $1;
+my $conf = new FS::Conf;
+
+my @locales = $conf->config('available-locales');
+
+if ( ! @locales ) {
+
+ @locales = FS::Locales->locales ;
+
+}
+
</%init>
-----------------------------------------------------------------------
Summary of changes:
FS/FS/Conf.pm | 4 ++--
FS/FS/L10N/es_ar.pm | 6 ++++++
FS/FS/Locales.pm | 1 +
httemplate/elements/header-full.html | 4 ++--
httemplate/elements/menu.html | 4 ++--
httemplate/elements/searchbar-address2.html | 4 ++--
httemplate/elements/searchbar-cust_svc.html | 4 ++--
httemplate/elements/searchbar-prospect.html | 4 ++--
.../{delete-ftp_target.html => delete-upload_target.html} | 4 ++--
httemplate/pref/pref.html | 12 +++++++++++-
10 files changed, 32 insertions(+), 15 deletions(-)
create mode 100644 FS/FS/L10N/es_ar.pm
rename httemplate/misc/{delete-ftp_target.html => delete-upload_target.html} (71%)
More information about the freeside-commits
mailing list