Changeset 29563

Timestamp:

08/21/2014 02:53:16 AM (11 years ago)

Author:

SergeyBiryukov

Message:

Fix strict notices in makepot.

props jdgrimes.
fixes #29254.

Location:

trunk/tools/i18n

Files:

• extract.php (modified) (1 diff)
• pot-ext-meta.php (modified) (2 diffs)

trunk/tools/i18n/extract.php

@@ -29 +29 @@
             if ( '.' == $file_name || '..' == $file_name ) continue;
             if ( preg_match( '/\.php$/', $file_name ) && $this->does_file_name_match( $prefix . $file_name, $excludes, $includes ) ) {
-                $translations->merge_originals_with( $this->extract_from_file( $file_name, $prefix ) );
+                $extracted = $this->extract_from_file( $file_name, $prefix );
+                $translations->merge_originals_with( $extracted );
             }
             if ( is_dir( $file_name ) ) {
-                $translations->merge_originals_with( $this->extract_from_directory( $file_name, $excludes, $includes, $prefix . $file_name . '/' ) );
+                $extracted = $this->extract_from_directory( $file_name, $excludes, $includes, $prefix . $file_name . '/' );
+                $translations->merge_originals_with( $extracted );
             }
         }

trunk/tools/i18n/pot-ext-meta.php

@@ -33 +33 @@
 
     function load_from_file($ext_filename) {
-        $source = MakePOT::get_first_lines($ext_filename);
+        $makepot = new MakePOT;
+        $source = $makepot->get_first_lines($ext_filename);
         $pot = '';
+        $po = new PO;
         foreach($this->headers as $header) {
-            $string = MakePOT::get_addon_header($header, $source);
+            $string = $makepot->get_addon_header($header, $source);
             if (!$string) continue;
             $args = array(
@@ -43 +45 @@
             );
             $entry = new Translation_Entry($args);
-            $pot .= "\n".PO::export_entry($entry)."\n";
+            $pot .= "\n".$po->export_entry($entry)."\n";
         }
         return $pot;