[freeside-commits] branch master updated. 1aecd5bf33146bf3f374341a3814960ae1d419e8
Ivan
ivan at 420.am
Thu Aug 18 14:26:18 PDT 2016
The branch, master has been updated
via 1aecd5bf33146bf3f374341a3814960ae1d419e8 (commit)
via 31e1d1d72a371b856f4ee3e50252bf596bb8a2d1 (commit)
via fca32110d9fe0b257353e627d1f66706d719d59f (commit)
via bab5583acee02f55e13a026b280f7528aa0c8d01 (commit)
via 8e67cf9e85e6fe18f501f892db2abd37725bb0bd (commit)
from e0b6fe25cca1e2ff566cc0765f6c9fa24ed66ba8 (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 1aecd5bf33146bf3f374341a3814960ae1d419e8
Merge: e0b6fe2 31e1d1d
Author: Ivan Kohler <ivan at freeside.biz>
Date: Thu Aug 18 14:24:41 2016 -0700
Merge branch 'github/pr/55_reprise'
diff --cc FS/FS/Conf.pm
index d4d9d2b,90bb3b1..9f1a707
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@@ -955,25 -968,18 +955,25 @@@ my $validate_email = sub { $_[0] =
{
'key' => 'business-onlinepayment-currency',
- 'section' => 'billing',
+ '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 ) ],
},
{
+ 'key' => 'business-onlinepayment-verification',
+ 'section' => 'credit_cards',
+ 'description' => 'Run a $1 authorization (followed by a void) to verify new credit card information.',
+ 'type' => 'checkbox',
+ },
+
+ {
'key' => 'currency',
- 'section' => 'billing',
+ '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 ) ],
},
{
commit 31e1d1d72a371b856f4ee3e50252bf596bb8a2d1
Author: Ivan Kohler <ivan at freeside.biz>
Date: Thu Aug 18 14:23:36 2016 -0700
es_ar ISA es_es
diff --git a/FS/FS/L10N/es_ar.pm b/FS/FS/L10N/es_ar.pm
index 3189328..0b50ca0 100644
--- a/FS/FS/L10N/es_ar.pm
+++ b/FS/FS/L10N/es_ar.pm
@@ -1,5 +1,5 @@
package FS::L10N::es_ar;
-use base qw(FS::L10N::DBI);
+use base qw(FS::L10N::es_es);
our %Lexicon = ();
diff --git a/FS/FS/Locales.pm b/FS/FS/Locales.pm
index 2ba822a..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', },
@@ -41,7 +42,6 @@ tie our %locales, 'Tie::IxHash',
'fr_HT', { name => 'French', country => 'Haiti', },
'ht_HT', { name => 'Haitian Creole', country => 'Haiti', },
'iw_IL', { name => 'Hebrew', country => 'Israel', rtl=>1, },
- 'es_AR', { name => 'Spanish', country => 'Argentina', },
;
$_->{label} = $_->{name} . ' (' . $_->{country} . ')'
commit fca32110d9fe0b257353e627d1f66706d719d59f
Author: Fernando Kiernan <fkiernan at id.net.ar>
Date: Sat Jan 18 17:16:43 2014 -0300
- Limit languages on preferences to only those available-locales.
diff --git a/httemplate/pref/pref.html b/httemplate/pref/pref.html
index 50d6e8d..48ec129 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' : '';
@@ -282,4 +282,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>
commit bab5583acee02f55e13a026b280f7528aa0c8d01
Author: Fernando Kiernan <fkiernan at imagenesdigitales.com.ar>
Date: Tue May 5 21:14:49 2015 -0300
- Add ARS (Argentine Peso) as supported system currency.
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index a8ececd..90bb3b1 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -971,7 +971,7 @@ my $validate_email = sub { $_[0] =~
'section' => 'billing',
'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 ) ],
},
{
@@ -979,7 +979,7 @@ my $validate_email = sub { $_[0] =~
'section' => 'billing',
'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 ) ],
},
{
commit 8e67cf9e85e6fe18f501f892db2abd37725bb0bd
Author: Fernando Kiernan <fkiernan at id.net.ar>
Date: Fri Dec 27 09:18:26 2013 -0300
- Add es_AR Locale
diff --git a/FS/FS/L10N/es_ar.pm b/FS/FS/L10N/es_ar.pm
new file mode 100644
index 0000000..3189328
--- /dev/null
+++ b/FS/FS/L10N/es_ar.pm
@@ -0,0 +1,6 @@
+package FS::L10N::es_ar;
+use base qw(FS::L10N::DBI);
+
+our %Lexicon = ();
+
+1;
diff --git a/FS/FS/Locales.pm b/FS/FS/Locales.pm
index 23a95ca..2ba822a 100644
--- a/FS/FS/Locales.pm
+++ b/FS/FS/Locales.pm
@@ -41,6 +41,7 @@ tie our %locales, 'Tie::IxHash',
'fr_HT', { name => 'French', country => 'Haiti', },
'ht_HT', { name => 'Haitian Creole', country => 'Haiti', },
'iw_IL', { name => 'Hebrew', country => 'Israel', rtl=>1, },
+ 'es_AR', { name => 'Spanish', country => 'Argentina', },
;
$_->{label} = $_->{name} . ' (' . $_->{country} . ')'
-----------------------------------------------------------------------
Summary of changes:
FS/FS/Conf.pm | 4 ++--
FS/FS/L10N/es_ar.pm | 6 ++++++
FS/FS/Locales.pm | 1 +
httemplate/pref/pref.html | 12 +++++++++++-
4 files changed, 20 insertions(+), 3 deletions(-)
create mode 100644 FS/FS/L10N/es_ar.pm
More information about the freeside-commits
mailing list