r66695 - in /branches/upstream/liblocale-maketext-lexicon-perl/current: AUTHORS Changes MANIFEST Makefile.PL lib/Locale/Maketext/Extract.pm lib/Locale/Maketext/Lexicon.pm lib/Locale/Maketext/Lexicon/Msgcat.pm t/61-badcharset.t t/badcharset.po

ansgar at users.alioth.debian.org ansgar at users.alioth.debian.org
Fri Dec 31 11:13:05 UTC 2010


Author: ansgar
Date: Fri Dec 31 11:12:57 2010
New Revision: 66695

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=66695
Log:
[svn-upgrade] new version liblocale-maketext-lexicon-perl (0.84)

Added:
    branches/upstream/liblocale-maketext-lexicon-perl/current/t/61-badcharset.t
    branches/upstream/liblocale-maketext-lexicon-perl/current/t/badcharset.po
Modified:
    branches/upstream/liblocale-maketext-lexicon-perl/current/AUTHORS
    branches/upstream/liblocale-maketext-lexicon-perl/current/Changes
    branches/upstream/liblocale-maketext-lexicon-perl/current/MANIFEST
    branches/upstream/liblocale-maketext-lexicon-perl/current/Makefile.PL
    branches/upstream/liblocale-maketext-lexicon-perl/current/lib/Locale/Maketext/Extract.pm
    branches/upstream/liblocale-maketext-lexicon-perl/current/lib/Locale/Maketext/Lexicon.pm
    branches/upstream/liblocale-maketext-lexicon-perl/current/lib/Locale/Maketext/Lexicon/Msgcat.pm

Modified: branches/upstream/liblocale-maketext-lexicon-perl/current/AUTHORS
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/liblocale-maketext-lexicon-perl/current/AUTHORS?rev=66695&op=diff
==============================================================================
--- branches/upstream/liblocale-maketext-lexicon-perl/current/AUTHORS (original)
+++ branches/upstream/liblocale-maketext-lexicon-perl/current/AUTHORS Fri Dec 31 11:12:57 2010
@@ -18,6 +18,7 @@
 Harmen
 Helmut Lichtenberg
 Hsin-Chan Chien         (HCCHIEN)
+Ivan Bessarabov         (BESSARABV)
 Jesse Vincent           (JESSE)
 Jiing Deng
 Joe McCarty
@@ -34,6 +35,7 @@
 Stephen Quinney         (SJQUINNEY)
 Tatsuhiko Miyagawa      (MIYAGAWA)
 Thierry Vignaud
+Ton Voon                (TONVOON)
 Wei-Hon Chen
 Yann Kerherve           (YANNK)
 Yi Ma Mao               (IMACAT)

Modified: branches/upstream/liblocale-maketext-lexicon-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/liblocale-maketext-lexicon-perl/current/Changes?rev=66695&op=diff
==============================================================================
--- branches/upstream/liblocale-maketext-lexicon-perl/current/Changes (original)
+++ branches/upstream/liblocale-maketext-lexicon-perl/current/Changes Fri Dec 31 11:12:57 2010
@@ -1,3 +1,19 @@
+[Changes for 0.84 - 2010-12-24]
+* Changed the minimum version of Locale::Maketext to 1.17, to avoid error
+  reports from recent Perl versions, which still have an old Locale::Maketext
+
+* Locale::Maketext::Extract
+    - added a fix from Ivan Bessarov to avoid uninit warnings when msgids
+      contain trailing spaces
+
+[Changes for 0.83 - 2010-12-09]
+* Locale::Maketext::Lexicon
+    - remove the local $@ when loading PO files - made it difficult
+      to debug errors when loading PO's
+
+      Thanks to Ton Voon for the patch
+      https://rt.cpan.org/Ticket/Display.html?id=63722
+
 [Changes for 0.82 - 2010-04-12]
 * Locale::Maketext::Extract::Plugin::Base
 * Locale::Maketext::Extract::Plugin::TT2

Modified: branches/upstream/liblocale-maketext-lexicon-perl/current/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/liblocale-maketext-lexicon-perl/current/MANIFEST?rev=66695&op=diff
==============================================================================
--- branches/upstream/liblocale-maketext-lexicon-perl/current/MANIFEST (original)
+++ branches/upstream/liblocale-maketext-lexicon-perl/current/MANIFEST Fri Dec 31 11:12:57 2010
@@ -49,10 +49,12 @@
 t/51-perlextract.t
 t/55-runextract.t
 t/6-gettext.t
+t/61-badcharset.t
 t/7-roundtrip.t
 t/8-plugin-args.t
 t/9-bug-import-for-subclasses.t
 t/91-pod_test.t
+t/badcharset.po
 t/comments.po
 t/gencat.m
 t/lib/Myi18n.pm

Modified: branches/upstream/liblocale-maketext-lexicon-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/liblocale-maketext-lexicon-perl/current/Makefile.PL?rev=66695&op=diff
==============================================================================
--- branches/upstream/liblocale-maketext-lexicon-perl/current/Makefile.PL (original)
+++ branches/upstream/liblocale-maketext-lexicon-perl/current/Makefile.PL Fri Dec 31 11:12:57 2010
@@ -10,7 +10,7 @@
 perl_version '5.005';
 all_from 'lib/Locale/Maketext/Lexicon.pm';
 install_script 'script/xgettext.pl';
