From: levinse Date: Tue, 14 Jun 2011 18:53:40 +0000 (+0000) Subject: Msgcat.pm: return untranslated strings properly when no translation is found X-Git-Tag: freeside_2_3_0~135 X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=9c2dce75b3bf6b222de4257c1ef59c6d407ba3b1 Msgcat.pm: return untranslated strings properly when no translation is found --- diff --git a/FS/FS/Msgcat.pm b/FS/FS/Msgcat.pm index 242980515..2406e8db0 100644 --- a/FS/FS/Msgcat.pm +++ b/FS/FS/Msgcat.pm @@ -58,6 +58,8 @@ our %cache; sub _gettext { my $msgcode = shift; + return '' unless defined($msgcode) && length($msgcode) > 0; + my $locale = (@_ && shift) || $FS::CurrentUser::CurrentUser->option('locale') || $def_locale; @@ -85,6 +87,7 @@ 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? } }