Changeset 35714

Timestamp:

11/20/2015 04:33:12 AM (9 years ago)

Author:

dd32

Message:

Merge the changes to GlotPress's POMO from upstream to WordPress's copy.
Fixes #34748

Location:

trunk/src/wp-includes/pomo

Files:

• entry.php (modified) (3 diffs)
• mo.php (modified) (3 diffs)
• po.php (modified) (11 diffs)
• streams.php (modified) (1 diff)
• translations.php (modified) (1 diff)

trunk/src/wp-includes/pomo/entry.php

@@ -3 +3 @@
  * Contains Translation_Entry class
  *
- * @version $Id: entry.php 718 2012-10-31 00:32:02Z nbachiyski $
+ * @version $Id: entry.php 1157 2015-11-20 04:30:11Z dd32 $
  * @package pomo
  * @subpackage entry
@@ -50 +50 @@
             $this->$varname = $value;
         }
-        if (isset($args['plural'])) $this->is_plural = true;
+        if (isset($args['plural']) && $args['plural']) $this->is_plural = true;
         if (!is_array($this->translations)) $this->translations = array();
         if (!is_array($this->references)) $this->references = array();
@@ -69 +69 @@
      */
     function key() {
-        if (is_null($this->singular)) return false;
+        if ( null === $this->singular || '' === $this->singular ) return false;
 
         // Prepend context and EOT, like in MO files
-        $key = is_null($this->context)? $this->singular : $this->context.chr(4).$this->singular;
+        $key = !$this->context? $this->singular : $this->context.chr(4).$this->singular;
         // Standardize on \n line endings
         $key = str_replace( array( "\r\n", "\r" ), "\n", $key );

trunk/src/wp-includes/pomo/mo.php

@@ -3 +3 @@
  * Class for working with MO files
  *
- * @version $Id: mo.php 718 2012-10-31 00:32:02Z nbachiyski $
+ * @version $Id: mo.php 1157 2015-11-20 04:30:11Z dd32 $
  * @package pomo
  * @subpackage mo
@@ -125 +125 @@
         $exported = $entry->singular;
         if ($entry->is_plural) $exported .= chr(0).$entry->plural;
-        if (!is_null($entry->context)) $exported = $entry->context . chr(4) . $exported;
+        if ($entry->context) $exported = $entry->context . chr(4) . $exported;
         return $exported;
     }
@@ -135 +135 @@
     function export_translations($entry) {
         //TODO: warnings for control characters
-        return implode(chr(0), $entry->translations);
+        return $entry->is_plural ? implode(chr(0), $entry->translations) : $entry->translations[0];
     }
 

trunk/src/wp-includes/pomo/po.php

@@ -3 +3 @@
  * Class for working with PO files
  *
- * @version $Id: po.php 718 2012-10-31 00:32:02Z nbachiyski $
+ * @version $Id: po.php 1158 2015-11-20 04:31:23Z dd32 $
  * @package pomo
  * @subpackage po
@@ -10 +10 @@
 require_once dirname(__FILE__) . '/translations.php';
 
-define('PO_MAX_LINE_LEN', 79);
+if ( ! defined( 'PO_MAX_LINE_LEN' ) ) {
+    define('PO_MAX_LINE_LEN', 79);
+}
 
 ini_set('auto_detect_line_endings', 1);
@@ -98 +100 @@
      * @return string the poified string
      */
