Changeset 8

Show
Ignore:
Timestamp:
04/06/05 19:13:02 (3 years ago)
Author:
ogawa
Message:

Add pragma warnings 'redefine' to avoid bothering error_logs

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • I18N-encode/trunk/I18N-encode.pm

    r1 r8  
    1 # MT::I18N (encode version) by Hirotaka Ogawa (http://as-is.net/blog/) 
     1# MT::I18N for Encode.pm 
    22# 
    3 # Release 0.03 (Aug 17, 2004) 
     3# Release 0.04 (Mar 26, 2005) 
    44# 
    55# This software is provided as-is. You may use it for commercial or  
    66# personal use. If you distribute it, please keep this notice intact. 
    77# 
    8 # Copyright (c) 2004 Hirotaka Ogawa 
     8# Copyright (c) 2004,2005 Hirotaka Ogawa 
    99 
    1010package MT::I18N; 
    …… 
    1212use strict; 
    1313use MT::ConfigMgr; 
    14 use Encode qw/from_to encode decode resolve_alias/; 
     14use MT::Util qw(remove_html); 
     15use Encode qw/encode decode resolve_alias/; 
    1516use Encode::Guess qw/euc-jp shiftjis 7bit-jis/; 
    16 use MT::Util qw(remove_html); 
    1717 
     18no warnings 'redefine'; 
    1819sub guess_encoding { 
    1920    my ($text) = @_; 
    2021    my $enc = Encode::Guess::guess_encoding($text); 
    21     if (ref $enc) { 
    22       return $enc->name; 
    23     } elsif ($enc) { 
    24       my %code = map { ($_, 1) } split / or /, $enc; 
    25       my ($euc,$sjis,$utf8) = (0,0,0); 
     22    return $enc->name if ref $enc; 
     23    if ($enc) { 
     24        my %code = map { ($_, 1) } split / or /, $enc; 
     25        my ($euc,$sjis,$utf8) = (0,0,0); 
    2626 
    27       $utf8 = length(decode('utf8', $text)) if $code{'utf8'}; 
    28       return 'utf8' if $utf8; 
     27       $utf8 = length(decode('utf8', $text)) if $code{'utf8'}; 
     28       return 'utf8' if $utf8; 
    2929 
    30       $sjis = length(decode('shiftjis', $text)) if $code{'shiftjis'}; 
    31       $euc = length(decode('euc-jp', $text)) if $code{'euc-jp'}; 
    32       return 'shiftjis' if $sjis > $euc; 
    33       return 'euc-jp' if $euc; 
     30       $sjis = length(decode('shiftjis', $text)) if $code{'shiftjis'}; 
     31       $euc = length(decode('euc-jp', $text)) if $code{'euc-jp'}; 
     32       return 'shiftjis' if $sjis > $euc; 
     33       return 'euc-jp' if $euc; 
    3434    } 
    3535    $enc = MT::ConfigMgr->instance->PublishCharset || 'utf8'; 
    3636    return $enc; 
    3737} 
     38use warnings 'redefine'; 
    3839 
    3940sub encode_text { 
    4041    my ($text, $from, $to) = @_; 
    4142    if (!$from) { 
    42         $from = MT::I18N::guess_encoding($text); 
     43        $from = guess_encoding($text); 
    4344    } 
    4445    if (!$to) { 
    …… 
    5354sub substr_text { 
    5455    my ($text, $startpos, $length) = @_; 
    55     my $enc = MT::I18N::guess_encoding($text); 
     56    my $enc = guess_encoding($text); 
    5657    my $decoded = decode($enc, $text); 
    5758    $decoded = $length ? substr($decoded, $startpos, $length) : substr($decoded, $startpos); 
    …… 
    6162sub wrap_text { 
    6263    my ($text, $cols, $tab_init, $tab_sub) = @_; 
    63     my $enc = MT::I18N::guess_encoding($text); 
     64    my $enc = guess_encoding($text); 
    6465    $cols ||= 72; 
    6566    my $decoded = decode($enc, $text); 
    …… 
    8384sub length_text { 
    8485    my ($text) = @_; 
    85     my $enc = MT::I18N::guess_encoding($text); 
     86    my $enc = guess_encoding($text); 
    8687    return length(decode($enc, $text)); 
    8788} 
    …… 
    9697sub mime_encode { 
    9798    my ($text, $enc) = @_; 
    98     $enc ||= MT::I18N::guess_encoding($text); 
     99    $enc ||= guess_encoding($text); 
    99100    $text = encode("MIME-Header", decode($enc, $text)); 
    100101    $text =~ s/\r?\n/\r\n/g;