IntenseWebs/WordPress
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Fixes #34748

Built from https://develop.svn.wordpress.org/trunk@35714


git-svn-id: http://core.svn.wordpress.org/trunk@35678 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dion Hulse
2015-11-20 04:34:25 +00:00
parent 870cdfb024
commit 048f327bfc
6 changed files with 58 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wp-includes/pomo/mo.php
View File

@@ -2,7 +2,7 @@
/**
* 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
*/
@@ -124,7 +124,7 @@ class MO extends Gettext_Translations {
//TODO: warnings for control characters
$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;
}
@@ -134,7 +134,7 @@ class MO extends Gettext_Translations {
*/
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];
}
/**