adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #7866 from garas/i18n-mo-loading-context

Browse source 
Use correct context when parsing MO file.
This commit is contained in:
Mark Story 2015-12-20 07:42:16 -05:00
commit f2f704dfd3
4 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/Cake/I18n/I18n.php
View file

@ -478,6 +478,7 @@ class I18n {
* *
* @param string $filename Binary .mo file to load * @param string $filename Binary .mo file to load
* @return mixed Array of translations on success or false on failure * @return mixed Array of translations on success or false on failure
* @link https://www.gnu.org/software/gettext/manual/html_node/MO-Files.html
*/ */
public static function loadMo($filename) { public static function loadMo($filename) {
$translations = false; $translations = false;
@ -486,7 +487,6 @@ class I18n {
// Binary files extracted makes non-standard local variables // Binary files extracted makes non-standard local variables
if ($data = file_get_contents($filename)) { if ($data = file_get_contents($filename)) {
$translations = array(); $translations = array();
$context = null;
$header = substr($data, 0, 20); $header = substr($data, 0, 20);
$header = unpack('L1magic/L1version/L1count/L1o_msg/L1o_trn', $header); $header = unpack('L1magic/L1version/L1count/L1o_msg/L1o_trn', $header);
extract($header); extract($header);
@ -496,6 +496,7 @@ class I18n {
$r = unpack("L1len/L1offs", substr($data, $o_msg + $n * 8, 8)); $r = unpack("L1len/L1offs", substr($data, $o_msg + $n * 8, 8));
$msgid = substr($data, $r["offs"], $r["len"]); $msgid = substr($data, $r["offs"], $r["len"]);
unset($msgid_plural); unset($msgid_plural);
$context = null;
if (strpos($msgid, "\x04") !== false) { if (strpos($msgid, "\x04") !== false) {
list($context, $msgid) = explode("\x04", $msgid); list($context, $msgid) = explode("\x04", $msgid);

3
lib/Cake/Test/Case/I18n/I18nTest.php
View file

@ -2054,6 +2054,9 @@ class I18nTest extends CakeTestCase {
$this->assertSame("danspartij", __x('social gathering', 'ball')); $this->assertSame("danspartij", __x('social gathering', 'ball'));
$this->assertSame("balans", __('balance')); $this->assertSame("balans", __('balance'));
$this->assertSame("saldo", __x('money', 'balance')); $this->assertSame("saldo", __x('money', 'balance'));
// MO file is sorted by msgid, 'zoo' should be last
$this->assertSame("dierentuin", __('zoo'));
} }
/** /**

5
lib/Cake/Test/test_app/Locale/nld/LC_MESSAGES/default.po
View file

@ -26,4 +26,7 @@ msgstr "balans"
msgctxt "money" msgctxt "money"
msgid "balance" msgid "balance"
msgstr "saldo" msgstr "saldo"
msgid "zoo"
msgstr "dierentuin"

BIN
lib/Cake/Test/test_app/Locale/nld_mo/LC_MESSAGES/default.mo
View file

Binary file not shown.