[Jifty-commit] r854 - in jifty/trunk: lib/Jifty/Script

[jifty-commit at lists.jifty.org]

Author: autrijus
Date: Wed Apr 12 23:47:07 2006
New Revision: 854

Modified:
   jifty/trunk/Makefile.PL
   jifty/trunk/lib/Jifty/Script/Po.pm

Log:
* Massively improved Locale::Maketext::Extract's API for Jifty's
  needs, so up the deps again to LME 0.20 / LML 0.60 to take
  advantage of the new API.

Modified: jifty/trunk/Makefile.PL
==============================================================================
--- jifty/trunk/Makefile.PL	(original)
+++ jifty/trunk/Makefile.PL	Wed Apr 12 23:47:07 2006
@@ -34,8 +34,8 @@
 requires('Hash::Merge');
 requires('Hook::LexWrap');
 requires('Jifty::DBI' => '0.16' );            # Jifty::DBI::Collection Jifty::DBI::Handle Jifty::DBI::Record::Cachable Jifty::DBI::SchemaGenerator
-requires('Locale::Maketext::Extract' => '0.12');
-requires('Locale::Maketext::Lexicon' => '0.58');
+requires('Locale::Maketext::Extract' => '0.20');
+requires('Locale::Maketext::Lexicon' => '0.60');
 requires('Log::Log4perl');
 requires('LWP::UserAgent');
 requires('MIME::Types');

Modified: jifty/trunk/lib/Jifty/Script/Po.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Script/Po.pm	(original)
+++ jifty/trunk/lib/Jifty/Script/Po.pm	Wed Apr 12 23:47:07 2006
@@ -13,7 +13,6 @@
 our $MIME = MIME::Types->new();
 our $LMExtract = Locale::Maketext::Extract->new;
 use constant USE_GETTEXT_STYLE => 1;
-use constant USE_MAKETEXT_STYLE => !USE_GETTEXT_STYLE;
 
 __PACKAGE__->mk_accessors(qw/language/);
 
@@ -102,9 +101,14 @@
     my $translation = shift;
     my $logger =Log::Log4perl->get_logger("main");
     $logger->info( "Updating message catalog '$translation'");
-    $LMExtract->read_po($translation, USE_GETTEXT_STYLE) if ( -f $translation );
+
+    $LMExtract->read_po($translation) if ( -f $translation );
+
+    # Reset previously compiled entries before a new compilation
+    $LMExtract->set_compiled_entries;
     $LMExtract->compile(USE_GETTEXT_STYLE);
-    $LMExtract->write_po($translation, USE_MAKETEXT_STYLE, USE_GETTEXT_STYLE);
+
+    $LMExtract->write_po($translation);
 }