Changeset 5618

Timestamp:

06/26/09 17:28:08 (3 years ago)

Author:

ryan52

Message:

make the interface a bit nicer

Location:

trunk/Locale-Msgfmt

Files:

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

trunk/Locale-Msgfmt/Changes

@@ -1 +1 @@
 Revision history for Locale-Msgfmt
+
+0.07    Jun 26, 2009
+        make the interface a bit nicer
 
 0.06    Jun 26, 2009

trunk/Locale-Msgfmt/bin/msgfmt.pl

@@ -10 +10 @@
 GetOptions("output-file|o=s" => \$opt_o, "use-fuzzy|f" => \$opt_f);
 my $in = shift;
-if(!(defined($in) && defined($opt_o))) {
-  print "usage: $0 [-f] -o output.mo input.po\n";
-  exit(1);
-}
 
 msgfmt({in => $in, out => $opt_o, fuzzy => $opt_f});

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

@@ -17 +17 @@
 sub msgfmt {
   my $hash = shift;
+  if(!defined($hash)) {
+    die("error: must give input");
+  }
+  if(!(ref($hash) eq "HASH")) {
+    $hash = {in => $hash};
+  }
+  if(!defined($hash->{in}) or !length($hash->{in})) {
+    die("error: must give an input file");
+  }
+  if(! -e $hash->{in}) {
+    die("error: input does not exist");
+  }
+  if(-d $hash->{in}) {
+    return _msgfmt_dir($hash);
+  } else {
+    return _msgfmt($hash);
+  }
+}
+
+sub msgfmt_dir {
+  return msgfmt(@_);
+}
+
+sub _msgfmt {
+  my $hash = shift;
+  if(! defined($hash->{in})) {
+    die("error: must give an input file");
+  }
   if(! -f $hash->{in}) {
-    print "error: input file does not exist\n";
-    exit(1);
+    die("error: input file does not exist");
+  }
+  if(! defined($hash->{out})) {
+    if($hash->{in} =~ /\.po$/) {
+      $hash->{out} = $hash->{in};
+      $hash->{out} =~ s/po$/mo/;
+    } else {
+      die("error: must give an output file");
+    }
   }
   my $mo = Locale::Msgfmt::mo->new();
@@ -29 +64 @@
 }
 
-sub msgfmt_dir {
+sub _msgfmt_dir {
   my $hash = shift;
   if(! -d $hash->{in}) {
-    print "error: input directory does not exist\n";
-    exit(1);
+    die("error: input directory does not exist");
   }
   if(! defined($hash->{out})) {
@@ -57 +91 @@
     $newhash{in} = $_;
     $newhash{out} = $files{$_};
-    msgfmt(\%newhash);
+    _msgfmt(\%newhash);
   }
 }
@@ -75 +109 @@
 
     msgfmt({in => "po/fr.po", out => "po/fr.mo"});
-    msgfmt_dir({in => "po/"});
+    msgfmt({in => "po/fr.po", out => "po/fr.mo", fuzzy => 1});
+    msgfmt("po/");
+    msgfmt({in => "po/", out => "output/"});
+    msgfmt("po/fr.po");
+    msgfmt({in => "po/fr.po", fuzzy => 1});
 
 =head1 COPYRIGHT & LICENSE