adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-31 09:06:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Extract task to correctly extract messages with context

Browse source
This commit is contained in:
Edgaras Janušauskas 2014-12-25 14:28:44 +02:00
parent 02ca7f5fcb
commit 3ae61e9e16
3 changed files with 59 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
lib/Cake/Console/Command/Task/ExtractTask.php
View file

@ -70,7 +70,7 @@ class ExtractTask extends AppShell {
protected $_tokens = array(); protected $_tokens = array();
/** /**
* Extracted strings indexed by category and domain. * Extracted strings indexed by category, domain, msgid and context.
* *
* @var array * @var array
*/ */
@ -249,26 +249,26 @@ class ExtractTask extends AppShell {
* @return void * @return void
*/ */
protected function _addTranslation($category, $domain, $msgid, $details = array()) { protected function _addTranslation($category, $domain, $msgid, $details = array()) {
if (empty($this->_translations[$category][$domain][$msgid])) { $context = '';
$this->_translations[$category][$domain][$msgid] = array( if (isset($details['msgctxt'])) {
$context = $details['msgctxt'];
}
if (empty($this->_translations[$category][$domain][$msgid][$context])) {
$this->_translations[$category][$domain][$msgid][$context] = array(
'msgid_plural' => false, 'msgid_plural' => false,
'msgctxt' => ''
); );
} }
if (isset($details['msgid_plural'])) { if (isset($details['msgid_plural'])) {
$this->_translations[$category][$domain][$msgid]['msgid_plural'] = $details['msgid_plural']; $this->_translations[$category][$domain][$msgid][$context]['msgid_plural'] = $details['msgid_plural'];
} }
if (isset($details['msgctxt'])) {
$this->_translations[$category][$domain][$msgid]['msgctxt'] = $details['msgctxt'];
}
if (isset($details['file'])) { if (isset($details['file'])) {
$line = 0; $line = 0;
if (isset($details['line'])) { if (isset($details['line'])) {
$line = $details['line']; $line = $details['line'];
} }
$this->_translations[$category][$domain][$msgid]['references'][$details['file']][] = $line; $this->_translations[$category][$domain][$msgid][$context]['references'][$details['file']][] = $line;
} }
} }
@ -565,35 +565,36 @@ class ExtractTask extends AppShell {
$paths[] = realpath(APP) . DS; $paths[] = realpath(APP) . DS;
foreach ($this->_translations as $category => $domains) { foreach ($this->_translations as $category => $domains) {
foreach ($domains as $domain => $translations) { foreach ($domains as $domain => $translations) {
foreach ($translations as $msgid => $details) { foreach ($translations as $msgid => $contexts) {
$plural = $details['msgid_plural']; foreach ($contexts as $context => $details) {
$context = $details['msgctxt']; $plural = $details['msgid_plural'];
$files = $details['references']; $files = $details['references'];
$occurrences = array(); $occurrences = array();
foreach ($files as $file => $lines) { foreach ($files as $file => $lines) {
$lines = array_unique($lines); $lines = array_unique($lines);
$occurrences[] = $file . ':' . implode(';', $lines); $occurrences[] = $file . ':' . implode(';', $lines);
} }
$occurrences = implode("\n#: ", $occurrences); $occurrences = implode("\n#: ", $occurrences);
$header = '#: ' . str_replace(DS, '/', str_replace($paths, '', $occurrences)) . "\n"; $header = '#: ' . str_replace(DS, '/', str_replace($paths, '', $occurrences)) . "\n";
$sentence = ''; $sentence = '';
if ($context) { if ($context) {
$sentence .= "msgctxt \"{$context}\"\n"; $sentence .= "msgctxt \"{$context}\"\n";
} }
if ($plural === false) { if ($plural === false) {
$sentence .= "msgid \"{$msgid}\"\n"; $sentence .= "msgid \"{$msgid}\"\n";
$sentence .= "msgstr \"\"\n\n"; $sentence .= "msgstr \"\"\n\n";
} else { } else {
$sentence .= "msgid \"{$msgid}\"\n"; $sentence .= "msgid \"{$msgid}\"\n";
$sentence .= "msgid_plural \"{$plural}\"\n"; $sentence .= "msgid_plural \"{$plural}\"\n";
$sentence .= "msgstr[0] \"\"\n"; $sentence .= "msgstr[0] \"\"\n";
$sentence .= "msgstr[1] \"\"\n\n"; $sentence .= "msgstr[1] \"\"\n\n";
} }
$this->_store($category, $domain, $header, $sentence); $this->_store($category, $domain, $header, $sentence);
if (($category !== 'LC_MESSAGES' || $domain !== 'default') && $this->_merge) { if (($category !== 'LC_MESSAGES' || $domain !== 'default') && $this->_merge) {
$this->_store('LC_MESSAGES', 'default', $header, $sentence); $this->_store('LC_MESSAGES', 'default', $header, $sentence);
}
} }
} }
} }

17
lib/Cake/Test/Case/Console/Command/Task/ExtractTaskTest.php
View file

@ -162,9 +162,20 @@ class ExtractTaskTest extends CakeTestCase {
$this->assertContains('msgid "double \\"quoted\\""', $result, 'Strings with quotes not handled correctly'); $this->assertContains('msgid "double \\"quoted\\""', $result, 'Strings with quotes not handled correctly');
$this->assertContains("msgid \"single 'quoted'\"", $result, 'Strings with quotes not handled correctly'); $this->assertContains("msgid \"single 'quoted'\"", $result, 'Strings with quotes not handled correctly');
$pattern = '/\#: (\\\\|\/)extract\.ctp:33\n'; $pattern = '/\#: (\\\\|\/)extract\.ctp:34\nmsgid "letter"/';
$pattern .= 'msgctxt "mail"/'; $this->assertRegExp($pattern, $result, 'Strings with context should not overwrite strings without context');
$this->assertRegExp($pattern, $result);
$pattern = '/\#: (\\\\|\/)extract\.ctp:35;37\nmsgctxt "A"\nmsgid "letter"/';
$this->assertRegExp($pattern, $result, 'Should contain string with context "A"');
$pattern = '/\#: (\\\\|\/)extract\.ctp:36\nmsgctxt "B"\nmsgid "letter"/';
$this->assertRegExp($pattern, $result, 'Should contain string with context "B"');
$pattern = '/\#: (\\\\|\/)extract\.ctp:38\nmsgid "%d letter"\nmsgid_plural "%d letters"/';
$this->assertRegExp($pattern, $result, 'Plural strings with context should not overwrite strings without context');
$pattern = '/\#: (\\\\|\/)extract\.ctp:39\nmsgctxt "A"\nmsgid "%d letter"\nmsgid_plural "%d letters"/';
$this->assertRegExp($pattern, $result, 'Should contain plural string with context "A"');
// extract.ctp - reading the domain.pot // extract.ctp - reading the domain.pot
$result = file_get_contents($this->path . DS . 'domain.pot'); $result = file_get_contents($this->path . DS . 'domain.pot');

8
lib/Cake/Test/test_app/View/Pages/extract.ctp
View file

@ -30,4 +30,10 @@ __('Hot features!'
// Category // Category
echo __c('You have a new message (category: LC_TIME).', 5); echo __c('You have a new message (category: LC_TIME).', 5);
echo __x('mail', 'letter'); // Context
echo __('letter');
echo __x('A', 'letter');
echo __x('B', 'letter');
echo __x('A', 'letter');
echo __n('%d letter', '%d letters', $count);
echo __xn('A', '%d letter', '%d letters', $count);