/**
* Class for a set of entries for translation and their associated headers
*
- * @version $Id: translations.php 291 2009-10-21 05:46:08Z nbachiyski $
+ * @version $Id: translations.php 718 2012-10-31 00:32:02Z nbachiyski $
* @package pomo
* @subpackage translations
*/
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
*
$this->headers[$header] = $value;
}
- function set_headers(&$headers) {
+ function set_headers($headers) {
foreach($headers as $header => $value) {
$this->set_header($header, $value);
}
/**
* 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
* @return void
**/
function merge_with(&$other) {
- $this->entries = array_merge($this->entries, $other->entries);
+ foreach( $other->entries as $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 {
/**
- * 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.
}
return call_user_func($this->_gettext_select_plural_form, $count);
}
-
+
function nplurals_and_expression_from_header($header) {
if (preg_match('/^\s*nplurals\s*=\s*(\d+)\s*;\s+plural\s*=\s*(.+)$/', $header, $matches)) {
$nplurals = (int)$matches[1];
/**
* Adds parantheses 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
* @return string the expression with parentheses added
*/
}
return rtrim($res, ';');
}
-
+
function make_headers($translation) {
$headers = array();
// sometimes \ns are used instead of real new lines
}
return $headers;
}
-
+
function set_header($header, $value) {
parent::set_header($header, $value);
if ('Plural-Forms' == $header) {
class NOOP_Translations {
var $entries = array();
var $headers = array();
-
+
function add_entry($entry) {
return true;
}
function set_header($header, $value) {
}
- function set_headers(&$headers) {
+ function set_headers($headers) {
}
function get_header($header) {