From 0492f42a194282ebf1954664281079b124f1ef7c Mon Sep 17 00:00:00 2001 From: Mark Wells Date: Wed, 29 Jan 2014 18:14:29 -0800 Subject: [PATCH] fix localization cache, #27276 --- FS/FS/L10N/DBI.pm | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/FS/FS/L10N/DBI.pm b/FS/FS/L10N/DBI.pm index db387dba6..dc9231785 100644 --- a/FS/FS/L10N/DBI.pm +++ b/FS/FS/L10N/DBI.pm @@ -3,15 +3,22 @@ use base qw(FS::L10N); use strict; use FS::Msgcat; -our %Lexicon = (); +sub lexicon { + my $lh = shift; + my $class = ref($lh) || $lh; + no strict 'refs'; + \%{ $class . '::Lexicon' }; +} sub maketext { my($lh, $key, @rest) = @_; - unless ( exists $Lexicon{$key} ) { - my $lang = $lh->language_tag; - $lang =~ s/-(\w*)/_\U$1/; - $Lexicon{$key} = FS::Msgcat::_gettext( $key, $lang ); + my $lang = $lh->language_tag; + $lang =~ s/-(\w*)/_\U$1/; + + my $lex = $lh->lexicon; + unless ( exists $lex->{$key} ) { + $lex->{$key} = FS::Msgcat::_gettext( $key, $lang ); } my $res = eval { $lh->SUPER::maketext($key, @rest) }; -- 2.11.0