Changeset 35714 for trunk/src/wp-includes/pomo/mo.php

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

File:

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

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];
     }