X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FSetup.pm;h=3725115d6a5737eb68e16ec26cd77262d59b5646;hb=b79a8cb932946c849328a3c117c35821d9d21e66;hp=29ca9a8723dd9437c3b7938aab526d23ea39cd59;hpb=2482fb7ace7c113044ad4b3497bb9afaf422a699;p=freeside.git

diff --git a/FS/FS/Setup.pm b/FS/FS/Setup.pm
index 29ca9a872..3725115d6 100644
--- a/FS/FS/Setup.pm
+++ b/FS/FS/Setup.pm
@@ -53,6 +53,8 @@ sub create_initial_data {
   populate_access();
 
   populate_msgcat();
+
+  populate_numbering();
   
   if ( $oldAutoCommit ) {
     dbh->commit or die dbh->errstr;
@@ -60,6 +62,11 @@ sub create_initial_data {
 
 }
 
+sub populate_numbering {
+  eval "use FS::lata_Data;"; # this automatically populates the lata table, if unpopulated
+  eval "use FS::msa_Data;"; # this automatically populates the msa table, if unpopulated
+}
+
 sub populate_locales {
 
   use Locale::Country;
@@ -96,7 +103,7 @@ sub populate_addl_locales {
 
 sub _add_country {
 
-  use Locale::SubCountry;
+  use Locale::SubCountry 1.42;
 
   my( $country ) = shift;
 
@@ -406,7 +413,7 @@ sub populate_msgcat {
     die $error if $error;
   }
 
-  my %messages = msgcat_messages();
+  my %messages = FS::msgcat::_legacy_messages();
 
   foreach my $msgcode ( keys %messages ) {
     foreach my $locale ( keys %{$messages{$msgcode}} ) {
@@ -422,122 +429,6 @@ sub populate_msgcat {
 
 }
 
-sub msgcat_messages {
-
-  #  'msgcode' => {
-  #    'en_US' => 'Message',
-  #  },
-
-  (
-
-    'passwords_dont_match' => {
-      'en_US' => "Passwords don't match",
-    },
-
-    'invalid_card' => {
-      'en_US' => 'Invalid credit card number',
-    },
-
-    'unknown_card_type' => {
-      'en_US' => 'Unknown card type',
-    },
-
-    'not_a' => {
-      'en_US' => 'Not a ',
-    },
-
-    'empty_password' => {
-      'en_US' => 'Empty password',
-    },
-
-    'no_access_number_selected' => {
-      'en_US' => 'No access number selected',
-    },
-
-    'illegal_text' => {
-      'en_US' => 'Illegal (text)',
-      #'en_US' => 'Only letters, numbers, spaces, and the following punctuation symbols are permitted: ! @ # $ % & ( ) - + ; : \' " , . ? / in field',
-    },
-
-    'illegal_or_empty_text' => {
-      'en_US' => 'Illegal or empty (text)',
-      #'en_US' => 'Only letters, numbers, spaces, and the following punctuation symbols are permitted: ! @ # $ % & ( ) - + ; : \' " , . ? / in required field',
-    },
-
-    'illegal_username' => {
-      'en_US' => 'Illegal username',
-    },
-
-    'illegal_password' => {
-      'en_US' => 'Illegal password (',
-    },
-
-    'illegal_password_characters' => {
-      'en_US' => ' characters)',
-    },
-
-    'username_in_use' => {
-      'en_US' => 'Username in use',
-    },
-
-    'phonenum_in_use' => {
-      'en_US' => 'Phone number in use',
-    },
-
-    'illegal_email_invoice_address' => {
-      'en_US' => 'Illegal email invoice address',
-    },
-
-    'illegal_name' => {
-      'en_US' => 'Illegal (name)',
-      #'en_US' => 'Only letters, numbers, spaces and the following punctuation symbols are permitted: , . - \' in field',
-    },
-
-    'illegal_phone' => {
-      'en_US' => 'Illegal (phone)',
-      #'en_US' => '',
-    },
-
-    'illegal_zip' => {
-      'en_US' => 'Illegal (zip)',
-      #'en_US' => '',
-    },
-
-    'expired_card' => {
-      'en_US' => 'Expired card',
-    },
-
-    'daytime' => {
-      'en_US' => 'Day Phone',
-    },
-
-    'night' => {
-      'en_US' => 'Night Phone',
-    },
-
-    'svc_external-id' => {
-      'en_US' => 'External ID',
-    },
-
-    'svc_external-title' => {
-      'en_US' => 'Title',
-    },
-
-    'stateid' => {
-      'en_US' => 'Driver\'s License',
-    },
-
-    'stateid_state' => {
-      'en_US' => 'Driver\'s License State',
-    },
-
-    'invalid_domain' => {
-      'en_US' => 'Invalid domain',
-    },
-
-  );
-}
-
 =back
 
 =head1 BUGS