From: levinse <levinse>
Date: Wed, 18 May 2011 00:33:34 +0000 (+0000)
Subject: internationalization/localization, RT12515
X-Git-Tag: freeside_2_3_0~245
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=781f1fd28bb3dbe75fd24c627792618409da7143

internationalization/localization, RT12515
---

diff --git a/FS/FS/Maketext.pm b/FS/FS/Maketext.pm
index 319fb1d37..965c9990c 100644
--- a/FS/FS/Maketext.pm
+++ b/FS/FS/Maketext.pm
@@ -4,8 +4,9 @@ use base qw( Exporter );
 use FS::CurrentUser;
 use FS::Conf;
 use FS::L10N;
+use HTML::Entities qw( encode_entities );
 
-our @EXPORT_OK = qw( mt );
+our @EXPORT_OK = qw( mt emt );
 
 our $lh;
 
@@ -14,6 +15,11 @@ sub mt {
   $lh->maketext(@_);
 }
 
+# HTML-escaped version of mt()
+sub emt {
+    encode_entities(mt(@_));
+}
+
 sub lh {
   my $locale =  $FS::CurrentUser::CurrentUser->option('locale')
              || FS::Conf->new->config('locale')
diff --git a/FS/FS/Mason.pm b/FS/FS/Mason.pm
index 6e3d7c9a0..f97db5421 100644
--- a/FS/FS/Mason.pm
+++ b/FS/FS/Mason.pm
@@ -140,7 +140,7 @@ if ( -e $addl_handler_use_file ) {
   use FS::NetworkMonitoringSystem;
   use FS::Tron qw( tron_lint );
   use FS::Locales;
-  use FS::Maketext qw( mt );
+  use FS::Maketext qw( mt emt );
 
   use FS::agent;
   use FS::agent_type;