From: Ivan Kohler <ivan@freeside.biz>
Date: Thu, 18 Aug 2016 21:24:41 +0000 (-0700)
Subject: Merge branch 'github/pr/55_reprise'
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=30c9a71ef6f389f1fb70b1551635c9268f3be94c

Merge branch 'github/pr/55_reprise'
---

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index eda0880fc..a391a98b3 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 000000000..0b50ca05a
--- /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 23a95caea..d1f3eed22 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 c6bcf6f66..93c71996c 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>