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

Making output fit nicely on 80col display.

Browse source
This commit is contained in:
mark_story 2009-05-09 01:00:14 -04:00
parent 8775f15375
commit 11e2912945
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cake/console/libs/tasks/model.php
View file

@ -167,13 +167,13 @@ class ModelTask extends Shell {
} }
} }
$prompt = __('Would you like to supply validation criteria for the fields in your model?', true); $prompt = __("Would you like to supply validation criteria \nfor the fields in your model?", true);
$wannaDoValidation = $this->in($prompt, array('y','n'), 'y'); $wannaDoValidation = $this->in($prompt, array('y','n'), 'y');
if (array_search($useTable, $this->__tables) !== false && strtolower($wannaDoValidation) == 'y') { if (array_search($useTable, $this->__tables) !== false && strtolower($wannaDoValidation) == 'y') {
$validate = $this->doValidation($tempModel); $validate = $this->doValidation($tempModel);
} }
$prompt = __('Would you like to define model associations (hasMany, hasOne, belongsTo, etc.)?', true); $prompt = __("Would you like to define model associations\n(hasMany, hasOne, belongsTo, etc.)?", true);
$wannaDoAssoc = $this->in($prompt, array('y','n'), 'y'); $wannaDoAssoc = $this->in($prompt, array('y','n'), 'y');
if (strtolower($wannaDoAssoc) == 'y') { if (strtolower($wannaDoAssoc) == 'y') {
$associations = $this->doAssociations($tempModel); $associations = $this->doAssociations($tempModel);
@ -352,7 +352,7 @@ class ModelTask extends Shell {
if ($this->interactive === true) { if ($this->interactive === true) {
$choice = $this->in($prompt, null, $guess); $choice = $this->in($prompt, null, $guess);
if (in_array($choice, $alreadyChosen)) { if (in_array($choice, $alreadyChosen)) {
$this->out(__('You have already chosen that validation rule, please choose again', true)); $this->out(__("You have already chosen that validation rule,\nplease choose again", true));
continue; continue;
} }
$alreadyChosen[] = $choice; $alreadyChosen[] = $choice;
@ -874,7 +874,7 @@ class ModelTask extends Shell {
if (array_search($useTable, $this->__tables) === false) { if (array_search($useTable, $this->__tables) === false) {
$this->out(''); $this->out('');
$this->out(sprintf(__("Given your model named '%s', Cake would expect a database table named '%s'", true), $modelName, $fullTableName)); $this->out(sprintf(__("Given your model named '%s',\nCake would expect a database table named '%s'", true), $modelName, $fullTableName));
$tableIsGood = $this->in(__('Do you want to use this table?', true), array('y','n'), 'y'); $tableIsGood = $this->in(__('Do you want to use this table?', true), array('y','n'), 'y');
} }
if (low($tableIsGood) == 'n' || low($tableIsGood) == 'no') { if (low($tableIsGood) == 'n' || low($tableIsGood) == 'no') {
@ -894,7 +894,7 @@ class ModelTask extends Shell {
$enteredModel = ''; $enteredModel = '';
while ($enteredModel == '') { while ($enteredModel == '') {
$enteredModel = $this->in(__("Enter a number from the list above, type in the name of another model, or 'q' to exit", true), null, 'q'); $enteredModel = $this->in(__("Enter a number from the list above,\ntype in the name of another model, or 'q' to exit", true), null, 'q');
if ($enteredModel === 'q') { if ($enteredModel === 'q') {
$this->out(__("Exit", true)); $this->out(__("Exit", true));
@ -902,7 +902,7 @@ class ModelTask extends Shell {
} }
if ($enteredModel == '' || intval($enteredModel) > count($this->_modelNames)) { if ($enteredModel == '' || intval($enteredModel) > count($this->_modelNames)) {
$this->err(__("The model name you supplied was empty, or the number you selected was not an option. Please try again.", true)); $this->err(__("The model name you supplied was empty,\nor the number you selected was not an option. Please try again.", true));
$enteredModel = ''; $enteredModel = '';
} }
} }