projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
better scalability for token checks, RT#71513
[freeside.git]
/
FS
/
FS
/
Msgcat.pm
diff --git
a/FS/FS/Msgcat.pm
b/FS/FS/Msgcat.pm
index
2406e8d
..
e1bde8b
100644
(file)
--- a/
FS/FS/Msgcat.pm
+++ b/
FS/FS/Msgcat.pm
@@
-1,7
+1,7
@@
package FS::Msgcat;
use strict;
package FS::Msgcat;
use strict;
-use vars qw( @ISA @EXPORT_OK $conf $def_locale $debug );
+use vars qw( @ISA @EXPORT_OK $conf $def_locale $debug
@translate_auto_insert
);
use Exporter;
use FS::UID;
#use FS::Record qw( qsearchs ); # wtf? won't import...
use Exporter;
use FS::UID;
#use FS::Record qw( qsearchs ); # wtf? won't import...
@@
-17,7
+17,8
@@
FS::UID->install_callback( sub {
die $@ if $@;
$conf = new FS::Conf;
$def_locale = $conf->config('locale') || 'en_US';
die $@ if $@;
$conf = new FS::Conf;
$def_locale = $conf->config('locale') || 'en_US';
- $debug = $conf->exists('show-msgcat-codes')
+ $debug = $conf->exists('show-msgcat-codes');
+ @translate_auto_insert = $conf->config('translate-auto-insert');
});
=head1 NAME
});
=head1 NAME
@@
-61,7
+62,7
@@
sub _gettext {
return '' unless defined($msgcode) && length($msgcode) > 0;
my $locale = (@_ && shift)
return '' unless defined($msgcode) && length($msgcode) > 0;
my $locale = (@_ && shift)
- || $FS::CurrentUser::CurrentUser->
option('locale')
+ || $FS::CurrentUser::CurrentUser->
locale
|| $def_locale;
return $cache{$locale}->{$msgcode} if exists $cache{$locale}->{$msgcode};
|| $def_locale;
return $cache{$locale}->{$msgcode} if exists $cache{$locale}->{$msgcode};
@@
-77,7
+78,6
@@
sub _gettext {
unless $locale eq 'en_US';
$cache{$locale}->{$msgcode} = $msgcode;
unless $locale eq 'en_US';
$cache{$locale}->{$msgcode} = $msgcode;
- my @translate_auto_insert = $conf->config('translate-auto-insert');
if ( $locale ne 'en_US' && grep { $_ eq $locale } @translate_auto_insert ) {
# :(
if ( $locale ne 'en_US' && grep { $_ eq $locale } @translate_auto_insert ) {
# :(
@@
-87,8
+87,8
@@
sub _gettext {
});
warn "WARNING: auto-inserting message for msgcode $msgcode in locale $locale";
$newmsgcat->insert;
});
warn "WARNING: auto-inserting message for msgcode $msgcode in locale $locale";
$newmsgcat->insert;
- return $msgcode; # or maybe this should be below the next bracket?
}
}
+ return $msgcode;
}
}
}
}