adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-02-07 12:36:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replacing param --locations by boolean flag --no-location

Browse source
This commit is contained in:
Walter Nasich 2015-07-13 19:47:26 -03:00
parent 06b8cb0c30
commit 80896cef2a
2 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -48,13 +48,6 @@ class ExtractTask extends AppShell {
*/ */
protected $_merge = false; protected $_merge = false;
/**
* Write lines with locations of each message string
*
* @var bool
*/
protected $_locations = true;
/** /**
* Current file being processed * Current file being processed
* *
@ -231,10 +224,6 @@ class ExtractTask extends AppShell {
$this->_merge = strtolower($response) === 'y'; $this->_merge = strtolower($response) === 'y';
} }
if (isset($this->params['locations'])) {
$this->_locations = !(strtolower($this->params['locations']) === 'no');
}
if (empty($this->_files)) { if (empty($this->_files)) {
$this->_searchFiles(); $this->_searchFiles();
} }
@ -327,9 +316,10 @@ class ExtractTask extends AppShell {
))->addOption('merge', array( ))->addOption('merge', array(
'help' => __d('cake_console', 'Merge all domain and category strings into the default.po file.'), 'help' => __d('cake_console', 'Merge all domain and category strings into the default.po file.'),
'choices' => array('yes', 'no') 'choices' => array('yes', 'no')
))->addOption('locations', array( ))->addOption('no-location', array(
'help' => __d('cake_console', 'Write lines with locations of each message string'), 'boolean' => true,
'choices' => array('yes', 'no') 'default' => false,
'help' => __d('cake_console', 'Do not write lines with locations'),
))->addOption('output', array( ))->addOption('output', array(
'help' => __d('cake_console', 'Full path to output directory.') 'help' => __d('cake_console', 'Full path to output directory.')
))->addOption('files', array( ))->addOption('files', array(
@ -587,7 +577,7 @@ class ExtractTask extends AppShell {
foreach ($contexts as $context => $details) { foreach ($contexts as $context => $details) {
$plural = $details['msgid_plural']; $plural = $details['msgid_plural'];
$header = ''; $header = '';
if ($this->_locations) { if (empty($this->params['no-location'])) {
$files = $details['references']; $files = $details['references'];
$occurrences = array(); $occurrences = array();
foreach ($files as $file => $lines) { foreach ($files as $file => $lines) {

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

@ -233,7 +233,7 @@ class ExtractTaskTest extends CakeTestCase {
$this->Task->params['output'] = $this->path . DS; $this->Task->params['output'] = $this->path . DS;
$this->Task->params['extract-core'] = 'no'; $this->Task->params['extract-core'] = 'no';
$this->Task->params['merge'] = 'no'; $this->Task->params['merge'] = 'no';
$this->Task->params['locations'] = 'no'; $this->Task->params['no-location'] = true;
$this->Task->expects($this->never())->method('err'); $this->Task->expects($this->never())->method('err');
$this->Task->expects($this->any())->method('in') $this->Task->expects($this->any())->method('in')