Changeset 5608

Timestamp:

06/26/09 11:58:59 (3 years ago)

Author:

ryan52

Message:

add support for ngettext

Location:

trunk/Locale-Msgfmt

Files:

• Changes (modified) (1 diff)
• lib/Locale/Msgfmt/po.pm (modified) (4 diffs)
• t/msgfmt.t (modified) (1 diff)

trunk/Locale-Msgfmt/Changes

@@ -3 +3 @@
 0.06    Jun 26, 2009
         add support for contexts
+        add support for ngettext
 
 0.05    Jun 25, 2009

trunk/Locale-Msgfmt/lib/Locale/Msgfmt/po.pm

@@ -29 +29 @@
   return if !(defined($h{msgid}) && defined($h{msgstr}));
   return if ($h{fuzzy} && !$self->{fuzzy} && length($h{msgid}) > 0);
-  return if($h{msgstr} eq "");
+  my $msgstr = join Locale::Msgfmt::Utils::null(), @{$h{msgstr}};
+  return if($msgstr eq "");
   my $context;
+  my $plural;
   if($h{msgctxt}) {
     $context = cleanup_string($h{msgctxt}) . Locale::Msgfmt::Utils::eot();
@@ -36 +38 @@
     $context = "";
   }
-  $self->{mo}->add_string($context . cleanup_string($h{msgid}), cleanup_string($h{msgstr}));
+  if($h{msgid_plural}) {
+    $plural = Locale::Msgfmt::Utils::null() . cleanup_string($h{msgid_plural});
+  } else {
+    $plural = "";
+  }
+  $self->{mo}->add_string($context . cleanup_string($h{msgid}) . $plural, cleanup_string($msgstr));
 }
 
@@ -48 +55 @@
   while (<F>) {
     s/\r\n/\n/;
-    if(/^(msgid|msgstr|msgctxt) +"(.*)" *$/) {
+    if(/^(msgid(?:|_plural)|msgctxt) +"(.*)" *$/) {
       $type = $1;
       if(defined($h{$type})) {
@@ -56 +63 @@
       $h{$type} = $2;
     }
+    elsif(/^msgstr(?:\[(\d*)\])? +"(.*)" *$/) {
+      $type = "msgstr";
+      if(!$h{$type}) {
+        @{$h{$type}} = ();
+      }
+      push @{$h{$type}}, $2;
+    }
     elsif(/^"(.*)" *$/) {
-      $h{$type} .= $1;
+      if($type eq "msgstr") {
+        @{$h{$type}}[scalar(@{$h{$type}}) - 1] .= $1;
+      } else {
+        $h{$type} .= $1;
+      }
     }
     elsif(/^ *$/) {

trunk/Locale-Msgfmt/t/msgfmt.t

@@ -32 +32 @@
     do_one_test("fr-fr");
     do_one_test("context");
-  TODO: {
-      local $TODO = "not yet implemented";
-      
-      do_one_test("ngettext");
-    }
+    do_one_test("ngettext");
 }