Changeset 29642

Timestamp:

02/06/09 17:57:54 (4 years ago)

Author:

daisuke

Message:

refactor, add gettext support

Location:

lang/perl/Data-Localize/trunk

Files:

• lib/Data/Localize/Gettext.pm (added)
• lib/Data/Localize/Localizer.pm (modified) (1 diff)
• lib/Data/Localize/Namespace.pm (modified) (5 diffs)
• t/03_gettext.t (added)
• t/lib/Test/Data/Localize/Gettext (added)
• t/lib/Test/Data/Localize/Gettext/ja.po (added)

lang/perl/Data-Localize/trunk/lib/Data/Localize/Localizer.pm

@@ -3 +3 @@
 package Data::Localize::Localizer;
 use Moose::Role;
+use Moose::Util::TypeConstraints;
 
-requires 'localize_for', 'register';
+requires 'register';
+
+has 'style' => (
+    is => 'rw',
+    isa => enum([qw(gettext maketext)]),
+    default => 'gettext',
+);
 
 no Moose::Role;
+no Moose::Util::TypeConstraints;
+
+sub localize_for {
+    my ($self, %args) = @_;
+    my ($lang, $id, $args) = @args{ qw(lang id args) };
+
+    my $lexicon = $self->lexicon_get($lang) or return ();
+    my $value = $lexicon->{ $id };
+    if (&Data::Localize::DEBUG) {
+        print STDERR "[Data::Localize::Localizer]: localize_for - $id -> ",
+            defined($value) ? $value : '(null)', "\n";
+    }
+    return $self->format_string($value, @$args) if $value;
+    return ();
+}
+
+sub format_string {
+    my ($self, $value, @args) = @_;
+    my $style = $self->style;
+    if ($style eq 'gettext') {
+        $value =~ s/%(\d+)/$args[$1 - 1] || ''/ge;
+    } elsif ($style eq 'maketext') {
+        $value =~ s/\[_(\d+)\]/$args[$1 - 1] || ''/ge;
+    }
+    return $value;
+}
 
 1;

lang/perl/Data-Localize/trunk/lib/Data/Localize/Namespace.pm

@@ -3 +3 @@
 package Data::Localize::Namespace;
 use Moose;
-use Moose::Util::TypeConstraints;
 use MooseX::AttributeHelpers;
 use Module::Pluggable::Object;
 
 with 'Data::Localize::Localizer';
-
-has 'style' => (
-    is => 'rw',
-    isa => enum([qw(gettext maketext)]),
-    default => 'gettext',
-);
 
 has 'namespaces' => (
@@ -28 +21 @@
 
 no Moose;
-no Moose::Util::TypeConstraints;
 
 sub register {
@@ -47 +39 @@
 }
 
-sub localize_for {
-    my ($self, %args) = @_;
-    my ($lang, $id, $args) = @args{ qw(lang id args) };
-
-    my $lexicon = $self->lexicon_get($lang) or return ();
-    my $value = $lexicon->{ $id };
-    return $self->format_string($value, @$args) if $value;
-    return ();
-}
-
 our %LOADED;
 sub lexicon_get {
@@ -64 +46 @@
         my $klass = "$namespace\::$lang";
         if (&Data::Localize::DEBUG) {
-            print STDERR "lexicon_get: Trying $klass\n";
+            print STDERR "[Data::Localize::Namespace]: lexicon_get - Trying $klass\n";
         }
 
+        # Catch the very weird case where is_class_loaded() returns true
+        # but the class really hasn't been loaded yet.
+        no strict 'refs';
         if (! $LOADED{$klass}) {
-            if (! Class::MOP::is_class_loaded($klass)) {
+            if (defined %{"$klass\::Lexicon"} && Class::MOP::is_class_loaded($klass)) {
+                if (&Data::Localize::DEBUG) {
+                    print STDERR "[Data::Localize::Namespace]: lexicon_get - class already loaded\n";
+                }
+            } else {
+                if (&Data::Localize::DEBUG) {
+                    print STDERR "[Data::Localize::Namespace]: lexicon_get - loading $klass\n";
+                }
                 eval "require $klass";
                 if ($@) {
@@ -77 +69 @@
                 }
             }
+            if (&Data::Localize::DEBUG) {
+                print STDERR "[Data::Localize::Namespace]: lexicon_get - setting $klass to already loaded\n";
+            }
             $LOADED{$klass}++;
         }
-        {
-            no strict 'refs';
-            return \%{ "$klass\::Lexicon" }
+
+        if (&Data::Localize::DEBUG) {
+            print STDERR "[Data::Localize::Namespace]: returning lexicon from $klass\n";
+            require Data::Dumper;
+            print STDERR Data::Dumper::Dumper(\%{"$klass\::Lexicon"});
         }
+        return \%{ "$klass\::Lexicon" }
     }
     return ();
-}
-
-sub format_string {
-    my ($self, $value, @args) = @_;
-    my $style = $self->style;
-    if ($style eq 'gettext') {
-        $value =~ s/%(\d+)/$args[$1 - 1] || ''/ge;
-    } elsif ($style eq 'maketext') {
-        $value =~ s/\[_(\d+)\]/$args[$1 - 1] || ''/ge;
-    }
-    return $value;
 }