Changeset 22349 for trunk/wp-includes/pomo/mo.php

Timestamp:

10/31/2012 10:13:51 PM (13 years ago)

Author:

nbachiyski

Message:

Sync POMO with GlotPress

See ​http://glotpress.trac.wordpress.org/browser/trunk/pomo/

File:

• trunk/wp-includes/pomo/mo.php (modified) (9 diffs)

trunk/wp-includes/pomo/mo.php

@@ -3 +3 @@
  * Class for working with MO files
  *
- * @version $Id: mo.php 602 2011-01-30 12:43:29Z nbachiyski $
+ * @version $Id: mo.php 718 2012-10-31 00:32:02Z nbachiyski $
  * @package pomo
  * @subpackage mo
@@ -35 +35 @@
         return $res;
     }
-    
+
     function export() {
         $tmp_fh = fopen("php://temp", 'r+');
@@ -43 +43 @@
         return stream_get_contents( $tmp_fh );
     }
-    
+
+    function is_entry_good_for_export( $entry ) {
+        if ( empty( $entry->translations ) ) {
+            return false;
+        }
+
+        if ( !array_filter( $entry->translations ) ) {
+            return false;
+        }
+
+        return true;
+    }
+
     function export_to_file_handle($fh) {
-        $entries = array_filter($this->entries, create_function('$e', 'return !empty($e->translations);'));
+        $entries = array_filter( $this->entries, array( $this, 'is_entry_good_for_export' ) );
         ksort($entries);
         $magic = 0x950412de;
@@ -58 +70 @@
             $translations_lenghts_addr, $size_of_hash, $hash_addr));
         fseek($fh, $originals_lenghts_addr);
-        
+
         // headers' msgid is an empty string
         fwrite($fh, pack('VV', 0, $current_addr));
@@ -70 +82 @@
             $current_addr += $length + 1; // account for the NULL byte after
         }
-        
+
         $exported_headers = $this->export_headers();
         fwrite($fh, pack('VV', strlen($exported_headers), $current_addr));
         $current_addr += strlen($exported_headers) + 1;
         $translations_table = $exported_headers . chr(0);
-        
+
         foreach($entries as $entry) {
             $translations_table .= $this->export_translations($entry) . chr(0);
@@ -82 +94 @@
             $current_addr += $length + 1;
         }
-        
+
         fwrite($fh, $originals_table);
         fwrite($fh, $translations_table);
         return true;
     }
-    
+
     function export_original($entry) {
         //TODO: warnings for control characters
@@ -95 +107 @@
         return $exported;
     }
-    
+
     function export_translations($entry) {
         //TODO: warnings for control characters
         return implode(chr(0), $entry->translations);
     }
-    
+
     function export_headers() {
         $exported = '';
@@ -196 +208 @@
 
             if ('' === $original) {
-                $headers = $this->make_headers($translation);
-                $this->set_headers($headers);
+                $this->set_headers($this->make_headers($translation));
             } else {
                 $entry = &$this->make_entry($original, $translation);
@@ -209 +220 @@
      * Build a Translation_Entry from original string and translation strings,
      * found in a MO file
-     * 
+     *
      * @static
      * @param string $original original string to translate from MO file. Might contain