Changeset 5304

Timestamp:

06/18/09 07:05:08 (3 years ago)

Author:

szabgab

Message:

refactoring the mo creating code

File:

• trunk/Padre/dev.pl (modified) (4 diffs)

trunk/Padre/dev.pl

@@ -23 +23 @@
 }
 
-my $msgfmt;
-if ( $^O =~ /(linux|bsd)/ ) {
-    $msgfmt = scalar File::Which::which('msgfmt');
-} elsif ( $^O eq 'MSWin32' ) {
-    eval {
-        require File::Glob::Windows;
-    };
-    if( $@ ) {
-        die("Default glob() will misinterpret spaces in folder names as seperators, install File::Glob::Windows to fix this behavior!");
-    }
-    my $p = "C:/Program Files/GnuWin32/bin/msgfmt.exe";
-    if ( -e $p ) {
-        $msgfmt = $p;
-    } else {
-        $msgfmt = scalar File::Which::which('msgfmt');
-    }
-}
+convert_po_to_mo($FindBin::Bin);
 
-if ( $msgfmt ) {
-    convert_po_to_mo($FindBin::Bin);
-}
 
 my $perl = Probe::Perl->find_perl_interpreter;
@@ -76 +57 @@
         my @plugins = grep { $_ =~ /^Padre-Plugin-/ } readdir $dh;
         foreach my $plugin ( @plugins ) {
-            if( $msgfmt ) {
-                convert_po_to_mo("$dir/$plugin");
-            }
+            convert_po_to_mo("$dir/$plugin");
             push @cmd, "-I$dir/$plugin/lib";
         }
@@ -94 +73 @@
 
 sub convert_po_to_mo {
-    my $path = shift;
+    my $path   = shift;
+    my $msgfmt = get_msgfmt();
+    return if not $msgfmt;
+
     my @mo;
     if ( $^O eq 'MSWin32' ) {
@@ -113 +95 @@
     }
 }
+
+sub get_msgfmt {
+
+    my $msgfmt;
+    if ( $^O =~ /(linux|bsd)/ ) {
+        $msgfmt = scalar File::Which::which('msgfmt');
+    } elsif ( $^O eq 'MSWin32' ) {
+        eval {
+            require File::Glob::Windows;
+        };
+        if( $@ ) {
+            die("Default glob() will misinterpret spaces in folder names as seperators, install File::Glob::Windows to fix this behavior!");
+        }
+        my $p = "C:/Program Files/GnuWin32/bin/msgfmt.exe";
+        if ( -e $p ) {
+            $msgfmt = $p;
+        } else {
+            $msgfmt = scalar File::Which::which('msgfmt');
+        }
+    }
+    
+    return $msgfmt;
+}