Skip to content
This repository
Browse code

Making output fit nicely on 80col display.

  • Loading branch information...
commit 11e2912945ab5b6cc4afee91d1f243b618253cf4 1 parent 8775f15
Mark Story authored May 09, 2009

Showing 1 changed file with 6 additions and 6 deletions. Show diff stats Hide diff stats

  1. 12  cake/console/libs/tasks/model.php
12  cake/console/libs/tasks/model.php
@@ -167,13 +167,13 @@ function __interactive() {
167 167
 			}
168 168
 		}
169 169
 
170  
-		$prompt = __('Would you like to supply validation criteria for the fields in your model?', true);
  170
+		$prompt = __("Would you like to supply validation criteria \nfor the fields in your model?", true);
171 171
 		$wannaDoValidation = $this->in($prompt, array('y','n'), 'y');
172 172
 		if (array_search($useTable, $this->__tables) !== false && strtolower($wannaDoValidation) == 'y') {
173 173
 			$validate = $this->doValidation($tempModel);
174 174
 		}
175 175
 
176  
-		$prompt = __('Would you like to define model associations (hasMany, hasOne, belongsTo, etc.)?', true);
  176
+		$prompt = __("Would you like to define model associations\n(hasMany, hasOne, belongsTo, etc.)?", true);
177 177
 		$wannaDoAssoc = $this->in($prompt, array('y','n'), 'y');
178 178
 		if (strtolower($wannaDoAssoc) == 'y') {
179 179
 			$associations = $this->doAssociations($tempModel);
@@ -352,7 +352,7 @@ function fieldValidation($fieldName, $metaData, $primaryKey = 'id') {
352 352
 			if ($this->interactive === true) {
353 353
 				$choice = $this->in($prompt, null, $guess);
354 354
 				if (in_array($choice, $alreadyChosen)) {
355  
-					$this->out(__('You have already chosen that validation rule, please choose again', true));
  355
+					$this->out(__("You have already chosen that validation rule,\nplease choose again", true));
356 356
 					continue;
357 357
 				}
358 358
 				$alreadyChosen[] = $choice;
@@ -874,7 +874,7 @@ function getTable($modelName, $useDbConfig = null) {
874 874
 
875 875
 		if (array_search($useTable, $this->__tables) === false) {
876 876
 			$this->out('');
877  
-			$this->out(sprintf(__("Given your model named '%s', Cake would expect a database table named '%s'", true), $modelName, $fullTableName));
  877
+			$this->out(sprintf(__("Given your model named '%s',\nCake would expect a database table named '%s'", true), $modelName, $fullTableName));
878 878
 			$tableIsGood = $this->in(__('Do you want to use this table?', true), array('y','n'), 'y');
879 879
 		}
880 880
 		if (low($tableIsGood) == 'n' || low($tableIsGood) == 'no') {
@@ -894,7 +894,7 @@ function getName($useDbConfig = null) {
894 894
 		$enteredModel = '';
895 895
 
896 896
 		while ($enteredModel == '') {
897  
-			$enteredModel = $this->in(__("Enter a number from the list above, type in the name of another model, or 'q' to exit", true), null, 'q');
  897
+			$enteredModel = $this->in(__("Enter a number from the list above,\ntype in the name of another model, or 'q' to exit", true), null, 'q');
898 898
 
899 899
 			if ($enteredModel === 'q') {
900 900
 				$this->out(__("Exit", true));
@@ -902,7 +902,7 @@ function getName($useDbConfig = null) {
902 902
 			}
903 903
 
904 904
 			if ($enteredModel == '' || intval($enteredModel) > count($this->_modelNames)) {
905  
-				$this->err(__("The model name you supplied was empty, or the number you selected was not an option. Please try again.", true));
  905
+				$this->err(__("The model name you supplied was empty,\nor the number you selected was not an option. Please try again.", true));
906 906
 				$enteredModel = '';
907 907
 			}
908 908
 		}

0 notes on commit 11e2912

Please sign in to comment.
Something went wrong with that request. Please try again.