X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FMsgcat.pm;h=b6f36bf95d14ed6a2599eab137e4e2f1efec64dd;hb=156e74067cc8723e187dfd9c5aa7ff956306fe01;hp=2406e8db089b8ef3bbc51cb52b687f72be32f186;hpb=9c2dce75b3bf6b222de4257c1ef59c6d407ba3b1;p=freeside.git

diff --git a/FS/FS/Msgcat.pm b/FS/FS/Msgcat.pm
index 2406e8db0..b6f36bf95 100644
--- a/FS/FS/Msgcat.pm
+++ b/FS/FS/Msgcat.pm
@@ -61,7 +61,7 @@ sub _gettext {
   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};
@@ -87,8 +87,8 @@ sub _gettext {
                                        });
         warn "WARNING: auto-inserting message for msgcode $msgcode in locale $locale";
         $newmsgcat->insert;
-        return $msgcode; # or maybe this should be below the next bracket?
     }
+    return $msgcode;
   }
 
 }