X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Flib%2FRT%2FI18N.pm;h=ac41b2c3c750ea76043a3dfa6c90beca2b41aa75;hb=63a268637b2d51a8766412617724b9436439deb6;hp=c2746f7cb59d742ba1bbc4e247ba516743fecfcd;hpb=ef20b2b6b1feb47ad02b5ff7525f1a0fd11d0fa4;p=freeside.git diff --git a/rt/lib/RT/I18N.pm b/rt/lib/RT/I18N.pm index c2746f7cb..ac41b2c3c 100644 --- a/rt/lib/RT/I18N.pm +++ b/rt/lib/RT/I18N.pm @@ -1,8 +1,8 @@ # BEGIN BPS TAGGED BLOCK {{{ # # COPYRIGHT: -# -# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC +# +# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC # # # (Except where explicitly superseded by other copyright notices) @@ -24,7 +24,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301 or visit their web page on the internet at -# http://www.gnu.org/copyleft/gpl.html. +# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html. # # # CONTRIBUTION SUBMISSION POLICY: @@ -45,6 +45,7 @@ # those contributions and any derivatives thereof. # # END BPS TAGGED BLOCK }}} + =head1 NAME RT::I18N - a base class for localization of RT @@ -86,41 +87,43 @@ our %Lexicon = ( Initializes the lexicons used for localization. -=begin testing - -use_ok (RT::I18N); -ok(RT::I18N->Init); - -=end testing =cut sub Init { require File::Glob; + my @lang = RT->Config->Get('LexiconLanguages'); + @lang = ('*') unless @lang; + + # load default functions + require substr(__FILE__, 0, -3) . '/i_default.pm'; + # Load language-specific functions - foreach my $language ( File::Glob::bsd_glob(substr(__FILE__, 0, -3) . "/*.pm")) { - if ($language =~ /^([-\w\s.\/\\~:]+)$/) { - require $1; + foreach my $file ( File::Glob::bsd_glob(substr(__FILE__, 0, -3) . "/*.pm") ) { + unless ( $file =~ /^([-\w\s\.\/\\~:]+)$/ ) { + warn("$file is tainted. not loading"); + next; } - else { - warn("$language is tainted. not loading"); - } + $file = $1; + + my ($lang) = ($file =~ /([^\\\/]+?)\.pm$/); + next unless grep $_ eq '*' || $_ eq $lang, @lang; + require $file; } - my @lang = @RT::LexiconLanguages; - @lang = ('*') unless @lang; + my %import; + foreach my $l ( @lang ) { + $import{$l} = [ + Gettext => (substr(__FILE__, 0, -3) . "/$l.po"), + Gettext => "$RT::LocalLexiconPath/*/$l.po", + Gettext => "$RT::LocalLexiconPath/$l.po", + ]; + push @{ $import{$l} }, map {(Gettext => "$_/$l.po")} RT->PluginDirs('po'); + } # Acquire all .po files and iterate them into lexicons - Locale::Maketext::Lexicon->import({ - _decode => 1, map { - $_ => [ - Gettext => (substr(__FILE__, 0, -3) . "/$_.po"), - Gettext => "$RT::LocalLexiconPath/*/$_.po", - Gettext => "$RT::LocalLexiconPath/$_.po", - ], - } @lang - }); + Locale::Maketext::Lexicon->import({ _decode => 1, %import }); return 1; } @@ -130,18 +133,6 @@ sub Init { Returns the encoding of the current lexicon, as yanked out of __ContentType's "charset" field. If it can't find anything, it returns 'ISO-8859-1' -=begin testing - -ok(my $chinese = RT::I18N->get_handle('zh_tw')); -ok(UNIVERSAL::can($chinese, 'maketext')); -ok($chinese->maketext('__Content-Type') =~ /utf-8/i, "Found the utf-8 charset for traditional chinese in the string ".$chinese->maketext('__Content-Type')); -ok($chinese->encoding eq 'utf-8', "The encoding is 'utf-8' -".$chinese->encoding); - -ok(my $en = RT::I18N->get_handle('en')); -ok(UNIVERSAL::can($en, 'maketext')); -ok($en->encoding eq 'utf-8', "The encoding ".$en->encoding." is 'utf-8'"); - -=end testing =cut @@ -153,7 +144,7 @@ sub encoding { 'utf-8' } =head2 SetMIMEEntityToUTF8 $entity -An utility method which will try to convert entity body into utf8. +An utility function which will try to convert entity body into utf8. It's now a wrap-up of SetMIMEEntityToEncoding($entity, 'utf-8'). =cut @@ -164,16 +155,37 @@ sub SetMIMEEntityToUTF8 { # }}} +# {{{ IsTextualContentType + +=head2 IsTextualContentType $type + +An utility function that determines whether $type is I, meaning +that it can sensibly be converted to Unicode text. + +Currently, it returns true iff $type matches this regular expression +(case-insensitively): + + ^(?:text/(?:plain|html)|message/rfc822)\b + +# }}} + +=cut + +sub IsTextualContentType { + my $type = shift; + ($type =~ m{^(?:text/(?:plain|html)|message/rfc822)\b}i) ? 1 : 0; +} + # {{{ SetMIMEEntityToEncoding =head2 SetMIMEEntityToEncoding $entity, $encoding -An utility method which will try to convert entity body into specified +An utility function which will try to convert entity body into specified charset encoding (encoded as octets, *not* unicode-strings). It will iterate all the entities in $entity, and try to convert each one into specified charset if whose Content-Type is 'text/plain'. -This method doesn't return anything meaningful. +This function doesn't return anything meaningful. =cut @@ -204,12 +216,10 @@ sub SetMIMEEntityToEncoding { } # If this is a textual entity, we'd need to preserve its original encoding - $head->add( "X-RT-Original-Encoding" => $charset ) - if $head->mime_attr('content-type.charset') or $head->mime_type =~ /^text/; - + $head->replace( "X-RT-Original-Encoding" => $charset ) + if $head->mime_attr('content-type.charset') or IsTextualContentType($head->mime_type); - return unless ( $head->mime_type =~ qr{^(text/plain|message/rfc822)$}i ); - + return unless IsTextualContentType($head->mime_type); my $body = $entity->bodyhandle; @@ -284,7 +294,7 @@ sub DecodeMIMEWordsToEncoding { my $str = shift; my $enc = shift; - @_ = $str =~ m/(.*?)=\?([^?]+)\?([QqBb])\?([^?]+)\?=([^=]*)/gc; + @_ = $str =~ m/(.*?)=\?([^?]+)\?([QqBb])\?([^?]+)\?=([^=]*)/gcs; return ($str) unless (@_); # add everything that hasn't matched to the end of the latest @@ -332,7 +342,11 @@ sub DecodeMIMEWordsToEncoding { # until this is fixed, we must escape any string containing a comma or semicolon # this is only a bandaid - $enc_str = qq{"$enc_str"} if ($enc_str =~ /[,;]/); + # Some _other_ MUAs encode quotes _already_, and double quotes + # confuse us a lot, so only quote it if it isn't quoted + # already. + $enc_str = qq{"$enc_str"} if $enc_str =~ /[,;]/ and $enc_str !~ /^".*"$/; + $str .= $prefix . $enc_str . $trailing; } @@ -386,12 +400,17 @@ use Encode::Guess to try to figure it out the string's encoding. sub _GuessCharset { my $fallback = 'iso-8859-1'; - my $charset; - if ( @RT::EmailInputEncodings and eval { require Encode::Guess; 1 } ) { - Encode::Guess->set_suspects(@RT::EmailInputEncodings); + # if $_[0] is null/empty, we don't guess its encoding + return $fallback unless defined $_[0] && length $_[0]; + + my $charset; + my @encodings = RT->Config->Get('EmailInputEncodings'); + if ( @encodings and eval { require Encode::Guess; 1 } ) { + Encode::Guess->set_suspects( @encodings ); my $decoder = Encode::Guess->guess( $_[0] ); + if ( defined($decoder) ) { if ( ref $decoder ) { $charset = $decoder->name; $RT::Logger->debug("Guessed encoding: $charset"); @@ -401,7 +420,7 @@ sub _GuessCharset { my %matched = map { $_ => 1 } split(/ or /, $1); return 'utf-8' if $matched{'utf8'}; # one and only normalization - foreach my $suspect (@RT::EmailInputEncodings) { + foreach my $suspect (RT->Config->Get('EmailInputEncodings')) { next unless $matched{$suspect}; $RT::Logger->debug("Encode::Guess ambiguous ($decoder); using $suspect"); $charset = $suspect; @@ -411,12 +430,18 @@ sub _GuessCharset { else { $RT::Logger->warning("Encode::Guess failed: $decoder; fallback to $fallback"); } + } + else { + $RT::Logger->warning("Encode::Guess failed: decoder is undefined; fallback to $fallback"); + } } - else { - $RT::Logger->warning("Cannot Encode::Guess; fallback to $fallback"); + elsif ( @encodings && $@ ) { + $RT::Logger->error("You have set EmailInputEncodings, but we couldn't load Encode::Guess: $@"); + } else { + $RT::Logger->warning("No EmailInputEncodings set, fallback to $fallback"); } - return($charset || $fallback); + return ($charset || $fallback); } # }}}