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

Timestamp:

11/20/2015 04:33:12 AM (10 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/entry.php (modified) (3 diffs)

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 );