projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
93519f9
)
internationalization/localization, RT12515
author
levinse
<levinse>
Wed, 18 May 2011 00:33:34 +0000
(
00:33
+0000)
committer
levinse
<levinse>
Wed, 18 May 2011 00:33:34 +0000
(
00:33
+0000)
FS/FS/Maketext.pm
patch
|
blob
|
history
FS/FS/Mason.pm
patch
|
blob
|
history
diff --git
a/FS/FS/Maketext.pm
b/FS/FS/Maketext.pm
index
319fb1d
..
965c999
100644
(file)
--- 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 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;
our $lh;
@@
-14,6
+15,11
@@
sub mt {
$lh->maketext(@_);
}
$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')
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
6e3d7c9
..
f97db54
100644
(file)
--- 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::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;
use FS::agent;
use FS::agent_type;