WordPress 4.0

[autoinstalls/wordpress.git] / wp-includes / pomo / translations.php

diff --git a/wp-includes/pomo/translations.php b/wp-includes/pomo/translations.php
index 01be8df42d20d5a6378ee927cd73c6138d7b2b46..5ad316c08e34254bc43fd35ff873cb2820d6258e 100644 (file)
--- a/wp-includes/pomo/translations.php
+++ b/wp-includes/pomo/translations.php
@@ -2,7 +2,7 @@
 /**
  * Class for a set of entries for translation and their associated headers
  *
 /**
  * Class for a set of entries for translation and their associated headers
  *

- * @version $Id: translations.php 406 2010-02-07 11:10:24Z nbachiyski $
+ * @version $Id: translations.php 718 2012-10-31 00:32:02Z nbachiyski $

  * @package pomo
  * @subpackage translations
  */
  * @package pomo
  * @subpackage translations
  */


@@ -30,6 +30,19 @@ class Translations {
                return true;
        }
 
                return true;
        }
 

+       function add_entry_or_merge($entry) {
+               if (is_array($entry)) {
+                       $entry = new Translation_Entry($entry);
+               }
+               $key = $entry->key();
+               if (false === $key) return false;
+               if (isset($this->entries[$key]))
+                       $this->entries[$key]->merge_with($entry);
+               else
+                       $this->entries[$key] = &$entry;
+               return true;
+       }
+

        /**
         * Sets $header PO header to $value
         *
        /**
         * Sets $header PO header to $value
         *


@@ -44,7 +57,7 @@ class Translations {
                $this->headers[$header] = $value;
        }
 
                $this->headers[$header] = $value;
        }
 

-       function set_headers(&$headers) {
+       function set_headers($headers) {

                foreach($headers as $header => $value) {
                        $this->set_header($header, $value);
                }
                foreach($headers as $header => $value) {
                        $this->set_header($header, $value);
                }


@@ -68,7 +81,7 @@ class Translations {
        /**
         * Given the number of items, returns the 0-based index of the plural form to use
         *
        /**
         * Given the number of items, returns the 0-based index of the plural form to use
         *

-        * Here, in the base Translations class, the commong logic for English is implmented:
+        * Here, in the base Translations class, the common logic for English is implemented:

         *      0 if there is one element, 1 otherwise
         *
         * This function should be overrided by the sub-classes. For example MO/PO can derive the logic
         *      0 if there is one element, 1 otherwise
         *
         * This function should be overrided by the sub-classes. For example MO/PO can derive the logic


@@ -108,11 +121,20 @@ class Translations {
                        $this->entries[$entry->key()] = $entry;
                }
        }
                        $this->entries[$entry->key()] = $entry;
                }
        }

+
+       function merge_originals_with(&$other) {
+               foreach( $other->entries as $entry ) {
+                       if ( !isset( $this->entries[$entry->key()] ) )
+                               $this->entries[$entry->key()] = $entry;
+                       else
+                               $this->entries[$entry->key()]->merge_with($entry);
+               }
+       }

 }
 
 class Gettext_Translations extends Translations {
        /**
 }
 
 class Gettext_Translations extends Translations {
        /**

-        * The gettext implmentation of select_plural_form.
+        * The gettext implementation of select_plural_form.

         *
         * It lives in this class, because there are more than one descendand, which will use it and
         * they can't share it effectively.
         *
         * It lives in this class, because there are more than one descendand, which will use it and
         * they can't share it effectively.


@@ -150,7 +172,7 @@ class Gettext_Translations extends Translations {
        }
 
        /**
        }
 
        /**

-        * Adds parantheses to the inner parts of ternary operators in
+        * Adds parentheses to the inner parts of ternary operators in

         * plural expressions, because PHP evaluates ternary oerators from left to right
         *
         * @param string $expression the expression without parentheses
         * plural expressions, because PHP evaluates ternary oerators from left to right
         *
         * @param string $expression the expression without parentheses


@@ -220,7 +242,7 @@ class NOOP_Translations {
        function set_header($header, $value) {
        }
 
        function set_header($header, $value) {
        }
 

-       function set_headers(&$headers) {
+       function set_headers($headers) {

        }
 
        function get_header($header) {
        }
 
        function get_header($header) {