X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2FMsgcat.pm;h=e1bde8b51123f6b14dcb8e414f5ee4956a9cc932;hp=e111f4e8c9b305b272694e0f2e89d9ee2117ab71;hb=dc83512c36dc6bea2585abada4f88d714c600e55;hpb=83053569b3d965924e2e1d4f5b199609ec7c29af

diff --git a/FS/FS/Msgcat.pm b/FS/FS/Msgcat.pm
index e111f4e8c..e1bde8b51 100644
--- a/FS/FS/Msgcat.pm
+++ b/FS/FS/Msgcat.pm
@@ -1,7 +1,7 @@
 package FS::Msgcat;
 
 use strict;
-use vars qw( @ISA @EXPORT_OK $conf $def_locale $debug );
+use vars qw( @ISA @EXPORT_OK $conf $def_locale $debug @translate_auto_insert );
 use Exporter;
 use FS::UID;
 #use FS::Record qw( qsearchs ); # wtf?  won't import...
@@ -17,7 +17,8 @@ FS::UID->install_callback( sub {
   die $@ if $@;
   $conf = new FS::Conf;
   $def_locale = $conf->config('locale') || 'en_US';
-  $debug = $conf->exists('show-msgcat-codes')
+  $debug = $conf->exists('show-msgcat-codes');
+  @translate_auto_insert = $conf->config('translate-auto-insert');
 });
 
 =head1 NAME
@@ -58,8 +59,10 @@ our %cache;
 
 sub _gettext {
   my $msgcode = shift;
+  return '' unless defined($msgcode) && length($msgcode) > 0;
+
   my $locale =  (@_ && shift)
-             || $FS::CurrentUser::CurrentUser->option('locale')
+             || $FS::CurrentUser::CurrentUser->locale
              || $def_locale;
 
   return $cache{$locale}->{$msgcode} if exists $cache{$locale}->{$msgcode};
@@ -74,6 +77,18 @@ sub _gettext {
     warn "WARNING: message for msgcode $msgcode in locale $locale not found"
       unless $locale eq 'en_US';
     $cache{$locale}->{$msgcode} = $msgcode;
+
+    if ( $locale ne 'en_US' && grep { $_ eq $locale } @translate_auto_insert ) {
+
+        # :(
+        my $newmsgcat = new FS::Record('msgcat', { locale     => $locale,
+                                         msgcode    => $msgcode,
+                                         msg        => $msgcode,
+                                       });
+        warn "WARNING: auto-inserting message for msgcode $msgcode in locale $locale";
+        $newmsgcat->insert;
+    }
+    return $msgcode;
   }
 
 }