projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RT# 79353 Update discount graph - include waived setup fees
[freeside.git]
/
FS
/
FS
/
Maketext.pm
diff --git
a/FS/FS/Maketext.pm
b/FS/FS/Maketext.pm
index
c90e573
..
b4a9b81
100644
(file)
--- a/
FS/FS/Maketext.pm
+++ b/
FS/FS/Maketext.pm
@@
-1,6
+1,6
@@
package FS::Maketext;
package FS::Maketext;
-
use base qw( Exporter );
use base qw( Exporter );
+
use FS::CurrentUser;
use FS::Conf;
use FS::L10N;
use FS::CurrentUser;
use FS::Conf;
use FS::L10N;
@@
-10,6
+10,13
@@
our @EXPORT_OK = qw( mt emt js_mt );
our $lh;
our $lh;
+our $locale;
+#ask FS::UID to run this stuff for us later
+FS::UID->install_callback( sub {
+ my $conf = new FS::Conf;
+ $locale = $conf->config('locale');
+});
+
sub mt {
return '' if $_[0] eq '';
$lh ||= lh();
sub mt {
return '' if $_[0] eq '';
$lh ||= lh();
@@
-32,8
+39,8
@@
sub js_mt {
}
sub lh {
}
sub lh {
- my $locale = $FS::CurrentUser::CurrentUser->
option('locale')
- ||
FS::Conf->new->config('locale')
+ my $locale = $FS::CurrentUser::CurrentUser->
locale
+ ||
$locale
|| 'en_US';
$locale =~ s/_/-/g;
FS::L10N->get_handle($locale) || die "Unknown locale $locale";
|| 'en_US';
$locale =~ s/_/-/g;
FS::L10N->get_handle($locale) || die "Unknown locale $locale";