X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FLocales.pm;h=2ba822a921741c8f59b167e94b40ac378fd32848;hb=8e67cf9e85e6fe18f501f892db2abd37725bb0bd;hp=10bf72ac30222ddccee5c66c8c28477dcdbf937a;hpb=aa663c2a4134e217d3eaa0f908fe560c6bd0f4a6;p=freeside.git

diff --git a/FS/FS/Locales.pm b/FS/FS/Locales.pm
index 10bf72ac3..2ba822a92 100644
--- a/FS/FS/Locales.pm
+++ b/FS/FS/Locales.pm
@@ -29,14 +29,24 @@ Returns a list of the available locales.
 
 tie our %locales, 'Tie::IxHash',
   'en_US', { name => 'English',        country => 'United States', },
+  'en_AU', { name => 'English',        country => 'Australia', },
   'en_CA', { name => 'English',        country => 'Canada', },
+  'es_ES', { name => 'Spanish',        country => 'Spain', },
+  'es_CU', { name => 'Spanish',        country => 'Cuba', },
+  'es_MX', { name => 'Spanish',        country => 'Mexico', },
+  'es_PA', { name => 'Spanish',        country => 'Panama', },
+  'es_US', { name => 'Spanish',        country => 'United States', },
   'fr_CA', { name => 'French',         country => 'Canada', },
   'fr_FR', { name => 'French',         country => 'France', },
   '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} . ')'
+  foreach values %locales;
+
 sub locales {
   keys %locales;
 }
@@ -49,7 +59,13 @@ Returns a hash of information about a locale.
 
 sub locale_info {
   my($class, $locale) = @_;
-  %{ $locales{$locale} };
+  if (!$locale) {
+    return ();
+  } elsif (exists $locales{$locale}) {
+    return %{ $locales{$locale} };
+  } else {
+    die "unsupported locale '$locale'\n";
+  }
 }
 
 =item description LOCALE