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

Timestamp:

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

Author:

nbachiyski

Message:

Sync POMO with GlotPress

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

File:

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

trunk/wp-includes/pomo/po.php

@@ -3 +3 @@
  * Class for working with PO files
  *
- * @version $Id: po.php 589 2010-12-18 01:40:57Z nbachiyski $
+ * @version $Id: po.php 718 2012-10-31 00:32:02Z nbachiyski $
  * @package pomo
  * @subpackage po
@@ -19 +19 @@
 if ( !class_exists( 'PO' ) ):
 class PO extends Gettext_Translations {
-    
+
     var $comments_before_headers = '';
 
@@ -81 +81 @@
         return fclose($fh);
     }
-    
+
     /**
      * Text to include as a comment before the start of the PO contents
-     * 
+     *
      * Doesn't need to include # in the beginning of lines, these are added automatically
      */
@@ -121 +121 @@
         return $po;
     }
-    
+
     /**
      * Gives back the original string from a PO-formatted string
-     * 
+     *
      * @static
      * @param string $string PO-formatted string
@@ -154 +154 @@
 
     /**
-     * Inserts $with in the beginning of every new line of $string and 
+     * Inserts $with in the beginning of every new line of $string and
      * returns the modified string
      *
@@ -230 +230 @@
         }
         PO::read_line($f, 'clear');
-        return $res !== false;
-    }
-    
+        if ( false === $res ) {
+            return false;
+        }
+        if ( ! $this->headers && ! $this->entries ) {
+            return false;
+        }
+        return true;
+    }
+
     function read_entry($f, $lineno = 0) {
         $entry = new Translation_Entry();
@@ -337 +343 @@
         return array('entry' => $entry, 'lineno' => $lineno);
     }
-    
+
     function read_line($f, $action = 'read') {
         static $last_line = '';
@@ -350 +356 @@
         }
         $line = $use_last_line? $last_line : fgets($f);
+        $line = gp_endswith( $line, "\r\n" )? rtrim( $line, "\r\n" ) . "\n" : $line;
         $last_line = $line;
         $use_last_line = false;
         return $line;
     }
-    
+
     function add_comment_to_entry(&$entry, $po_comment_line) {
         $first_two = substr($po_comment_line, 0, 2);
@@ -368 +375 @@
         }
     }
-    
+
     function trim_quotes($s) {
         if ( substr($s, 0, 1) == '"') $s = substr($s, 1);