From 7e427310fba31d3d141ca05c5e251944a87b2a3b Mon Sep 17 00:00:00 2001
From: levinse <levinse>
Date: Thu, 16 Jun 2011 04:25:34 +0000
Subject: [PATCH] L10N/DBI.pm: handle maketext exceptions properly, RT13258

---
 FS/FS/L10N/DBI.pm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/FS/FS/L10N/DBI.pm b/FS/FS/L10N/DBI.pm
index 2f01a6ad3..db387dba6 100644
--- a/FS/FS/L10N/DBI.pm
+++ b/FS/FS/L10N/DBI.pm
@@ -14,8 +14,14 @@ sub maketext {
     $Lexicon{$key} = FS::Msgcat::_gettext( $key, $lang );
   }
 
-  $lh->SUPER::maketext($key, @rest);
+  my $res = eval { $lh->SUPER::maketext($key, @rest) };
+  if ( !$res || $@ ) {
+    my $errmsg = "MT error for '$key'";
+    warn "$errmsg\n";
+    return $errmsg;
+  }
 
+  $res;
 }
 
 1;
-- 
2.11.0