-requires 'Locale::Maketext'       => '0.01';
+requires 'Locale::Maketext'       => '1.17';
 recommends 'Template'             => '2.20';
 recommends 'Template::Constants'  => '2.75';
 recommends 'YAML'                 => '0.66';

Modified: branches/upstream/liblocale-maketext-lexicon-perl/current/lib/Locale/Maketext/Extract.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/liblocale-maketext-lexicon-perl/current/lib/Locale/Maketext/Extract.pm?rev=66695&op=diff
==============================================================================
--- branches/upstream/liblocale-maketext-lexicon-perl/current/lib/Locale/Maketext/Extract.pm (original)
+++ branches/upstream/liblocale-maketext-lexicon-perl/current/lib/Locale/Maketext/Extract.pm Fri Dec 31 11:12:57 2010
@@ -1,5 +1,5 @@
 package Locale::Maketext::Extract;
-$Locale::Maketext::Extract::VERSION = '0.37';
+$Locale::Maketext::Extract::VERSION = '0.38';
 
 use strict;
 use Locale::Maketext::Lexicon();
@@ -590,7 +590,10 @@
 =cut
 
 sub msgids    { sort keys %{ $_[0]{lexicon} } }
-sub has_msgid { length $_[0]->msgstr( $_[1] ) }
+sub has_msgid {
+    my $msg_str = $_[0]->msgstr( $_[1] );
+    return defined $msg_str ? length $msg_str : 0;
+}
 
 sub msg_positions {
     my ( $self, $msgid ) = @_;

Modified: branches/upstream/liblocale-maketext-lexicon-perl/current/lib/Locale/Maketext/Lexicon.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/liblocale-maketext-lexicon-perl/current/lib/Locale/Maketext/Lexicon.pm?rev=66695&op=diff
==============================================================================
--- branches/upstream/liblocale-maketext-lexicon-perl/current/lib/Locale/Maketext/Lexicon.pm (original)
+++ branches/upstream/liblocale-maketext-lexicon-perl/current/lib/Locale/Maketext/Lexicon.pm Fri Dec 31 11:12:57 2010
@@ -1,5 +1,5 @@
 package Locale::Maketext::Lexicon;
-$Locale::Maketext::Lexicon::VERSION = '0.82';
+$Locale::Maketext::Lexicon::VERSION = '0.84';
 
 use 5.004;
 use strict;
@@ -304,7 +304,6 @@
                 next;
             }
 
-            local $@;
             my @content
                 = eval { $class->lexicon_get( $src, scalar caller(1), $lang ); };
             next if $@ and $@ =~ /^next\b/;

Modified: branches/upstream/liblocale-maketext-lexicon-perl/current/lib/Locale/Maketext/Lexicon/Msgcat.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/liblocale-maketext-lexicon-perl/current/lib/Locale/Maketext/Lexicon/Msgcat.pm?rev=66695&op=diff
==============================================================================
--- branches/upstream/liblocale-maketext-lexicon-perl/current/lib/Locale/Maketext/Lexicon/Msgcat.pm (original)
+++ branches/upstream/liblocale-maketext-lexicon-perl/current/lib/Locale/Maketext/Lexicon/Msgcat.pm Fri Dec 31 11:12:57 2010
@@ -44,6 +44,7 @@
     # Set up the msgcat handler
     {
         no strict 'refs';
+        no warnings 'once';
         *{Locale::Maketext::msgcat} = \&_msgcat;
     }
 

Added: branches/upstream/liblocale-maketext-lexicon-perl/current/t/61-badcharset.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/liblocale-maketext-lexicon-perl/current/t/61-badcharset.t?rev=66695&op=file
==============================================================================
--- branches/upstream/liblocale-maketext-lexicon-perl/current/t/61-badcharset.t (added)
+++ branches/upstream/liblocale-maketext-lexicon-perl/current/t/61-badcharset.t Fri Dec 31 11:12:57 2010
@@ -1,0 +1,22 @@
+#!/usr/bin/perl -w
+use strict;
+use Test::More tests => 1;
+
+require Locale::Maketext::Lexicon;
+
+package MyApp::I18N::i_default;
+# Need below to fake the loading of the po file
+our %Lexicon = ( _AUTO => 1 );
+
+package main;
+
+eval "
+    package MyApp::I18N;
+    use base 'Locale::Maketext';
+    Locale::Maketext::Lexicon->import({
+        'i-default' => [ 'Gettext' => 't/badcharset.po' ],
+        _decode => 1,
+        _encoding => undef,
+    });
+    ";
+like( $@, qr/Unknown encoding 'CHARSET'/, "Caught bad encoding error" );

Added: branches/upstream/liblocale-maketext-lexicon-perl/current/t/badcharset.po
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/liblocale-maketext-lexicon-perl/current/t/badcharset.po?rev=66695&op=file
==============================================================================
--- branches/upstream/liblocale-maketext-lexicon-perl/current/t/badcharset.po (added)
+++ branches/upstream/liblocale-maketext-lexicon-perl/current/t/badcharset.po Fri Dec 31 11:12:57 2010
@@ -1,0 +1,10 @@
+msgid ""
+msgstr ""
+"Last-Translator: Audrey Tang <cpan at audreyt.org>\n"
+"Language-Team: Chinese <contact at ourinet.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "This is a test"
+msgstr "這是測試"




More information about the Pkg-perl-cvs-commits mailing list