-    function poify($string) {
+    public static function poify($string) {
         $quote = '"';
         $slash = '\\';
@@ -129 +131 @@
      * @return string enascaped string
      */
-    function unpoify($string) {
-        $escapes = array('t' => "\t", 'n' => "\n", '\\' => '\\');
+    public static function unpoify($string) {
+        $escapes = array('t' => "\t", 'n' => "\n", 'r' => "\r", '\\' => '\\');
         $lines = array_map('trim', explode("\n", $string));
         $lines = array_map(array('PO', 'trim_quotes'), $lines);
@@ -150 +152 @@
             }
         }
+
+        // Standardise the line endings on imported content, technically PO files shouldn't contain \r
+        $unpoified = str_replace( array( "\r\n", "\r" ), "\n", $unpoified );
+
         return $unpoified;
     }
@@ -161 +167 @@
      * @param string $with prepend lines with this string
      */
-    function prepend_each_line($string, $with) {
+    public static function prepend_each_line($string, $with) {
         $php_with = var_export($with, true);
         $lines = explode("\n", $string);
@@ -181 +187 @@
      *  like :, default is a space
      */
-    function comment_block($text, $char=' ') {
+    public static function comment_block($text, $char=' ') {
         $text = wordwrap($text, PO_MAX_LINE_LEN - 3);
         return PO::prepend_each_line($text, "#$char ");
@@ -194 +200 @@
      *  false if the entry is empty
      */
-    function export_entry(&$entry) {
-        if (is_null($entry->singular)) return false;
+    public static function export_entry(&$entry) {
+        if ( null === $entry->singular || '' === $entry->singular ) return false;
         $po = array();
         if (!empty($entry->translator_comments)) $po[] = PO::comment_block($entry->translator_comments);
@@ -201 +207 @@
         if (!empty($entry->references)) $po[] = PO::comment_block(implode(' ', $entry->references), ':');
         if (!empty($entry->flags)) $po[] = PO::comment_block(implode(", ", $entry->flags), ',');
-        if (!is_null($entry->context)) $po[] = 'msgctxt '.PO::poify($entry->context);
+        if ($entry->context) $po[] = 'msgctxt '.PO::poify($entry->context);
         $po[] = 'msgid '.PO::poify($entry->singular);
         if (!$entry->is_plural) {
             $translation = empty($entry->translations)? '' : $entry->translations[0];
+            $translation = PO::match_begin_and_end_newlines( $translation, $entry->singular );
             $po[] = 'msgstr '.PO::poify($translation);
         } else {
@@ -210 +217 @@
             $translations = empty($entry->translations)? array('', '') : $entry->translations;
             foreach($translations as $i => $translation) {
+                $translation = PO::match_begin_and_end_newlines( $translation, $entry->plural );
                 $po[] = "msgstr[$i] ".PO::poify($translation);
             }
         }
         return implode("\n", $po);
+    }
+
+    public static function match_begin_and_end_newlines( $translation, $original ) {
+        if ( '' === $translation ) {
+            return $translation;
+        }
+
+        $original_begin = "\n" === substr( $original, 0, 1 );
+        $original_end = "\n" === substr( $original, -1 );
+        $translation_begin = "\n" === substr( $translation, 0, 1 );
+        $translation_end = "\n" === substr( $translation, -1 );
+
+        if ( $original_begin ) {
+            if ( ! $translation_begin ) {
+                $translation = "\n" . $translation;
+            }
+        } elseif ( $translation_begin ) {
+            $translation = ltrim( $translation, "\n" );
+        }
+
+        if ( $original_end ) {
+            if ( ! $translation_end ) {
+                $translation .= "\n";
+            }
+        } elseif ( $translation_end ) {
+            $translation = rtrim( $translation, "\n" );
+        }
+
+        return $translation;
     }
 
@@ -401 +438 @@
      * @return sring
      */
-    function trim_quotes($s) {
+    public static function trim_quotes($s) {
         if ( substr($s, 0, 1) == '"') $s = substr($s, 1);
         if ( substr($s, -1, 1) == '"') $s = substr($s, 0, -1);

trunk/src/wp-includes/pomo/streams.php

@@ -4 +4 @@
  * Based on the classes from Danilo Segan <danilo@kvota.net>
  *
- * @version $Id: streams.php 718 2012-10-31 00:32:02Z nbachiyski $
+ * @version $Id: streams.php 1157 2015-11-20 04:30:11Z dd32 $
  * @package pomo
  * @subpackage streams

trunk/src/wp-includes/pomo/translations.php

@@ -3 +3 @@
  * Class for a set of entries for translation and their associated headers
  *
- * @version $Id: translations.php 718 2012-10-31 00:32:02Z nbachiyski $
+ * @version $Id: translations.php 1157 2015-11-20 04:30:11Z dd32 $
  * @package pomo
  * @subpackage translations