[Jifty-commit] r3046 - in jifty/trunk: lib/Jifty
jifty-commit at lists.jifty.org
jifty-commit at lists.jifty.org
Thu Mar 22 21:10:32 EDT 2007
Author: jesse
Date: Thu Mar 22 21:10:32 2007
New Revision: 3046
Modified:
jifty/trunk/ (props changed)
jifty/trunk/lib/Jifty/I18N.pm
jifty/trunk/lib/Jifty/Plugin.pm
Log:
r53788 at pinglin: jesse | 2007-03-22 21:09:27 -0400
* Refactor the I18N plugin stuff to not fail tests.
Modified: jifty/trunk/lib/Jifty/I18N.pm
==============================================================================
--- jifty/trunk/lib/Jifty/I18N.pm (original)
+++ jifty/trunk/lib/Jifty/I18N.pm Thu Mar 22 21:10:32 2007
@@ -6,7 +6,7 @@
use Locale::Maketext::Lexicon ();
use Email::MIME::ContentType;
use Encode::Guess qw(iso-8859-1);
-use File::ShareDir ':ALL';
+use File::ShareDir 'module_dir';
use Jifty::Util;
=head1 NAME
@@ -115,10 +115,9 @@
@ret = map { Jifty::Util->absolute_path($_) } @ret;
foreach my $plugin (Jifty->plugins) {
- local $@;
- my $dir = eval { module_dir(ref($plugin)); };
- next unless $dir;
- push @ret, $dir . '/po';
+ my $dir = $plugin->po_root;
+ next unless ($dir and -d $dir and -r $dir );
+ push @ret, $dir ;
}
return ( map { $_ . '/*.po' } @ret );
@@ -142,15 +141,16 @@
=cut
-my $last_modified = '';
+my $LAST_MODIFED = '';
sub refresh {
my $modified = join(
',',
+ # sort map { $_ => -M $_ } map { glob("$_/*.po") } ( Jifty->config->framework('L10N')->{'PoDir'}, Jifty->config->framework('L10N')->{'DefaultPoDir'}
sort map { $_ => -M $_ } map { glob($_) } _get_file_patterns()
);
- if ($modified ne $last_modified) {
+ if ($modified ne $LAST_MODIFED) {
Jifty::I18N->new;
- $last_modified = $modified;
+ $LAST_MODIFED = $modified;
}
}
Modified: jifty/trunk/lib/Jifty/Plugin.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Plugin.pm (original)
+++ jifty/trunk/lib/Jifty/Plugin.pm Thu Mar 22 21:10:32 2007
@@ -123,6 +123,18 @@
return $dir."/web/templates";
}
+=head2 po_root
+
+Returns the plugin's message catalog directory. Returns undef if it doesn't exist.
+
+=cut
+
+sub po_root {
+ my $self = shift;
+ my $dir = $self->_calculate_share();
+ return unless $dir;
+ return $dir."/po";
+}
=head2 template_class
More information about the Jifty-commit
mailing list