Changeset 30032 for lang/perl/DateTimeX-Lite

Timestamp:

02/14/09 11:51:46 (4 years ago)

Author:

daisuke

Message:

mo locale fixes (still need to tweak)

Location:

lang/perl/DateTimeX-Lite/trunk

Files:

• lib/DateTimeX/Lite/Locale.pm (modified) (2 diffs)
• t/locale/01basic.t (modified) (5 diffs)
• tools/lib/DateTimeX/Lite/Tool/Locale/Generator.pm (modified) (4 diffs)
• tools/lib/DateTimeX/Lite/Tool/Locale/LDML.pm (modified) (2 diffs)

lang/perl/DateTimeX-Lite/trunk/lib/DateTimeX/Lite/Locale.pm

@@ -82 +82 @@
 
         no strict 'refs';
-        *{$meth_name} = sub { $_[0]->{$field} };
-    }
+        *{$meth_name} = sub { $_[0]->{$field} } }
 }
 
@@ -92 +91 @@
     # By making the default format lengths part of the object's hash
     # key, it allows them to be settable.
-    return bless { @_,
+    my $self = bless { @_,
         default_date_format_length => 'medium',
         default_time_format_length => 'medium',
     }, $class;
+
+    $self->{native_language} = $self->{en_language}
+        unless exists $self->{native_language};
+    
+    my @en_pieces;
+    my @native_pieces;
+    foreach my $p ( qw( language script territory variant ) )
+    {
+        push @en_pieces, $self->{"en_$p"} if exists $self->{"en_$p"};
+        push @native_pieces, $self->{"native_$p"} if exists $self->{"native_$p"};
+    }
+
+    $self->{en_complete_name} = join ' ', @en_pieces;
+    $self->{native_complete_name} = join ' ', @native_pieces;
+
+    return $self;
 }
 

lang/perl/DateTimeX-Lite/trunk/t/locale/01basic.t

@@ -13 +13 @@
     $f =~ s/\.dat$//;
     $f
-} sort <lib/DateTime/Lite/Locale/*.dat>;
+} sort <lib/DateTimeX/Lite/Locale/*.dat>;
 # my %locale_names = map { $_ => 1 } 
 my %locale_ids   = map { $_ => 1 } @locale_ids;
@@ -65 +65 @@
         ok( $locale_ids{ $locale->id() }, "'$locale_id':  Has a valid locale id" );
 
-        TODO: {
-            local $TODO = "unimplemented";
         ok( length $locale->name(), "'$locale_id':  Has a locale name" );
         ok( length $locale->native_name(),
             "'$locale_id':  Has a native locale name" );
-        }
 
         # Each iteration runs one test if DateTime.pm is not available or
@@ -474 +471 @@
     for my $k ( sort keys %tests )
     {
+        TODO: {
         my $desc = "$k for " . $locale->id();
+
+        if ($k eq 'name' || $k eq 'language') {
+            todo_skip("$k unimplemented", 1);
+        }
+
         if ( ref $tests{$k} )
         {
@@ -483 +486 @@
             is( $locale->$k(), $tests{$k}, $desc );
         }
+        }
     }
 }
@@ -494 +498 @@
     {
         is( $locale->format_for($name), $formats{$name},
-            "Format for $name with " . $locale->id() );
+            "Format for $name with " . $locale->id() ) or
+note( "got -> " . $locale->format_for($name) . ", expected: $formats{$name}");
     }
 

lang/perl/DateTimeX-Lite/trunk/tools/lib/DateTimeX/Lite/Tool/Locale/Generator.pm

@@ -2 +2 @@
 
 package DateTimeX::Lite::Tool::Locale::Generator;
+use utf8;
 use Moose;
 use Moose::Util::TypeConstraints;
@@ -134 +135 @@
     my $fh = $dat_file->openw()
         or die "Cannot write to $dat_file: $!";
-    $fh->binmode(':utf8');
+    $fh->binmode(':raw');
 
     print $fh <<EOF or die "could not write to $dat_file: $!";
@@ -150 +151 @@
 #
 ###########################################################################
+use utf8;
 EOF
 
     my $data = $self->generate_data($ldml->id);
 
-    print $fh Dumper($data);
+    local $Data::Dumper::Sortkeys = 1;
+    local $Data::Dumper::Indent = 1;
+    print $fh Data::Dumper::Dumper($data);
     close($fh);
 }
@@ -213 +217 @@
     }
 
-    foreach my $k qw(
-en_language
-en_script
-en_territory
-en_variant
-native_language
-native_script
-native_territory
-native_variant
-    ) {
+    foreach my $k qw( en_language en_script en_territory en_variant native_language native_script native_territory native_variant) {
         my $v = $ldml->$k();
         if (defined $v) {

lang/perl/DateTimeX-Lite/trunk/tools/lib/DateTimeX/Lite/Tool/Locale/LDML.pm

@@ -350 +350 @@
                   {
                       my $native_val = $ldml->_find_one_node_text($path);
-
                       return $native_val if defined $native_val;
                   }
@@ -407 +406 @@
         my $class = shift;
         my $file  = shift;
+
+print "Parseing $file\n===\n";
 
         my $doc = $Parser->parse_file( $file->stringify() );