From 1e425907b295667050add7418dea1ae8b31bccb1 Mon Sep 17 00:00:00 2001 From: predominant Date: Fri, 16 Apr 2010 01:43:39 +1000 Subject: [PATCH] Change Cake Console files to new use of shortcut for translations. --- cake/console/cake.php | 6 +- cake/console/error.php | 28 +-- cake/console/libs/acl.php | 174 +++++++++--------- cake/console/libs/api.php | 10 +- cake/console/libs/bake.php | 17 +- cake/console/libs/i18n.php | 24 +-- cake/console/libs/schema.php | 54 +++--- cake/console/libs/shell.php | 14 +- cake/console/libs/tasks/controller.php | 50 ++--- cake/console/libs/tasks/db_config.php | 2 +- cake/console/libs/tasks/extract.php | 60 +++--- cake/console/libs/tasks/fixture.php | 8 +- cake/console/libs/tasks/model.php | 94 +++++----- cake/console/libs/tasks/plugin.php | 24 +-- cake/console/libs/tasks/project.php | 60 +++--- cake/console/libs/tasks/template.php | 8 +- cake/console/libs/tasks/test.php | 18 +- cake/console/libs/tasks/view.php | 28 +-- cake/console/libs/testsuite.php | 20 +- .../default/actions/controller_actions.ctp | 32 ++-- cake/console/templates/default/views/form.ctp | 14 +- cake/console/templates/default/views/home.ctp | 22 +-- .../console/templates/default/views/index.ctp | 24 +-- cake/console/templates/default/views/view.ctp | 20 +- .../templates/skel/views/layouts/default.ctp | 6 +- cake/console/templates/skel/webroot/test.php | 2 +- 26 files changed, 409 insertions(+), 410 deletions(-) diff --git a/cake/console/cake.php b/cake/console/cake.php index 77b07e423..42f9a1f13 100644 --- a/cake/console/cake.php +++ b/cake/console/cake.php @@ -322,7 +322,7 @@ class ShellDispatcher { $Shell = $this->_getShell($plugin); if (!$Shell) { - $title = sprintf(__('Error: Class %s could not be loaded.', true), $this->shellClass); + $title = sprintf(__('Error: Class %s could not be loaded.'), $this->shellClass); $this->stderr($title . "\n"); return false; } @@ -374,8 +374,8 @@ class ShellDispatcher { } } - $title = sprintf(__('Error: Unknown %1$s command %2$s.', true), $this->shellName, $arg); - $message = sprintf(__('For usage try `cake %s help`', true), $this->shell); + $title = sprintf(__('Error: Unknown %1$s command %2$s.'), $this->shellName, $arg); + $message = sprintf(__('For usage try `cake %s help`'), $this->shell); $this->stderr($title . "\n" . $message . "\n"); return false; } diff --git a/cake/console/error.php b/cake/console/error.php index 62e33d808..bd64e1c1f 100644 --- a/cake/console/error.php +++ b/cake/console/error.php @@ -75,7 +75,7 @@ class ErrorHandler extends Object { $this->error(array( 'code' => '404', 'name' => 'Not found', - 'message' => sprintf(__("The requested address %s was not found on this server.", true), $url, $message) + 'message' => sprintf(__('The requested address %s was not found on this server.'), $url, $message) )); $this->_stop(); } @@ -88,7 +88,7 @@ class ErrorHandler extends Object { public function missingController($params) { extract($params, EXTR_OVERWRITE); $controllerName = str_replace('Controller', '', $className); - $this->stderr(sprintf(__("Missing Controller '%s'", true), $controllerName)); + $this->stderr(sprintf(__("Missing Controller '%s'"), $controllerName)); $this->_stop(); } @@ -99,7 +99,7 @@ class ErrorHandler extends Object { */ public function missingAction($params) { extract($params, EXTR_OVERWRITE); - $this->stderr(sprintf(__("Missing Method '%s' in '%s'", true), $action, $className)); + $this->stderr(sprintf(__("Missing Method '%s' in '%s'"), $action, $className)); $this->_stop(); } @@ -110,7 +110,7 @@ class ErrorHandler extends Object { */ public function privateAction($params) { extract($params, EXTR_OVERWRITE); - $this->stderr(sprintf(__("Trying to access private method '%s' in '%s'", true), $action, $className)); + $this->stderr(sprintf(__("Trying to access private method '%s' in '%s'"), $action, $className)); $this->_stop(); } @@ -121,7 +121,7 @@ class ErrorHandler extends Object { */ public function missingTable($params) { extract($params, EXTR_OVERWRITE); - $this->stderr(sprintf(__("Missing database table '%s' for model '%s'", true), $table, $className)); + $this->stderr(sprintf(__("Missing database table '%s' for model '%s'"), $table, $className)); $this->_stop(); } @@ -131,7 +131,7 @@ class ErrorHandler extends Object { * @param array $params Parameters */ public function missingDatabase($params = array()) { - $this->stderr(__("Missing Database", true)); + $this->stderr(__('Missing Database')); $this->_stop(); } @@ -142,7 +142,7 @@ class ErrorHandler extends Object { */ public function missingView($params) { extract($params, EXTR_OVERWRITE); - $this->stderr(sprintf(__("Missing View '%s' for '%s' in '%s'", true), $file, $action, $className)); + $this->stderr(sprintf(__("Missing View '%s' for '%s' in '%s'"), $file, $action, $className)); $this->_stop(); } @@ -153,7 +153,7 @@ class ErrorHandler extends Object { */ public function missingLayout($params) { extract($params, EXTR_OVERWRITE); - $this->stderr(sprintf(__("Missing Layout '%s'", true), $file)); + $this->stderr(sprintf(__("Missing Layout '%s'"), $file)); $this->_stop(); } @@ -164,7 +164,7 @@ class ErrorHandler extends Object { */ public function missingConnection($params) { extract($params, EXTR_OVERWRITE); - $this->stderr(__("Missing Database Connection. Try 'cake bake'", true)); + $this->stderr(__("Missing Database Connection. Try 'cake bake'")); $this->_stop(); } @@ -175,7 +175,7 @@ class ErrorHandler extends Object { */ public function missingHelperFile($params) { extract($params, EXTR_OVERWRITE); - $this->stderr(sprintf(__("Missing Helper file '%s' for '%s'", true), $file, Inflector::camelize($helper))); + $this->stderr(sprintf(__("Missing Helper file '%s' for '%s'"), $file, Inflector::camelize($helper))); $this->_stop(); } @@ -186,7 +186,7 @@ class ErrorHandler extends Object { */ public function missingHelperClass($params) { extract($params, EXTR_OVERWRITE); - $this->stderr(sprintf(__("Missing Helper class '%s' in '%s'", true), Inflector::camelize($helper), $file)); + $this->stderr(sprintf(__("Missing Helper class '%s' in '%s'"), Inflector::camelize($helper), $file)); $this->_stop(); } @@ -197,7 +197,7 @@ class ErrorHandler extends Object { */ public function missingComponentFile($params) { extract($params, EXTR_OVERWRITE); - $this->stderr(sprintf(__("Missing Component file '%s' for '%s'", true), $file, Inflector::camelize($component))); + $this->stderr(sprintf(__("Missing Component file '%s' for '%s'"), $file, Inflector::camelize($component))); $this->_stop(); } @@ -208,7 +208,7 @@ class ErrorHandler extends Object { */ public function missingComponentClass($params) { extract($params, EXTR_OVERWRITE); - $this->stderr(sprintf(__("Missing Component class '%s' in '%s'", true), Inflector::camelize($component), $file)); + $this->stderr(sprintf(__("Missing Component class '%s' in '%s'"), Inflector::camelize($component), $file)); $this->_stop(); } @@ -219,7 +219,7 @@ class ErrorHandler extends Object { */ public function missingModel($params) { extract($params, EXTR_OVERWRITE); - $this->stderr(sprintf(__("Missing model '%s'", true), $className)); + $this->stderr(sprintf(__("Missing model '%s'"), $className)); $this->_stop(); } diff --git a/cake/console/libs/acl.php b/cake/console/libs/acl.php index 86709f370..e3386b4f7 100644 --- a/cake/console/libs/acl.php +++ b/cake/console/libs/acl.php @@ -71,12 +71,12 @@ class AclShell extends Shell { if (!in_array(Configure::read('Acl.classname'), array('DbAcl', 'DB_ACL'))) { $out = "--------------------------------------------------\n"; - $out .= __("Error: Your current Cake configuration is set to", true) . "\n"; - $out .= __("an ACL implementation other than DB. Please change", true) . "\n"; - $out .= __("your core config to reflect your decision to use", true) . "\n"; - $out .= __("DbAcl before attempting to use this script", true) . ".\n"; + $out .= __('Error: Your current Cake configuration is set to') . "\n"; + $out .= __('an ACL implementation other than DB. Please change') . "\n"; + $out .= __('your core config to reflect your decision to use') . "\n"; + $out .= __('DbAcl before attempting to use this script') . ".\n"; $out .= "--------------------------------------------------\n"; - $out .= sprintf(__("Current ACL Classname: %s", true), Configure::read('Acl.classname')) . "\n"; + $out .= sprintf(__('Current ACL Classname: %s'), Configure::read('Acl.classname')) . "\n"; $out .= "--------------------------------------------------\n"; $this->err($out); $this->_stop(); @@ -84,7 +84,7 @@ class AclShell extends Shell { if ($this->command && !in_array($this->command, array('help'))) { if (!config('database')) { - $this->out(__("Your database configuration was not found. Take a moment to create one.", true), true); + $this->out(__('Your database configuration was not found. Take a moment to create one.'), true); $this->args = null; return $this->DbConfig->execute(); } @@ -103,7 +103,7 @@ class AclShell extends Shell { * */ public function main() { - $out = __("Available ACL commands:", true) . "\n"; + $out = __('Available ACL commands:') . "\n"; $out .= "\t - create\n"; $out .= "\t - delete\n"; $out .= "\t - setParent\n"; @@ -115,7 +115,7 @@ class AclShell extends Shell { $out .= "\t - view\n"; $out .= "\t - initdb\n"; $out .= "\t - help\n\n"; - $out .= __("For help, run the 'help' command. For help on a specific command, run 'help '", true); + $out .= __("For help, run the 'help' command. For help on a specific command, run 'help '"); $this->out($out); } @@ -141,15 +141,15 @@ class AclShell extends Shell { if (is_string($data) && $data != '/') { $data = array('alias' => $data); } elseif (is_string($data)) { - $this->error(__('/ can not be used as an alias!', true), __("\t/ is the root, please supply a sub alias", true)); + $this->error(__('/ can not be used as an alias!'), __("\t/ is the root, please supply a sub alias")); } $data['parent_id'] = $parent; $this->Acl->{$class}->create(); if ($this->Acl->{$class}->save($data)) { - $this->out(sprintf(__("New %s '%s' created.\n", true), $class, $this->args[2]), true); + $this->out(sprintf(__("New %s '%s' created.\n"), $class, $this->args[2]), true); } else { - $this->err(sprintf(__("There was a problem creating a new %s '%s'.", true), $class, $this->args[2])); + $this->err(sprintf(__("There was a problem creating a new %s '%s'."), $class, $this->args[2])); } } @@ -166,9 +166,9 @@ class AclShell extends Shell { $nodeId = $this->_getNodeId($class, $identifier); if (!$this->Acl->{$class}->delete($nodeId)) { - $this->error(__("Node Not Deleted", true), sprintf(__("There was an error deleting the %s. Check that the node exists", true), $class) . ".\n"); + $this->error(__('Node Not Deleted'), sprintf(__('There was an error deleting the %s. Check that the node exists'), $class) . ".\n"); } - $this->out(sprintf(__("%s deleted", true), $class) . ".\n", true); + $this->out(sprintf(__('%s deleted'), $class) . ".\n", true); } /** @@ -190,9 +190,9 @@ class AclShell extends Shell { ); $this->Acl->{$class}->create(); if (!$this->Acl->{$class}->save($data)) { - $this->out(__("Error in setting new parent. Please make sure the parent node exists, and is not a descendant of the node specified.", true), true); + $this->out(__('Error in setting new parent. Please make sure the parent node exists, and is not a descendant of the node specified.'), true); } else { - $this->out(sprintf(__("Node parent set to %s", true), $this->args[2]) . "\n", true); + $this->out(sprintf(__('Node parent set to %s'), $this->args[2]) . "\n", true); } } @@ -211,11 +211,11 @@ class AclShell extends Shell { if (empty($nodes)) { $this->error( - sprintf(__("Supplied Node '%s' not found", true), $this->args[1]), - __("No tree returned.", true) + sprintf(__("Supplied Node '%s' not found"), $this->args[1]), + __('No tree returned.') ); } - $this->out(__('Path:', true)); + $this->out(__('Path:')); $this->hr(); for ($i = 0; $i < count($nodes); $i++) { $this->_outputNode($class, $nodes[$i], $i); @@ -249,9 +249,9 @@ class AclShell extends Shell { extract($this->__getParams()); if ($this->Acl->check($aro, $aco, $action)) { - $this->out(sprintf(__("%s is allowed.", true), $aroName), true); + $this->out(sprintf(__('%s is allowed.'), $aroName), true); } else { - $this->out(sprintf(__("%s is not allowed.", true), $aroName), true); + $this->out(sprintf(__('%s is not allowed.'), $aroName), true); } } @@ -264,9 +264,9 @@ class AclShell extends Shell { extract($this->__getParams()); if ($this->Acl->allow($aro, $aco, $action)) { - $this->out(__("Permission granted.", true), true); + $this->out(__('Permission granted.'), true); } else { - $this->out(__("Permission was not granted.", true), true); + $this->out(__('Permission was not granted.'), true); } } @@ -279,9 +279,9 @@ class AclShell extends Shell { extract($this->__getParams()); if ($this->Acl->deny($aro, $aco, $action)) { - $this->out(__("Permission denied.", true), true); + $this->out(__('Permission denied.'), true); } else { - $this->out(__("Permission was not denied.", true), true); + $this->out(__('Permission was not denied.'), true); } } @@ -294,9 +294,9 @@ class AclShell extends Shell { extract($this->__getParams()); if ($this->Acl->inherit($aro, $aco, $action)) { - $this->out(__("Permission inherited.", true), true); + $this->out(__('Permission inherited.'), true); } else { - $this->out(__("Permission was not inherited.", true), true); + $this->out(__('Permission was not inherited.'), true); } } @@ -329,9 +329,9 @@ class AclShell extends Shell { if (empty($nodes)) { if (isset($this->args[1])) { - $this->error(sprintf(__("%s not found", true), $this->args[1]), __("No tree returned.", true)); + $this->error(sprintf(__('%s not found'), $this->args[1]), __('No tree returned.')); } elseif (isset($this->args[0])) { - $this->error(sprintf(__("%s not found", true), $this->args[0]), __("No tree returned.", true)); + $this->error(sprintf(__('%s not found'), $this->args[0]), __('No tree returned.')); } } $this->out($class . " tree:"); @@ -376,81 +376,81 @@ class AclShell extends Shell { */ public function help() { $head = "-----------------------------------------------\n"; - $head .= __("Usage: cake acl ...", true) . "\n"; + $head .= __('Usage: cake acl ...') . "\n"; $head .= "-----------------------------------------------\n"; - $head .= __("Commands:", true) . "\n"; + $head .= __('Commands:') . "\n"; $commands = array( 'create' => "create aro|aco \n" . - "\t" . __("Creates a new ACL object under the parent", true) . "\n" . - "\t" . __("specified by , an id/alias.", true) . "\n" . - "\t" . __("The and references can be", true) . "\n" . - "\t" . __("in one of the following formats:", true) . "\n\n" . - "\t\t- " . __(". - The node will be bound to a", true) . "\n" . - "\t\t" . __("specific record of the given model.", true) . "\n\n" . - "\t\t- " . __(" - The node will be given a string alias,", true) . "\n" . - "\t\t" . __(" (or path, in the case of )", true) . "\n" . - "\t\t " . __("i.e. 'John'. When used with ,", true) . "\n" . - "\t\t" . __("this takes the form of an alias path,", true) . "\n" . - "\t\t " . __("i.e. //.", true) . "\n\n" . - "\t" . __("To add a node at the root level,", true) . "\n" . - "\t" . __("enter 'root' or '/' as the parameter.", true) . "\n", + "\t" . __("Creates a new ACL object under the parent") . "\n" . + "\t" . __("specified by , an id/alias.") . "\n" . + "\t" . __("The and references can be") . "\n" . + "\t" . __("in one of the following formats:") . "\n\n" . + "\t\t- " . __(". - The node will be bound to a") . "\n" . + "\t\t" . __("specific record of the given model.") . "\n\n" . + "\t\t- " . __(" - The node will be given a string alias,") . "\n" . + "\t\t" . __(" (or path, in the case of )") . "\n" . + "\t\t " . __("i.e. 'John'. When used with ,") . "\n" . + "\t\t" . __("this takes the form of an alias path,") . "\n" . + "\t\t " . __("i.e. //.") . "\n\n" . + "\t" . __("To add a node at the root level,") . "\n" . + "\t" . __("enter 'root' or '/' as the parameter.") . "\n", 'delete' => "delete aro|aco \n" . - "\t" . __("Deletes the ACL object with the given reference", true) . "\n" . - "\t" . __("For more detailed parameter usage info,", true) . "\n" . - "\t" . __("see help for the 'create' command.", true), + "\t" . __("Deletes the ACL object with the given reference") . "\n" . + "\t" . __("For more detailed parameter usage info,") . "\n" . + "\t" . __("see help for the 'create' command."), 'setparent' => "setParent aro|aco \n" . - "\t" . __("Moves the ACL object specified by beneath", true) . "\n" . - "\t" . __("the parent ACL object specified by .", true) . "\n" . - "\t" . __("For more detailed parameter usage info,", true) . "\n" . - "\t" . __("see help for the 'create' command.", true), + "\t" . __("Moves the ACL object specified by beneath") . "\n" . + "\t" . __("the parent ACL object specified by .") . "\n" . + "\t" . __("For more detailed parameter usage info,") . "\n" . + "\t" . __("see help for the 'create' command."), 'getpath' => "getPath aro|aco \n" . - "\t" . __("Returns the path to the ACL object specified by . This command", true) . "\n" . - "\t" . __("is useful in determining the inhertiance of permissions for a certain", true) . "\n" . - "\t" . __("object in the tree.", true) . "\n" . - "\t" . __("For more detailed parameter usage info,", true) . "\n" . - "\t" . __("see help for the 'create' command.", true), + "\t" . __("Returns the path to the ACL object specified by . This command") . "\n" . + "\t" . __("is useful in determining the inhertiance of permissions for a certain") . "\n" . + "\t" . __("object in the tree.") . "\n" . + "\t" . __("For more detailed parameter usage info,") . "\n" . + "\t" . __("see help for the 'create' command."), - 'check' => "check [] " . __("or", true) . " all\n" . - "\t" . __("Use this command to check ACL permissions.", true) . "\n" . - "\t" . __("For more detailed parameter usage info,", true) . "\n" . - "\t" . __("see help for the 'create' command.", true), + 'check' => "check [] " . __("or") . " all\n" . + "\t" . __("Use this command to check ACL permissions.") . "\n" . + "\t" . __("For more detailed parameter usage info,") . "\n" . + "\t" . __("see help for the 'create' command."), - 'grant' => "grant [] " . __("or", true) . " all\n" . - "\t" . __("Use this command to grant ACL permissions. Once executed, the ARO", true) . "\n" . - "\t" . __("specified (and its children, if any) will have ALLOW access to the", true) . "\n" . - "\t" . __("specified ACO action (and the ACO's children, if any).", true) . "\n" . - "\t" . __("For more detailed parameter usage info,", true) . "\n" . - "\t" . __("see help for the 'create' command.", true), + 'grant' => "grant [] " . __("or") . " all\n" . + "\t" . __("Use this command to grant ACL permissions. Once executed, the ARO") . "\n" . + "\t" . __("specified (and its children, if any) will have ALLOW access to the") . "\n" . + "\t" . __("specified ACO action (and the ACO's children, if any).") . "\n" . + "\t" . __("For more detailed parameter usage info,") . "\n" . + "\t" . __("see help for the 'create' command."), - 'deny' => "deny []" . __("or", true) . " all\n" . - "\t" . __("Use this command to deny ACL permissions. Once executed, the ARO", true) . "\n" . - "\t" . __("specified (and its children, if any) will have DENY access to the", true) . "\n" . - "\t" . __("specified ACO action (and the ACO's children, if any).", true) . "\n" . - "\t" . __("For more detailed parameter usage info,", true) . "\n" . - "\t" . __("see help for the 'create' command.", true), + 'deny' => "deny []" . __("or") . " all\n" . + "\t" . __("Use this command to deny ACL permissions. Once executed, the ARO") . "\n" . + "\t" . __("specified (and its children, if any) will have DENY access to the") . "\n" . + "\t" . __("specified ACO action (and the ACO's children, if any).") . "\n" . + "\t" . __("For more detailed parameter usage info,") . "\n" . + "\t" . __("see help for the 'create' command."), - 'inherit' => "inherit []" . __("or", true) . " all\n" . - "\t" . __("Use this command to force a child ARO object to inherit its", true) . "\n" . - "\t" . __("permissions settings from its parent.", true) . "\n" . - "\t" . __("For more detailed parameter usage info,", true) . "\n" . - "\t" . __("see help for the 'create' command.", true), + 'inherit' => "inherit []" . __("or") . " all\n" . + "\t" . __("Use this command to force a child ARO object to inherit its") . "\n" . + "\t" . __("permissions settings from its parent.") . "\n" . + "\t" . __("For more detailed parameter usage info,") . "\n" . + "\t" . __("see help for the 'create' command."), 'view' => "view aro|aco []\n" . - "\t" . __("The view command will return the ARO or ACO tree.", true) . "\n" . - "\t" . __("The optional node parameter allows you to return", true) . "\n" . - "\t" . __("only a portion of the requested tree.", true) . "\n" . - "\t" . __("For more detailed parameter usage info,", true) . "\n" . - "\t" . __("see help for the 'create' command.", true), + "\t" . __("The view command will return the ARO or ACO tree.") . "\n" . + "\t" . __("The optional node parameter allows you to return") . "\n" . + "\t" . __("only a portion of the requested tree.") . "\n" . + "\t" . __("For more detailed parameter usage info,") . "\n" . + "\t" . __("see help for the 'create' command."), 'initdb' => "initdb\n". - "\t" . __("Uses this command : cake schema run create DbAcl", true), + "\t" . __("Uses this command : cake schema run create DbAcl"), 'help' => "help []\n" . - "\t" . __("Displays this help message, or a message on a specific command.", true) + "\t" . __("Displays this help message, or a message on a specific command.") ); $this->out($head); @@ -461,7 +461,7 @@ class AclShell extends Shell { } elseif (isset($commands[strtolower($this->args[0])])) { $this->out($commands[strtolower($this->args[0])] . "\n\n"); } else { - $this->out(sprintf(__("Command '%s' not found", true), $this->args[0])); + $this->out(sprintf(__("Command '%s' not found"), $this->args[0])); } } @@ -474,7 +474,7 @@ class AclShell extends Shell { return false; } if ($this->args[0] != 'aco' && $this->args[0] != 'aro') { - $this->error(sprintf(__("Missing/Unknown node type: '%s'", true), $this->args[0]), __('Please specify which ACL object type you wish to create. Either "aro" or "aco"', true)); + $this->error(sprintf(__("Missing/Unknown node type: '%s'"), $this->args[0]), __('Please specify which ACL object type you wish to create. Either "aro" or "aco"')); } } @@ -494,7 +494,7 @@ class AclShell extends Shell { $conditions = array($class . '.' . $key => $this->args[1]); $possibility = $this->Acl->{$class}->find('all', compact('conditions')); if (empty($possibility)) { - $this->error(sprintf(__("%s not found", true), $this->args[1]), __("No tree returned.", true)); + $this->error(sprintf(__('%s not found'), $this->args[1]), __('No tree returned.')); } return $possibility; } @@ -530,7 +530,7 @@ class AclShell extends Shell { if (is_array($identifier)) { $identifier = var_export($identifier, true); } - $this->error(sprintf(__('Could not find node using reference "%s"', true), $identifier)); + $this->error(sprintf(__('Could not find node using reference "%s"'), $identifier)); } return Set::extract($node, "0.{$class}.id"); } diff --git a/cake/console/libs/api.php b/cake/console/libs/api.php index 2aa6008e3..43c26a967 100644 --- a/cake/console/libs/api.php +++ b/cake/console/libs/api.php @@ -87,7 +87,7 @@ class ApiShell extends Shell { } } else { - $this->err(sprintf(__("%s not found", true), $class)); + $this->err(sprintf(__('%s not found'), $class)); $this->_stop(); } @@ -96,7 +96,7 @@ class ApiShell extends Shell { if (!empty($parsed)) { if (isset($this->params['m'])) { if (!isset($parsed[$this->params['m']])) { - $this->err(sprintf(__("%s::%s() could not be found", true), $class, $this->params['m'])); + $this->err(sprintf(__('%s::%s() could not be found'), $class, $this->params['m'])); $this->_stop(); } $method = $parsed[$this->params['m']]; @@ -113,9 +113,9 @@ class ApiShell extends Shell { $this->out($list); $methods = array_keys($parsed); - while ($number = strtolower($this->in(__('Select a number to see the more information about a specific method. q to quit. l to list.', true), null, 'q'))) { + while ($number = strtolower($this->in(__('Select a number to see the more information about a specific method. q to quit. l to list.'), null, 'q'))) { if ($number === 'q') { - $this->out(__('Done', true)); + $this->out(__('Done')); $this->_stop(); } @@ -185,7 +185,7 @@ class ApiShell extends Shell { $File = new File($path); if (!$File->exists()) { - $this->err(sprintf(__("%s could not be found", true), $File->name)); + $this->err(sprintf(__('%s could not be found'), $File->name)); $this->_stop(); } diff --git a/cake/console/libs/bake.php b/cake/console/libs/bake.php index 2c619838b..b3aabcd54 100644 --- a/cake/console/libs/bake.php +++ b/cake/console/libs/bake.php @@ -76,7 +76,7 @@ class BakeShell extends Shell { } if (!config('database')) { - $this->out(__("Your database configuration was not found. Take a moment to create one.", true)); + $this->out(__('Your database configuration was not found. Take a moment to create one.')); $this->args = null; return $this->DbConfig->execute(); } @@ -91,7 +91,7 @@ class BakeShell extends Shell { $this->out('[T]est case'); $this->out('[Q]uit'); - $classToBake = strtoupper($this->in(__('What would you like to Bake?', true), array('D', 'M', 'V', 'C', 'P', 'F', 'T', 'Q'))); + $classToBake = strtoupper($this->in(__('What would you like to Bake?'), array('D', 'M', 'V', 'C', 'P', 'F', 'T', 'Q'))); switch ($classToBake) { case 'D': $this->DbConfig->execute(); @@ -118,7 +118,7 @@ class BakeShell extends Shell { exit(0); break; default: - $this->out(__('You have made an invalid selection. Please choose a type of class to Bake by entering D, M, V, F, T, or C.', true)); + $this->out(__('You have made an invalid selection. Please choose a type of class to Bake by entering D, M, V, F, T, or C.')); } $this->hr(); $this->main(); @@ -164,7 +164,7 @@ class BakeShell extends Shell { $modelBaked = $this->Model->bake($object, false); if ($modelBaked && $modelExists === false) { - $this->out(sprintf(__('%s Model was baked.', true), $model)); + $this->out(sprintf(__('%s Model was baked.'), $model)); if ($this->_checkUnitTest()) { $this->Model->bakeFixture($model); $this->Model->bakeTest($model); @@ -175,7 +175,7 @@ class BakeShell extends Shell { if ($modelExists === true) { $controller = $this->_controllerName($name); if ($this->Controller->bake($controller, $this->Controller->bakeActions($controller))) { - $this->out(sprintf(__('%s Controller was baked.', true), $name)); + $this->out(sprintf(__('%s Controller was baked.'), $name)); if ($this->_checkUnitTest()) { $this->Controller->bakeTest($controller); } @@ -183,12 +183,12 @@ class BakeShell extends Shell { if (App::import('Controller', $controller)) { $this->View->args = array($controller); $this->View->execute(); - $this->out(sprintf(__('%s Views were baked.', true), $name)); + $this->out(sprintf(__('%s Views were baked.'), $name)); } - $this->out(__('Bake All complete', true)); + $this->out(__('Bake All complete')); array_shift($this->args); } else { - $this->err(__('Bake All could not continue without a valid model', true)); + $this->err(__('Bake All could not continue without a valid model')); } $this->_stop(); } @@ -221,7 +221,6 @@ class BakeShell extends Shell { $this->out("\n\tbake fixture\n\t\tbakes fixtures. run 'bake fixture help' for more info."); $this->out("\n\tbake test\n\t\tbakes unit tests. run 'bake test help' for more info."); $this->out(); - } } ?> \ No newline at end of file diff --git a/cake/console/libs/i18n.php b/cake/console/libs/i18n.php index 24e7caf89..c01bd9e2f 100644 --- a/cake/console/libs/i18n.php +++ b/cake/console/libs/i18n.php @@ -54,7 +54,7 @@ class I18nShell extends Shell { if ($this->command && !in_array($this->command, array('help'))) { if (!config('database')) { - $this->out(__('Your database configuration was not found. Take a moment to create one.', true), true); + $this->out(__('Your database configuration was not found. Take a moment to create one.'), true); return $this->DbConfig->execute(); } } @@ -65,14 +65,14 @@ class I18nShell extends Shell { * */ public function main() { - $this->out(__('I18n Shell', true)); + $this->out(__('I18n Shell')); $this->hr(); - $this->out(__('[E]xtract POT file from sources', true)); - $this->out(__('[I]nitialize i18n database table', true)); - $this->out(__('[H]elp', true)); - $this->out(__('[Q]uit', true)); + $this->out(__('[E]xtract POT file from sources')); + $this->out(__('[I]nitialize i18n database table')); + $this->out(__('[H]elp')); + $this->out(__('[Q]uit')); - $choice = strtolower($this->in(__('What would you like to do?', true), array('E', 'I', 'H', 'Q'))); + $choice = strtolower($this->in(__('What would you like to do?'), array('E', 'I', 'H', 'Q'))); switch ($choice) { case 'e': $this->Extract->execute(); @@ -87,7 +87,7 @@ class I18nShell extends Shell { exit(0); break; default: - $this->out(__('You have made an invalid selection. Please choose a command to execute by entering E, I, H, or Q.', true)); + $this->out(__('You have made an invalid selection. Please choose a command to execute by entering E, I, H, or Q.')); } $this->hr(); $this->main(); @@ -108,12 +108,12 @@ class I18nShell extends Shell { */ public function help() { $this->hr(); - $this->out(__('I18n Shell:', true)); + $this->out(__('I18n Shell:')); $this->hr(); - $this->out(__('I18n Shell initializes i18n database table for your application', true)); - $this->out(__('and generates .pot file(s) with translations.', true)); + $this->out(__('I18n Shell initializes i18n database table for your application')); + $this->out(__('and generates .pot file(s) with translations.')); $this->hr(); - $this->out(__('usage:', true)); + $this->out(__('usage:')); $this->out(' cake i18n help'); $this->out(' cake i18n initdb [-datasource custom]'); $this->out(); diff --git a/cake/console/libs/schema.php b/cake/console/libs/schema.php index 78117f971..eb5ed6650 100644 --- a/cake/console/libs/schema.php +++ b/cake/console/libs/schema.php @@ -112,7 +112,7 @@ class SchemaShell extends Shell { $this->_stop(); } else { $file = $this->Schema->path . DS . $this->params['file']; - $this->err(sprintf(__('Schema file (%s) could not be found.', true), $file)); + $this->err(sprintf(__('Schema file (%s) could not be found.'), $file)); $this->_stop(); } } @@ -123,7 +123,7 @@ class SchemaShell extends Shell { * */ public function generate() { - $this->out(__('Generating Schema...', true)); + $this->out(__('Generating Schema...')); $options = array(); if (isset($this->params['f'])) { $options = array('models' => false); @@ -177,10 +177,10 @@ class SchemaShell extends Shell { } if ($this->Schema->write($content)) { - $this->out(sprintf(__('Schema file: %s generated', true), $content['file'])); + $this->out(sprintf(__('Schema file: %s generated'), $content['file'])); $this->_stop(); } else { - $this->err(__('Schema file: %s generated', true)); + $this->err(__('Schema file: %s generated')); $this->_stop(); } } @@ -197,7 +197,7 @@ class SchemaShell extends Shell { $write = false; $Schema = $this->Schema->load(); if (!$Schema) { - $this->err(__('Schema could not be loaded', true)); + $this->err(__('Schema could not be loaded')); $this->_stop(); } if (isset($this->params['write'])) { @@ -222,10 +222,10 @@ class SchemaShell extends Shell { } if ($File->write($contents)) { - $this->out(sprintf(__('SQL dump file created in %s', true), $File->pwd())); + $this->out(sprintf(__('SQL dump file created in %s'), $File->pwd())); $this->_stop(); } else { - $this->err(__('SQL dump could not be created', true)); + $this->err(__('SQL dump could not be created')); $this->_stop(); } } @@ -269,7 +269,7 @@ class SchemaShell extends Shell { if (isset($this->params['dry'])) { $this->__dry = true; - $this->out(__('Performing a dry run.', true)); + $this->out(__('Performing a dry run.')); } $options = array('name' => $name, 'plugin' => $plugin); @@ -281,7 +281,7 @@ class SchemaShell extends Shell { $Schema =& $this->Schema->load($options); if (!$Schema) { - $this->err(sprintf(__('%s could not be loaded', true), $this->Schema->path . DS . $this->Schema->file)); + $this->err(sprintf(__('%s could not be loaded'), $this->Schema->path . DS . $this->Schema->file)); $this->_stop(); } $table = null; @@ -312,26 +312,26 @@ class SchemaShell extends Shell { $create[$table] = $db->createSchema($Schema, $table); } if (empty($drop) || empty($create)) { - $this->out(__('Schema is up to date.', true)); + $this->out(__('Schema is up to date.')); $this->_stop(); } - $this->out("\n" . __('The following table(s) will be dropped.', true)); + $this->out("\n" . __('The following table(s) will be dropped.')); $this->out(array_keys($drop)); - if ('y' == $this->in(__('Are you sure you want to drop the table(s)?', true), array('y', 'n'), 'n')) { - $this->out(__('Dropping table(s).', true)); + if ('y' == $this->in(__('Are you sure you want to drop the table(s)?'), array('y', 'n'), 'n')) { + $this->out(__('Dropping table(s).')); $this->__run($drop, 'drop', $Schema); } - $this->out("\n" . __('The following table(s) will be created.', true)); + $this->out("\n" . __('The following table(s) will be created.')); $this->out(array_keys($create)); - if ('y' == $this->in(__('Are you sure you want to create the table(s)?', true), array('y', 'n'), 'y')) { - $this->out(__('Creating table(s).', true)); + if ('y' == $this->in(__('Are you sure you want to create the table(s)?'), array('y', 'n'), 'y')) { + $this->out(__('Creating table(s).')); $this->__run($create, 'create', $Schema); } - $this->out(__('End create.', true)); + $this->out(__('End create.')); } /** @@ -343,7 +343,7 @@ class SchemaShell extends Shell { function __update(&$Schema, $table = null) { $db =& ConnectionManager::getDataSource($this->Schema->connection); - $this->out(__('Comparing Database to Schema...', true)); + $this->out(__('Comparing Database to Schema...')); $options = array(); if (isset($this->params['f'])) { $options['models'] = false; @@ -362,19 +362,19 @@ class SchemaShell extends Shell { } if (empty($contents)) { - $this->out(__('Schema is up to date.', true)); + $this->out(__('Schema is up to date.')); $this->_stop(); } - $this->out("\n" . __('The following statements will run.', true)); + $this->out("\n" . __('The following statements will run.')); $this->out(array_map('trim', $contents)); - if ('y' == $this->in(__('Are you sure you want to alter the tables?', true), array('y', 'n'), 'n')) { + if ('y' == $this->in(__('Are you sure you want to alter the tables?'), array('y', 'n'), 'n')) { $this->out(); - $this->out(__('Updating Database...', true)); + $this->out(__('Updating Database...')); $this->__run($contents, 'update', $Schema); } - $this->out(__('End update.', true)); + $this->out(__('End update.')); } /** @@ -384,7 +384,7 @@ class SchemaShell extends Shell { */ function __run($contents, $event, &$Schema) { if (empty($contents)) { - $this->err(__('Sql could not be run', true)); + $this->err(__('Sql could not be run')); return; } Configure::write('debug', 2); @@ -392,10 +392,10 @@ class SchemaShell extends Shell { foreach ($contents as $table => $sql) { if (empty($sql)) { - $this->out(sprintf(__('%s is up to date.', true), $table)); + $this->out(sprintf(__('%s is up to date.'), $table)); } else { if ($this->__dry === true) { - $this->out(sprintf(__('Dry run for %s :', true), $table)); + $this->out(sprintf(__('Dry run for %s :'), $table)); $this->out($sql); } else { if (!$Schema->before(array($event => $table))) { @@ -411,7 +411,7 @@ class SchemaShell extends Shell { if (!empty($error)) { $this->out($error); } else { - $this->out(sprintf(__('%s updated.', true), $table)); + $this->out(sprintf(__('%s updated.'), $table)); } } } diff --git a/cake/console/libs/shell.php b/cake/console/libs/shell.php index ecef15975..e3fe0ee03 100644 --- a/cake/console/libs/shell.php +++ b/cake/console/libs/shell.php @@ -408,7 +408,7 @@ class Shell extends Object { * @param string $message An optional error message */ public function error($title, $message = null) { - $this->err(sprintf(__('Error: %s', true), $title)); + $this->err(sprintf(__('Error: %s'), $title)); if (!empty($message)) { $this->err($message); @@ -446,17 +446,17 @@ class Shell extends Object { $path = str_replace(DS . DS, DS, $path); $this->out(); - $this->out(sprintf(__("Creating file %s", true), $path)); + $this->out(sprintf(__('Creating file %s'), $path)); if (is_file($path) && $this->interactive === true) { - $prompt = sprintf(__('File `%s` exists, overwrite?', true), $path); + $prompt = sprintf(__('File `%s` exists, overwrite?'), $path); $key = $this->in($prompt, array('y', 'n', 'q'), 'n'); if (strtolower($key) == 'q') { - $this->out(__('Quitting.', true), 2); + $this->out(__('Quitting.'), 2); $this->_stop(); } elseif (strtolower($key) != 'y') { - $this->out(sprintf(__('Skip `%s`', true), $path), 2); + $this->out(sprintf(__('Skip `%s`'), $path), 2); return false; } } @@ -467,10 +467,10 @@ class Shell extends Object { if ($File = new File($path, true)) { $data = $File->prepare($contents); $File->write($data); - $this->out(sprintf(__('Wrote `%s`', true), $path)); + $this->out(sprintf(__('Wrote `%s`'), $path)); return true; } else { - $this->err(sprintf(__('Could not write to `%s`.', true), $path), 2); + $this->err(sprintf(__('Could not write to `%s`.'), $path), 2); return false; } } diff --git a/cake/console/libs/tasks/controller.php b/cake/console/libs/tasks/controller.php index c42cdc597..48041ec44 100644 --- a/cake/console/libs/tasks/controller.php +++ b/cake/console/libs/tasks/controller.php @@ -72,12 +72,12 @@ class ControllerTask extends BakeTask { $actions = 'scaffold'; if (!empty($this->args[1]) && ($this->args[1] == 'public' || $this->args[1] == 'scaffold')) { - $this->out(__('Baking basic crud methods for ', true) . $controller); + $this->out(__('Baking basic crud methods for ') . $controller); $actions = $this->bakeActions($controller); } elseif (!empty($this->args[1]) && $this->args[1] == 'admin') { $admin = $this->Project->getPrefix(); if ($admin) { - $this->out(sprintf(__('Adding %s methods', true), $admin)); + $this->out(sprintf(__('Adding %s methods'), $admin)); $actions = $this->bakeActions($controller, $admin); } } @@ -85,7 +85,7 @@ class ControllerTask extends BakeTask { if (!empty($this->args[2]) && $this->args[2] == 'admin') { $admin = $this->Project->getPrefix(); if ($admin) { - $this->out(sprintf(__('Adding %s methods', true), $admin)); + $this->out(sprintf(__('Adding %s methods'), $admin)); $actions .= "\n" . $this->bakeActions($controller, $admin); } } @@ -129,7 +129,7 @@ class ControllerTask extends BakeTask { function __interactive() { $this->interactive = true; $this->hr(); - $this->out(sprintf(__("Bake Controller\nPath: %s", true), $this->path)); + $this->out(sprintf(__("Bake Controller\nPath: %s"), $this->path)); $this->hr(); if (empty($this->connection)) { @@ -138,7 +138,7 @@ class ControllerTask extends BakeTask { $controllerName = $this->getName(); $this->hr(); - $this->out(sprintf(__('Baking %sController', true), $controllerName)); + $this->out(sprintf(__('Baking %sController'), $controllerName)); $this->hr(); $helpers = $components = array(); @@ -150,16 +150,16 @@ class ControllerTask extends BakeTask { $controllerFile = strtolower(Inflector::underscore($controllerName)); - $question[] = __("Would you like to build your controller interactively?", true); + $question[] = __("Would you like to build your controller interactively?"); if (file_exists($this->path . $controllerFile .'_controller.php')) { - $question[] = sprintf(__("Warning: Choosing no will overwrite the %sController.", true), $controllerName); + $question[] = sprintf(__("Warning: Choosing no will overwrite the %sController."), $controllerName); } $doItInteractive = $this->in(implode("\n", $question), array('y','n'), 'y'); if (strtolower($doItInteractive) == 'y') { $this->interactive = true; $useDynamicScaffold = $this->in( - __("Would you like to use dynamic scaffolding?", true), array('y','n'), 'n' + __("Would you like to use dynamic scaffolding?"), array('y','n'), 'n' ); if (strtolower($useDynamicScaffold) == 'y') { @@ -172,7 +172,7 @@ class ControllerTask extends BakeTask { $components = $this->doComponents(); $wannaUseSession = $this->in( - __("Would you like to use Session flash messages?", true), array('y','n'), 'y' + __("Would you like to use Session flash messages?"), array('y','n'), 'y' ); } } else { @@ -189,7 +189,7 @@ class ControllerTask extends BakeTask { if ($this->interactive === true) { $this->confirmController($controllerName, $useDynamicScaffold, $helpers, $components); - $looksGood = $this->in(__('Look okay?', true), array('y','n'), 'y'); + $looksGood = $this->in(__('Look okay?'), array('y','n'), 'y'); if (strtolower($looksGood) == 'y') { $baked = $this->bake($controllerName, $actions, $helpers, $components); @@ -213,17 +213,17 @@ class ControllerTask extends BakeTask { function confirmController($controllerName, $useDynamicScaffold, $helpers, $components) { $this->out(); $this->hr(); - $this->out(__('The following controller will be created:', true)); + $this->out(__('The following controller will be created:')); $this->hr(); - $this->out(sprintf(__("Controller Name:\n\t%s", true), $controllerName)); + $this->out(sprintf(__("Controller Name:\n\t%s"), $controllerName)); if (strtolower($useDynamicScaffold) == 'y') { $this->out("var \$scaffold;"); } $properties = array( - 'helpers' => __("Helpers:", true), - 'components' => __('Components:', true), + 'helpers' => __('Helpers:'), + 'components' => __('Components:'), ); foreach ($properties as $var => $title) { @@ -250,11 +250,11 @@ class ControllerTask extends BakeTask { */ function _askAboutMethods() { $wannaBakeCrud = $this->in( - __("Would you like to create some basic class methods \n(index(), add(), view(), edit())?", true), + __("Would you like to create some basic class methods \n(index(), add(), view(), edit())?"), array('y','n'), 'n' ); $wannaBakeAdminCrud = $this->in( - __("Would you like to create the basic class methods for admin routing?", true), + __("Would you like to create the basic class methods for admin routing?"), array('y','n'), 'n' ); return array($wannaBakeCrud, $wannaBakeAdminCrud); @@ -275,7 +275,7 @@ class ControllerTask extends BakeTask { $modelImport = $this->plugin . '.' . $modelImport; } if (!App::import('Model', $modelImport)) { - $this->err(__('You must have a model for this class to build basic methods. Please try again.', true)); + $this->err(__('You must have a model for this class to build basic methods. Please try again.')); $this->_stop(); } @@ -339,8 +339,8 @@ class ControllerTask extends BakeTask { */ function doHelpers() { return $this->_doPropertyChoices( - __("Would you like this controller to use other helpers\nbesides HtmlHelper and FormHelper?", true), - __("Please provide a comma separated list of the other\nhelper names you'd like to use.\nExample: 'Ajax, Javascript, Time'", true) + __("Would you like this controller to use other helpers\nbesides HtmlHelper and FormHelper?"), + __("Please provide a comma separated list of the other\nhelper names you'd like to use.\nExample: 'Ajax, Javascript, Time'") ); } @@ -351,8 +351,8 @@ class ControllerTask extends BakeTask { */ function doComponents() { return $this->_doPropertyChoices( - __("Would you like this controller to use any components?", true), - __("Please provide a comma separated list of the component names you'd like to use.\nExample: 'Acl, Security, RequestHandler'", true) + __("Would you like this controller to use any components?"), + __("Please provide a comma separated list of the component names you'd like to use.\nExample: 'Acl, Security, RequestHandler'") ); } @@ -388,7 +388,7 @@ class ControllerTask extends BakeTask { $this->__tables = $this->Model->getAllTables($useDbConfig); if ($this->interactive == true) { - $this->out(__('Possible Controllers based on your current database:', true)); + $this->out(__('Possible Controllers based on your current database:')); $this->_controllerNames = array(); $count = count($this->__tables); for ($i = 0; $i < $count; $i++) { @@ -411,15 +411,15 @@ class ControllerTask extends BakeTask { $enteredController = ''; while ($enteredController == '') { - $enteredController = $this->in(__("Enter a number from the list above,\ntype in the name of another controller, or 'q' to exit", true), null, 'q'); + $enteredController = $this->in(__("Enter a number from the list above,\ntype in the name of another controller, or 'q' to exit"), null, 'q'); if ($enteredController === 'q') { - $this->out(__("Exit", true)); + $this->out(__('Exit')); $this->_stop(); } if ($enteredController == '' || intval($enteredController) > count($controllers)) { - $this->err(__("The Controller name you supplied was empty,\nor the number you selected was not an option. Please try again.", true)); + $this->err(__("The Controller name you supplied was empty,\nor the number you selected was not an option. Please try again.")); $enteredController = ''; } } diff --git a/cake/console/libs/tasks/db_config.php b/cake/console/libs/tasks/db_config.php index 788bdc1b5..135c76e3b 100644 --- a/cake/console/libs/tasks/db_config.php +++ b/cake/console/libs/tasks/db_config.php @@ -358,7 +358,7 @@ class DbConfigTask extends Shell { $connections = array_keys($configs); if (count($connections) > 1) { - $useDbConfig = $this->in(__('Use Database Config', true) .':', $connections, 'default'); + $useDbConfig = $this->in(__('Use Database Config') .':', $connections, 'default'); } return $useDbConfig; } diff --git a/cake/console/libs/tasks/extract.php b/cake/console/libs/tasks/extract.php index 23a0af778..2e5866859 100644 --- a/cake/console/libs/tasks/extract.php +++ b/cake/console/libs/tasks/extract.php @@ -104,11 +104,11 @@ class ExtractTask extends Shell { $this->__paths = explode(',', $this->params['paths']); } else { $defaultPath = $this->params['working']; - $message = sprintf(__("What is the full path you would like to extract?\nExample: %s\n[Q]uit [D]one", true), $this->params['root'] . DS . 'myapp'); + $message = sprintf(__("What is the full path you would like to extract?\nExample: %s\n[Q]uit [D]one"), $this->params['root'] . DS . 'myapp'); while (true) { $response = $this->in($message, null, $defaultPath); if (strtoupper($response) === 'Q') { - $this->out(__('Extract Aborted', true)); + $this->out(__('Extract Aborted')); $this->_stop(); } elseif (strtoupper($response) === 'D') { $this->out(); @@ -117,7 +117,7 @@ class ExtractTask extends Shell { $this->__paths[] = $response; $defaultPath = 'D'; } else { - $this->err(__('The directory path you supplied was not found. Please try again.', true)); + $this->err(__('The directory path you supplied was not found. Please try again.')); } $this->out(); } @@ -126,17 +126,17 @@ class ExtractTask extends Shell { if (isset($this->params['output'])) { $this->__output = $this->params['output']; } else { - $message = sprintf(__("What is the full path you would like to output?\nExample: %s\n[Q]uit", true), $this->__paths[0] . DS . 'locale'); + $message = sprintf(__("What is the full path you would like to output?\nExample: %s\n[Q]uit"), $this->__paths[0] . DS . 'locale'); while (true) { $response = $this->in($message, null, $this->__paths[0] . DS . 'locale'); if (strtoupper($response) === 'Q') { - $this->out(__('Extract Aborted', true)); + $this->out(__('Extract Aborted')); $this->_stop(); } elseif (is_dir($response)) { $this->__output = $response . DS; break; } else { - $this->err(__('The directory path you supplied was not found. Please try again.', true)); + $this->err(__('The directory path you supplied was not found. Please try again.')); } $this->out(); } @@ -146,7 +146,7 @@ class ExtractTask extends Shell { $this->__merge = !(strtolower($this->params['merge']) === 'no'); } else { $this->out(); - $response = $this->in(sprintf(__('Would you like to merge all domains strings into the default.pot file?', true)), array('y', 'n'), 'n'); + $response = $this->in(sprintf(__('Would you like to merge all domains strings into the default.pot file?')), array('y', 'n'), 'n'); $this->__merge = strtolower($response) === 'y'; } @@ -165,13 +165,13 @@ class ExtractTask extends Shell { function __extract() { $this->out(); $this->out(); - $this->out(__('Extracting...', true)); + $this->out(__('Extracting...')); $this->hr(); - $this->out(__('Paths:', true)); + $this->out(__('Paths:')); foreach ($this->__paths as $path) { $this->out(' ' . $path); } - $this->out(__('Output Directory: ', true) . $this->__output); + $this->out(__('Output Directory: ') . $this->__output); $this->hr(); $this->__extractTokens(); $this->__buildFiles(); @@ -179,7 +179,7 @@ class ExtractTask extends Shell { $this->__paths = $this->__files = $this->__storage = array(); $this->__strings = $this->__tokens = array(); $this->out(); - $this->out(__('Done.', true)); + $this->out(__('Done.')); } /** @@ -188,25 +188,25 @@ class ExtractTask extends Shell { * @return void */ public function help() { - $this->out(__('CakePHP Language String Extraction:', true)); + $this->out(__('CakePHP Language String Extraction:')); $this->hr(); - $this->out(__('The Extract script generates .pot file(s) with translations', true)); - $this->out(__('By default the .pot file(s) will be place in the locale directory of -app', true)); - $this->out(__('By default -app is ROOT/app', true)); + $this->out(__('The Extract script generates .pot file(s) with translations')); + $this->out(__('By default the .pot file(s) will be place in the locale directory of -app')); + $this->out(__('By default -app is ROOT/app')); $this->hr(); - $this->out(__('Usage: cake i18n extract ...', true)); + $this->out(__('Usage: cake i18n extract ...')); $this->out(); - $this->out(__('Params:', true)); - $this->out(__(' -app [path...]: directory where your application is located', true)); - $this->out(__(' -root [path...]: path to install', true)); - $this->out(__(' -core [path...]: path to cake directory', true)); - $this->out(__(' -paths [comma separated list of paths, full path is needed]', true)); - $this->out(__(' -merge [yes|no]: Merge all domains strings into the default.pot file', true)); - $this->out(__(' -output [path...]: Full path to output directory', true)); - $this->out(__(' -files: [comma separated list of files, full path to file is needed]', true)); + $this->out(__('Params:')); + $this->out(__(' -app [path...]: directory where your application is located')); + $this->out(__(' -root [path...]: path to install')); + $this->out(__(' -core [path...]: path to cake directory')); + $this->out(__(' -paths [comma separated list of paths, full path is needed]')); + $this->out(__(' -merge [yes|no]: Merge all domains strings into the default.pot file')); + $this->out(__(' -output [path...]: Full path to output directory')); + $this->out(__(' -files: [comma separated list of files, full path to file is needed]')); $this->out(); - $this->out(__('Commands:', true)); - $this->out(__(' cake i18n extract help: Shows this help message.', true)); + $this->out(__('Commands:')); + $this->out(__(' cake i18n extract help: Shows this help message.')); $this->out(); } @@ -219,7 +219,7 @@ class ExtractTask extends Shell { function __extractTokens() { foreach ($this->__files as $file) { $this->__file = $file; - $this->out(sprintf(__('Processing %s...', true), $file)); + $this->out(sprintf(__('Processing %s...'), $file)); $code = file_get_contents($file); $allTokens = token_get_all($code); @@ -382,11 +382,11 @@ class ExtractTask extends Shell { $response = ''; while ($overwriteAll === false && $File->exists() && strtoupper($response) !== 'Y') { $this->out(); - $response = $this->in(sprintf(__('Error: %s already exists in this location. Overwrite? [Y]es, [N]o, [A]ll', true), $filename), array('y', 'n', 'a'), 'y'); + $response = $this->in(sprintf(__('Error: %s already exists in this location. Overwrite? [Y]es, [N]o, [A]ll'), $filename), array('y', 'n', 'a'), 'y'); if (strtoupper($response) === 'N') { $response = ''; while ($response == '') { - $response = $this->in(sprintf(__("What would you like to name this file?\nExample: %s", true), 'new_' . $filename), null, 'new_' . $filename); + $response = $this->in(sprintf(__("What would you like to name this file?\nExample: %s"), 'new_' . $filename), null, 'new_' . $filename); $File = new File($this->__output . $response); $filename = $response; } @@ -454,7 +454,7 @@ class ExtractTask extends Shell { * @access private */ function __markerError($file, $line, $marker, $count) { - $this->out(sprintf(__("Invalid marker content in %s:%s\n* %s(", true), $file, $line, $marker), true); + $this->out(sprintf(__("Invalid marker content in %s:%s\n* %s("), $file, $line, $marker), true); $count += 2; $tokenCount = count($this->__tokens); $parenthesis = 1; diff --git a/cake/console/libs/tasks/fixture.php b/cake/console/libs/tasks/fixture.php index 300c97dab..929e089ee 100644 --- a/cake/console/libs/tasks/fixture.php +++ b/cake/console/libs/tasks/fixture.php @@ -127,16 +127,16 @@ class FixtureTask extends BakeTask { */ public function importOptions($modelName) { $options = array(); - $doSchema = $this->in(__('Would you like to import schema for this fixture?', true), array('y', 'n'), 'n'); + $doSchema = $this->in(__('Would you like to import schema for this fixture?'), array('y', 'n'), 'n'); if ($doSchema == 'y') { $options['schema'] = $modelName; } - $doRecords = $this->in(__('Would you like to use record importing for this fixture?', true), array('y', 'n'), 'n'); + $doRecords = $this->in(__('Would you like to use record importing for this fixture?'), array('y', 'n'), 'n'); if ($doRecords == 'y') { $options['records'] = true; } if ($doRecords == 'n') { - $prompt = sprintf(__("Would you like to build this fixture with data from %s's table?", true), $modelName); + $prompt = sprintf(__("Would you like to build this fixture with data from %s's table?"), $modelName); $fromTable = $this->in($prompt, array('y', 'n'), 'n'); if (strtolower($fromTable) == 'y') { $options['fromTable'] = true; @@ -356,7 +356,7 @@ class FixtureTask extends BakeTask { protected function _getRecordsFromTable($modelName, $useTable = null) { if ($this->interactive) { $condition = null; - $prompt = __("Please provide a SQL fragment to use as conditions\nExample: WHERE 1=1 LIMIT 10", true); + $prompt = __("Please provide a SQL fragment to use as conditions\nExample: WHERE 1=1 LIMIT 10"); while (!$condition) { $condition = $this->in($prompt, null, 'WHERE 1=1 LIMIT 10'); } diff --git a/cake/console/libs/tasks/model.php b/cake/console/libs/tasks/model.php index e9691cd3a..0544b6c8d 100644 --- a/cake/console/libs/tasks/model.php +++ b/cake/console/libs/tasks/model.php @@ -111,7 +111,7 @@ class ModelTask extends BakeTask { continue; } $modelClass = Inflector::classify($table); - $this->out(sprintf(__('Baking %s', true), $modelClass)); + $this->out(sprintf(__('Baking %s'), $modelClass)); $object = $this->_getModelObject($modelClass); if ($this->bake($object, false) && $unitTestExists) { $this->bakeFixture($modelClass); @@ -150,7 +150,7 @@ class ModelTask extends BakeTask { $this->out($i + 1 .'. ' . $option); } if (empty($prompt)) { - $prompt = __('Make a selection from the choices above', true); + $prompt = __('Make a selection from the choices above'); } $choice = $this->in($prompt, null, $default); if (intval($choice) > 0 && intval($choice) <= $max) { @@ -189,7 +189,7 @@ class ModelTask extends BakeTask { $primaryKey = $this->findPrimaryKey($fields); } } else { - $this->err(sprintf(__('Table %s does not exist, cannot bake a model without a table.', true), $useTable)); + $this->err(sprintf(__('Table %s does not exist, cannot bake a model without a table.'), $useTable)); $this->_stop(); return false; } @@ -198,13 +198,13 @@ class ModelTask extends BakeTask { $displayField = $this->findDisplayField($tempModel->schema()); } - $prompt = __("Would you like to supply validation criteria \nfor the fields in your model?", true); + $prompt = __("Would you like to supply validation criteria \nfor the fields in your model?"); $wannaDoValidation = $this->in($prompt, array('y','n'), 'y'); if (array_search($useTable, $this->_tables) !== false && strtolower($wannaDoValidation) == 'y') { $validate = $this->doValidation($tempModel); } - $prompt = __("Would you like to define model associations\n(hasMany, hasOne, belongsTo, etc.)?", true); + $prompt = __("Would you like to define model associations\n(hasMany, hasOne, belongsTo, etc.)?"); $wannaDoAssoc = $this->in($prompt, array('y','n'), 'y'); if (strtolower($wannaDoAssoc) == 'y') { $associations = $this->doAssociations($tempModel); @@ -212,24 +212,24 @@ class ModelTask extends BakeTask { $this->out(); $this->hr(); - $this->out(__('The following Model will be created:', true)); + $this->out(__('The following Model will be created:')); $this->hr(); $this->out("Name: " . $currentModelName); if ($this->connection !== 'default') { - $this->out(sprintf(__("DB Config: %s", true), $this->connection)); + $this->out(sprintf(__("DB Config: %s"), $this->connection)); } if ($fullTableName !== Inflector::tableize($currentModelName)) { - $this->out(sprintf(__("DB Table: %s", true), $fullTableName)); + $this->out(sprintf(__('DB Table: %s'), $fullTableName)); } if ($primaryKey != 'id') { - $this->out(sprintf(__("Primary Key: %s", true), $primaryKey)); + $this->out(sprintf(__('Primary Key: %s'), $primaryKey)); } if (!empty($validate)) { - $this->out(sprintf(__("Validation: %s", true), print_r($validate, true))); + $this->out(sprintf(__('Validation: %s'), print_r($validate, true))); } if (!empty($associations)) { - $this->out(__("Associations:", true)); + $this->out(__('Associations:')); $assocKeys = array('belongsTo', 'hasOne', 'hasMany', 'hasAndBelongsToMany'); foreach ($assocKeys as $assocKey) { $this->_printAssociation($currentModelName, $assocKey, $associations); @@ -237,7 +237,7 @@ class ModelTask extends BakeTask { } $this->hr(); - $looksGood = $this->in(__('Look okay?', true), array('y','n'), 'y'); + $looksGood = $this->in(__('Look okay?'), array('y','n'), 'y'); if (strtolower($looksGood) == 'y') { $vars = compact('associations', 'validate', 'primaryKey', 'useTable', 'displayField'); @@ -283,7 +283,7 @@ class ModelTask extends BakeTask { break; } } - return $this->in(__('What is the primaryKey?', true), null, $name); + return $this->in(__('What is the primaryKey?'), null, $name); } /** @@ -294,12 +294,12 @@ class ModelTask extends BakeTask { */ function findDisplayField($fields) { $fieldNames = array_keys($fields); - $prompt = __("A displayField could not be automatically detected\nwould you like to choose one?", true); + $prompt = __("A displayField could not be automatically detected\nwould you like to choose one?"); $continue = $this->in($prompt, array('y', 'n')); if (strtolower($continue) == 'n') { return false; } - $prompt = __('Choose a field from the options above:', true); + $prompt = __('Choose a field from the options above:'); $choice = $this->inOptions($fieldNames, $prompt); return $fieldNames[$choice]; } @@ -369,10 +369,10 @@ class ModelTask extends BakeTask { while ($anotherValidator == 'y') { if ($this->interactive) { $this->out(); - $this->out(sprintf(__('Field: %s', true), $fieldName)); - $this->out(sprintf(__('Type: %s', true), $metaData['type'])); + $this->out(sprintf(__('Field: %s'), $fieldName)); + $this->out(sprintf(__('Type: %s'), $metaData['type'])); $this->hr(); - $this->out(__('Please select one of the following validation options:', true)); + $this->out(__('Please select one of the following validation options:')); $this->hr(); } @@ -380,8 +380,8 @@ class ModelTask extends BakeTask { for ($i = 1; $i < $defaultChoice; $i++) { $prompt .= $i . ' - ' . $this->_validations[$i] . "\n"; } - $prompt .= sprintf(__("%s - Do not do any validation on this field.\n", true), $defaultChoice); - $prompt .= __("... or enter in a valid regex validation string.\n", true); + $prompt .= sprintf(__("%s - Do not do any validation on this field.\n"), $defaultChoice); + $prompt .= __("... or enter in a valid regex validation string.\n"); $methods = array_flip($this->_validations); $guess = $defaultChoice; @@ -404,11 +404,11 @@ class ModelTask extends BakeTask { if ($this->interactive === true) { $choice = $this->in($prompt, null, $guess); if (in_array($choice, $alreadyChosen)) { - $this->out(__("You have already chosen that validation rule,\nplease choose again", true)); + $this->out(__("You have already chosen that validation rule,\nplease choose again")); continue; } if (!isset($this->_validations[$choice]) && is_numeric($choice)) { - $this->out(__('Please make a valid selection.', true)); + $this->out(__('Please make a valid selection.')); continue; } $alreadyChosen[] = $choice; @@ -430,7 +430,7 @@ class ModelTask extends BakeTask { } } if ($this->interactive == true && $choice != $defaultChoice) { - $anotherValidator = $this->in(__('Would you like to add another validation rule?', true), array('y', 'n'), 'n'); + $anotherValidator = $this->in(__('Would you like to add another validation rule?'), array('y', 'n'), 'n'); } else { $anotherValidator = 'n'; } @@ -449,7 +449,7 @@ class ModelTask extends BakeTask { return false; } if ($this->interactive === true) { - $this->out(__('One moment while the associations are detected.', true)); + $this->out(__('One moment while the associations are detected.')); } $fields = $model->schema(true); @@ -477,9 +477,9 @@ class ModelTask extends BakeTask { if ($this->interactive === true) { $this->hr(); if (empty($associations)) { - $this->out(__('None found.', true)); + $this->out(__('None found.')); } else { - $this->out(__('Please confirm the following associations:', true)); + $this->out(__('Please confirm the following associations:')); $this->hr(); $associations = $this->confirmAssociations($model, $associations); } @@ -636,19 +636,19 @@ class ModelTask extends BakeTask { * @return array Array of associations. */ function doMoreAssociations($model, $associations) { - $prompt = __('Would you like to define some additional model associations?', true); + $prompt = __('Would you like to define some additional model associations?'); $wannaDoMoreAssoc = $this->in($prompt, array('y','n'), 'n'); $possibleKeys = $this->_generatePossibleKeys(); while (strtolower($wannaDoMoreAssoc) == 'y') { $assocs = array('belongsTo', 'hasOne', 'hasMany', 'hasAndBelongsToMany'); - $this->out(__('What is the association type?', true)); - $assocType = intval($this->inOptions($assocs, __('Enter a number',true))); + $this->out(__('What is the association type?')); + $assocType = intval($this->inOptions($assocs, __('Enter a number'))); - $this->out(__("For the following options be very careful to match your setup exactly.\nAny spelling mistakes will cause errors.", true)); + $this->out(__("For the following options be very careful to match your setup exactly.\nAny spelling mistakes will cause errors.")); $this->hr(); - $alias = $this->in(__('What is the alias for this association?', true)); - $className = $this->in(sprintf(__('What className will %s use?', true), $alias), null, $alias ); + $alias = $this->in(__('What is the alias for this association?')); + $className = $this->in(sprintf(__('What className will %s use?'), $alias), null, $alias ); $suggestedForeignKey = null; if ($assocType == 0) { @@ -663,22 +663,22 @@ class ModelTask extends BakeTask { $showKeys = null; } } else { - $otherTable = $this->in(__('What is the table for this model?', true)); + $otherTable = $this->in(__('What is the table for this model?')); $showKeys = $possibleKeys[$otherTable]; } $suggestedForeignKey = $this->_modelKey($model->name); } if (!empty($showKeys)) { - $this->out(__('A helpful List of possible keys', true)); - $foreignKey = $this->inOptions($showKeys, __('What is the foreignKey?', true)); + $this->out(__('A helpful List of possible keys')); + $foreignKey = $this->inOptions($showKeys, __('What is the foreignKey?')); $foreignKey = $showKeys[intval($foreignKey)]; } if (!isset($foreignKey)) { - $foreignKey = $this->in(__('What is the foreignKey? Specify your own.', true), null, $suggestedForeignKey); + $foreignKey = $this->in(__('What is the foreignKey? Specify your own.'), null, $suggestedForeignKey); } if ($assocType == 3) { - $associationForeignKey = $this->in(__('What is the associationForeignKey?', true), null, $this->_modelKey($model->name)); - $joinTable = $this->in(__('What is the joinTable?', true)); + $associationForeignKey = $this->in(__('What is the associationForeignKey?'), null, $this->_modelKey($model->name)); + $joinTable = $this->in(__('What is the joinTable?')); } $associations[$assocs[$assocType]] = array_values((array)$associations[$assocs[$assocType]]); $count = count($associations[$assocs[$assocType]]); @@ -690,7 +690,7 @@ class ModelTask extends BakeTask { $associations[$assocs[$assocType]][$i]['associationForeignKey'] = $associationForeignKey; $associations[$assocs[$assocType]][$i]['joinTable'] = $joinTable; } - $wannaDoMoreAssoc = $this->in(__('Define another association?', true), array('y','n'), 'y'); + $wannaDoMoreAssoc = $this->in(__('Define another association?'), array('y','n'), 'y'); } return $associations; } @@ -773,7 +773,7 @@ class ModelTask extends BakeTask { $this->_tables = $this->getAllTables($useDbConfig); if ($this->interactive === true) { - $this->out(__('Possible Models based on your current database:', true)); + $this->out(__('Possible Models based on your current database:')); $this->_modelNames = array(); $count = count($this->_tables); for ($i = 0; $i < $count; $i++) { @@ -804,11 +804,11 @@ class ModelTask extends BakeTask { if (array_search($useTable, $this->_tables) === false) { $this->out(); - $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'); + $this->out(sprintf(__("Given your model named '%s',\nCake would expect a database table named '%s'"), $modelName, $fullTableName)); + $tableIsGood = $this->in(__('Do you want to use this table?'), array('y','n'), 'y'); } if (strtolower($tableIsGood) == 'n') { - $useTable = $this->in(__('What is the name of the table?', true)); + $useTable = $this->in(__('What is the name of the table?')); } return $useTable; } @@ -840,7 +840,7 @@ class ModelTask extends BakeTask { $tables = $db->listSources(); } if (empty($tables)) { - $this->err(__('Your database does not have any tables.', true)); + $this->err(__('Your database does not have any tables.')); $this->_stop(); } return $tables; @@ -857,15 +857,15 @@ class ModelTask extends BakeTask { $enteredModel = ''; while ($enteredModel == '') { - $enteredModel = $this->in(__("Enter a number from the list above,\ntype 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"), null, 'q'); if ($enteredModel === 'q') { - $this->out(__("Exit", true)); + $this->out(__('Exit')); $this->_stop(); } if ($enteredModel == '' || intval($enteredModel) > count($this->_modelNames)) { - $this->err(__("The model name you supplied was empty,\nor 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.")); $enteredModel = ''; } } diff --git a/cake/console/libs/tasks/plugin.php b/cake/console/libs/tasks/plugin.php index 698c88583..2a8e0e3cc 100644 --- a/cake/console/libs/tasks/plugin.php +++ b/cake/console/libs/tasks/plugin.php @@ -68,10 +68,10 @@ class PluginTask extends Shell { $pluginPath = $this->_pluginPath($plugin); $this->Dispatch->shiftArgs(); if (is_dir($pluginPath)) { - $this->out(sprintf(__('Plugin: %s', true), $plugin)); - $this->out(sprintf(__('Path: %s', true), $pluginPath)); + $this->out(sprintf(__('Plugin: %s'), $plugin)); + $this->out(sprintf(__('Path: %s'), $pluginPath)); } elseif (isset($this->args[0])) { - $this->err(sprintf(__('%s in path %s not found.', true), $plugin, $pluginPath)); + $this->err(sprintf(__('%s in path %s not found.'), $plugin, $pluginPath)); $this->_stop(); } else { $this->__interactive($plugin); @@ -88,7 +88,7 @@ class PluginTask extends Shell { $this->{$task}->path = $pluginPath . Inflector::underscore(Inflector::pluralize($task)) . DS; if (!is_dir($this->{$task}->path)) { - $this->err(sprintf(__("%s directory could not be found.\nBe sure you have created %s", true), $task, $this->{$task}->path)); + $this->err(sprintf(__("%s directory could not be found.\nBe sure you have created %s"), $task, $this->{$task}->path)); } $this->{$task}->loadTasks(); return $this->{$task}->execute(); @@ -104,11 +104,11 @@ class PluginTask extends Shell { */ function __interactive($plugin = null) { while ($plugin === null) { - $plugin = $this->in(__('Enter the name of the plugin in CamelCase format', true)); + $plugin = $this->in(__('Enter the name of the plugin in CamelCase format')); } if (!$this->bake($plugin)) { - $this->err(sprintf(__("An error occured trying to bake: %s in %s", true), $plugin, $this->path . Inflector::underscore($pluginPath))); + $this->err(sprintf(__("An error occured trying to bake: %s in %s"), $plugin, $this->path . Inflector::underscore($pluginPath))); } } @@ -127,14 +127,14 @@ class PluginTask extends Shell { $this->findPath($pathOptions); } $this->hr(); - $this->out(sprintf(__("Plugin Name: %s", true), $plugin)); - $this->out(sprintf(__("Plugin Directory: %s", true), $this->path . $pluginPath)); + $this->out(sprintf(__("Plugin Name: %s"), $plugin)); + $this->out(sprintf(__("Plugin Directory: %s"), $this->path . $pluginPath)); $this->hr(); - $looksGood = $this->in(__('Look okay?', true), array('y', 'n', 'q'), 'y'); + $looksGood = $this->in(__('Look okay?'), array('y', 'n', 'q'), 'y'); if (strtolower($looksGood) == 'y') { - $verbose = $this->in(__('Do you want verbose output?', true), array('y', 'n'), 'n'); + $verbose = $this->in(__('Do you want verbose output?'), array('y', 'n'), 'n'); $Folder =& new Folder($this->path . $pluginPath); $directories = array( @@ -190,7 +190,7 @@ class PluginTask extends Shell { $this->createFile($this->path . $pluginPath . DS . $modelFileName, $out); $this->hr(); - $this->out(sprintf(__("Created: %s in %s", true), $plugin, $this->path . $pluginPath)); + $this->out(sprintf(__('Created: %s in %s'), $plugin, $this->path . $pluginPath)); $this->hr(); } @@ -209,7 +209,7 @@ class PluginTask extends Shell { foreach ($pathOptions as $i => $option) { $this->out($i + 1 .'. ' . $option); } - $prompt = __('Choose a plugin path from the paths above.', true); + $prompt = __('Choose a plugin path from the paths above.'); $choice = $this->in($prompt); if (intval($choice) > 0 && intval($choice) <= $max) { $valid = true; diff --git a/cake/console/libs/tasks/project.php b/cake/console/libs/tasks/project.php index 661f90a80..36ae4de1d 100644 --- a/cake/console/libs/tasks/project.php +++ b/cake/console/libs/tasks/project.php @@ -59,7 +59,7 @@ class ProjectTask extends Shell { } while (!$project) { - $prompt = __("What is the full path for this app including the app directory name?\n Example:", true); + $prompt = __("What is the full path for this app including the app directory name?\n Example:"); $default = $this->params['working'] . DS . 'myapp'; $project = $this->in($prompt . $default, null, $default); } @@ -67,7 +67,7 @@ class ProjectTask extends Shell { if ($project) { $response = false; while ($response == false && is_dir($project) === true && file_exists($project . 'config' . 'core.php')) { - $prompt = sprintf(__('A project already exists in this location: %s Overwrite?', true), $project); + $prompt = sprintf(__('A project already exists in this location: %s Overwrite?'), $project); $response = $this->in($prompt, array('y','n'), 'n'); if (strtolower($response) === 'n') { $response = $project = false; @@ -78,35 +78,35 @@ class ProjectTask extends Shell { if ($this->bake($project)) { $path = Folder::slashTerm($project); if ($this->createHome($path)) { - $this->out(__('Welcome page created', true)); + $this->out(__('Welcome page created')); } else { - $this->out(__('The Welcome page was NOT created', true)); + $this->out(__('The Welcome page was NOT created')); } if ($this->securitySalt($path) === true ) { - $this->out(__('Random hash key created for \'Security.salt\'', true)); + $this->out(__('Random hash key created for \'Security.salt\'')); } else { - $this->err(sprintf(__('Unable to generate random hash for \'Security.salt\', you should change it in %s', true), CONFIGS . 'core.php')); + $this->err(sprintf(__('Unable to generate random hash for \'Security.salt\', you should change it in %s'), CONFIGS . 'core.php')); } if ($this->securityCipherSeed($path) === true ) { - $this->out(__('Random seed created for \'Security.cipherSeed\'', true)); + $this->out(__('Random seed created for \'Security.cipherSeed\'')); } else { - $this->err(sprintf(__('Unable to generate random seed for \'Security.cipherSeed\', you should change it in %s', true), CONFIGS . 'core.php')); + $this->err(sprintf(__('Unable to generate random seed for \'Security.cipherSeed\', you should change it in %s'), CONFIGS . 'core.php')); } $corePath = $this->corePath($path); if ($corePath === true ) { - $this->out(sprintf(__('CAKE_CORE_INCLUDE_PATH set to %s in webroot/index.php', true), CAKE_CORE_INCLUDE_PATH)); - $this->out(sprintf(__('CAKE_CORE_INCLUDE_PATH set to %s in webroot/test.php', true), CAKE_CORE_INCLUDE_PATH)); - $this->out(__('Remember to check these value after moving to production server', true)); + $this->out(sprintf(__('CAKE_CORE_INCLUDE_PATH set to %s in webroot/index.php'), CAKE_CORE_INCLUDE_PATH)); + $this->out(sprintf(__('CAKE_CORE_INCLUDE_PATH set to %s in webroot/test.php'), CAKE_CORE_INCLUDE_PATH)); + $this->out(__('Remember to check these value after moving to production server')); } elseif ($corePath === false) { - $this->err(sprintf(__('Unable to set CAKE_CORE_INCLUDE_PATH, you should change it in %s', true), $path . 'webroot' .DS .'index.php')); + $this->err(sprintf(__('Unable to set CAKE_CORE_INCLUDE_PATH, you should change it in %s'), $path . 'webroot' .DS .'index.php')); } $Folder = new Folder($path); if (!$Folder->chmod($path . 'tmp', 0777)) { - $this->err(sprintf(__('Could not set permissions on %s', true), $path . DS .'tmp')); - $this->out(sprintf(__('chmod -R 0777 %s', true), $path . DS .'tmp')); + $this->err(sprintf(__('Could not set permissions on %s'), $path . DS .'tmp')); + $this->out(sprintf(__('chmod -R 0777 %s'), $path . DS .'tmp')); } $this->params['working'] = $path; @@ -133,25 +133,25 @@ class ProjectTask extends Shell { while (!$skel) { $skel = $this->in(sprintf(__("What is the path to the directory layout you wish to copy?\nExample: %s"), APP, null, ROOT . DS . 'myapp' . DS)); if ($skel == '') { - $this->out(__('The directory path you supplied was empty. Please try again.', true)); + $this->out(__('The directory path you supplied was empty. Please try again.')); } else { while (is_dir($skel) === false) { - $skel = $this->in(__('Directory path does not exist please choose another:', true)); + $skel = $this->in(__('Directory path does not exist please choose another:')); } } } $app = basename($path); - $this->out(__('Bake Project', true)); - $this->out(__("Skel Directory: ", true) . $skel); - $this->out(__("Will be copied to: ", true) . $path); + $this->out(__('Bake Project')); + $this->out(__('Skel Directory: ') . $skel); + $this->out(__('Will be copied to: ') . $path); $this->hr(); - $looksGood = $this->in(__('Look okay?', true), array('y', 'n', 'q'), 'y'); + $looksGood = $this->in(__('Look okay?'), array('y', 'n', 'q'), 'y'); if (strtolower($looksGood) == 'y') { - $verbose = $this->in(__('Do you want verbose output?', true), array('y', 'n'), 'n'); + $verbose = $this->in(__('Do you want verbose output?'), array('y', 'n'), 'n'); $Folder = new Folder($skel); if (!empty($this->params['empty'])) { @@ -159,10 +159,10 @@ class ProjectTask extends Shell { } if ($Folder->copy(array('to' => $path, 'skip' => $skip))) { $this->hr(); - $this->out(sprintf(__("Created: %s in %s", true), $app, $path)); + $this->out(sprintf(__('Created: %s in %s'), $app, $path)); $this->hr(); } else { - $this->err(sprintf(__(" '%s' could not be created properly", true), $app)); + $this->err(sprintf(__(" '%s' could not be created properly"), $app)); return false; } @@ -174,7 +174,7 @@ class ProjectTask extends Shell { return true; } elseif (strtolower($looksGood) == 'q') { - $this->out(__('Bake Aborted.', true)); + $this->out(__('Bake Aborted.')); } else { $this->execute(false); return false; @@ -312,7 +312,7 @@ class ProjectTask extends Shell { } if ($this->interactive) { $this->out(); - $this->out(__('You have more than one routing prefix configured', true)); + $this->out(__('You have more than one routing prefix configured')); } $options = array(); foreach ($prefixes as $i => $prefix) { @@ -321,19 +321,19 @@ class ProjectTask extends Shell { $this->out($i + 1 . '. ' . $prefix); } } - $selection = $this->in(__('Please choose a prefix to bake with.', true), $options, 1); + $selection = $this->in(__('Please choose a prefix to bake with.'), $options, 1); return $prefixes[$selection - 1] . '_'; } if ($this->interactive) { $this->hr(); $this->out('You need to enable Configure::write(\'Routing.prefixes\',array(\'admin\')) in /app/config/core.php to use prefix routing.'); - $this->out(__('What would you like the prefix route to be?', true)); - $this->out(__('Example: www.example.com/admin/controller', true)); + $this->out(__('What would you like the prefix route to be?')); + $this->out(__('Example: www.example.com/admin/controller')); while ($admin == '') { - $admin = $this->in(__("Enter a routing prefix:", true), null, 'admin'); + $admin = $this->in(__('Enter a routing prefix:'), null, 'admin'); } if ($this->cakeAdmin($admin) !== true) { - $this->out(__('Unable to write to /app/config/core.php.', true)); + $this->out(__('Unable to write to /app/config/core.php.')); $this->out('You need to enable Configure::write(\'Routing.prefixes\',array(\'admin\')) in /app/config/core.php to use prefix routing.'); $this->_stop(); } diff --git a/cake/console/libs/tasks/template.php b/cake/console/libs/tasks/template.php index 08e8a19aa..36569112b 100644 --- a/cake/console/libs/tasks/template.php +++ b/cake/console/libs/tasks/template.php @@ -167,8 +167,8 @@ class TemplateTask extends Shell { } $this->hr(); - $this->out(__('You have more than one set of templates installed.', true)); - $this->out(__('Please choose the template set you wish to use:', true)); + $this->out(__('You have more than one set of templates installed.')); + $this->out(__('Please choose the template set you wish to use:')); $this->hr(); $i = 1; @@ -178,7 +178,7 @@ class TemplateTask extends Shell { $indexedPaths[$i] = $path; $i++; } - $index = $this->in(__('Which bake theme would you like to use?', true), range(1, $i - 1), 1); + $index = $this->in(__('Which bake theme would you like to use?'), range(1, $i - 1), 1); $themeNames = array_keys($this->templatePaths); $this->Dispatch->params['theme'] = $themeNames[$index - 1]; return $indexedPaths[$index]; @@ -205,7 +205,7 @@ class TemplateTask extends Shell { return $templatePath; } } - $this->err(sprintf(__('Could not find template for %s', true), $filename)); + $this->err(sprintf(__('Could not find template for %s'), $filename)); return false; } } diff --git a/cake/console/libs/tasks/test.php b/cake/console/libs/tasks/test.php index 6626031c0..86bcd0da3 100644 --- a/cake/console/libs/tasks/test.php +++ b/cake/console/libs/tasks/test.php @@ -90,8 +90,8 @@ class TestTask extends BakeTask { function __interactive($type = null) { $this->interactive = true; $this->hr(); - $this->out(__('Bake Tests', true)); - $this->out(sprintf(__("Path: %s", true), $this->path)); + $this->out(__('Bake Tests')); + $this->out(sprintf(__('Path: %s'), $this->path)); $this->hr(); $selection = null; @@ -116,7 +116,7 @@ class TestTask extends BakeTask { */ public function bake($type, $className) { if ($this->typeCanDetectFixtures($type) && $this->isLoadableClass($type, $className)) { - $this->out(__('Bake is detecting possible fixtures..', true)); + $this->out(__('Bake is detecting possible fixtures..')); $testSubject =& $this->buildTestSubject($type, $className); $this->generateFixtureList($testSubject); } elseif ($this->interactive) { @@ -156,7 +156,7 @@ class TestTask extends BakeTask { */ public function getObjectType() { $this->hr(); - $this->out(__("Select an object type:", true)); + $this->out(__('Select an object type:')); $this->hr(); $keys = array(); @@ -165,7 +165,7 @@ class TestTask extends BakeTask { $keys[] = $key; } $keys[] = 'q'; - $selection = $this->in(__("Enter the type of object to bake a test for or (q)uit", true), $keys, 'q'); + $selection = $this->in(__('Enter the type of object to bake a test for or (q)uit'), $keys, 'q'); if ($selection == 'q') { return $this->_stop(); } @@ -180,13 +180,13 @@ class TestTask extends BakeTask { */ public function getClassName($objectType) { $options = App::objects(strtolower($objectType)); - $this->out(sprintf(__('Choose a %s class', true), $objectType)); + $this->out(sprintf(__('Choose a %s class'), $objectType)); $keys = array(); foreach ($options as $key => $option) { $this->out(++$key . '. ' . $option); $keys[] = $key; } - $selection = $this->in(__('Choose an existing class, or enter the name of a class that does not exist', true)); + $selection = $this->in(__('Choose an existing class, or enter the name of a class that does not exist')); if (isset($options[$selection - 1])) { return $options[$selection - 1]; } @@ -354,10 +354,10 @@ class TestTask extends BakeTask { * @return array Array of fixtures the user wants to add. */ public function getUserFixtures() { - $proceed = $this->in(__('Bake could not detect fixtures, would you like to add some?', true), array('y','n'), 'n'); + $proceed = $this->in(__('Bake could not detect fixtures, would you like to add some?'), array('y','n'), 'n'); $fixtures = array(); if (strtolower($proceed) == 'y') { - $fixtureList = $this->in(__("Please provide a comma separated list of the fixtures names you'd like to use.\nExample: 'app.comment, app.post, plugin.forums.post'", true)); + $fixtureList = $this->in(__("Please provide a comma separated list of the fixtures names you'd like to use.\nExample: 'app.comment, app.post, plugin.forums.post'")); $fixtureListTrimmed = str_replace(' ', '', $fixtureList); $fixtures = explode(',', $fixtureListTrimmed); } diff --git a/cake/console/libs/tasks/view.php b/cake/console/libs/tasks/view.php index e42e3ed8d..dbc060979 100644 --- a/cake/console/libs/tasks/view.php +++ b/cake/console/libs/tasks/view.php @@ -220,17 +220,17 @@ class ViewTask extends BakeTask { $this->controllerPath = strtolower(Inflector::underscore($this->controllerName)); - $prompt = sprintf(__("Would you like bake to build your views interactively?\nWarning: Choosing no will overwrite %s views if it exist.", true), $this->controllerName); + $prompt = sprintf(__("Would you like bake to build your views interactively?\nWarning: Choosing no will overwrite %s views if it exist."), $this->controllerName); $interactive = $this->in($prompt, array('y', 'n'), 'n'); if (strtolower($interactive) == 'n') { $this->interactive = false; } - $prompt = __("Would you like to create some CRUD views\n(index, add, view, edit) for this controller?\nNOTE: Before doing so, you'll need to create your controller\nand model classes (including associated models).", true); + $prompt = __("Would you like to create some CRUD views\n(index, add, view, edit) for this controller?\nNOTE: Before doing so, you'll need to create your controller\nand model classes (including associated models)."); $wannaDoScaffold = $this->in($prompt, array('y','n'), 'y'); - $wannaDoAdmin = $this->in(__("Would you like to create the views for admin routing?", true), array('y','n'), 'n'); + $wannaDoAdmin = $this->in(__("Would you like to create the views for admin routing?"), array('y','n'), 'n'); if (strtolower($wannaDoScaffold) == 'y' || strtolower($wannaDoAdmin) == 'y') { $vars = $this->__loadController(); @@ -249,7 +249,7 @@ class ViewTask extends BakeTask { } $this->hr(); $this->out(); - $this->out(__("View Scaffolding Complete.\n", true)); + $this->out(__("View Scaffolding Complete.\n")); } else { $this->customAction(); } @@ -267,7 +267,7 @@ class ViewTask extends BakeTask { */ function __loadController() { if (!$this->controllerName) { - $this->err(__('Controller not found', true)); + $this->err(__('Controller not found')); } $import = $this->controllerName; @@ -277,7 +277,7 @@ class ViewTask extends BakeTask { if (!App::import('Controller', $import)) { $file = $this->controllerPath . '_controller.php'; - $this->err(sprintf(__("The file '%s' could not be found.\nIn order to bake a view, you'll need to first create the controller.", true), $file)); + $this->err(sprintf(__("The file '%s' could not be found.\nIn order to bake a view, you'll need to first create the controller."), $file)); $this->_stop(); } $controllerClassName = $this->controllerName . 'Controller'; @@ -329,25 +329,25 @@ class ViewTask extends BakeTask { function customAction() { $action = ''; while ($action == '') { - $action = $this->in(__('Action Name? (use lowercase_underscored function name)', true)); + $action = $this->in(__('Action Name? (use lowercase_underscored function name)')); if ($action == '') { - $this->out(__('The action name you supplied was empty. Please try again.', true)); + $this->out(__('The action name you supplied was empty. Please try again.')); } } $this->out(); $this->hr(); - $this->out(__('The following view will be created:', true)); + $this->out(__('The following view will be created:')); $this->hr(); - $this->out(sprintf(__('Controller Name: %s', true), $this->controllerName)); - $this->out(sprintf(__('Action Name: %s', true), $action)); - $this->out(sprintf(__('Path: %s', true), $this->params['app'] . DS . $this->controllerPath . DS . Inflector::underscore($action) . ".ctp")); + $this->out(sprintf(__('Controller Name: %s'), $this->controllerName)); + $this->out(sprintf(__('Action Name: %s'), $action)); + $this->out(sprintf(__('Path: %s'), $this->params['app'] . DS . $this->controllerPath . DS . Inflector::underscore($action) . ".ctp")); $this->hr(); - $looksGood = $this->in(__('Look okay?', true), array('y','n'), 'y'); + $looksGood = $this->in(__('Look okay?'), array('y','n'), 'y'); if (strtolower($looksGood) == 'y') { $this->bake($action); $this->_stop(); } else { - $this->out(__('Bake Aborted.', true)); + $this->out(__('Bake Aborted.')); } } diff --git a/cake/console/libs/testsuite.php b/cake/console/libs/testsuite.php index 6f4c91db8..193df3da8 100644 --- a/cake/console/libs/testsuite.php +++ b/cake/console/libs/testsuite.php @@ -146,15 +146,15 @@ class TestSuiteShell extends Shell { * @return void */ public function main() { - $this->out(__('CakePHP Test Shell', true)); + $this->out(__('CakePHP Test Shell')); $this->hr(); if (count($this->args) == 0) { - $this->error(__('Sorry, you did not pass any arguments!', true)); + $this->error(__('Sorry, you did not pass any arguments!')); } if ($this->__canRun()) { - $message = sprintf(__('Running %s %s %s', true), $this->category, $this->type, $this->file); + $message = sprintf(__('Running %s %s %s'), $this->category, $this->type, $this->file); $this->out($message); $exitCode = 0; @@ -163,7 +163,7 @@ class TestSuiteShell extends Shell { } $this->_stop($exitCode); } else { - $this->error(__('Sorry, the tests could not be found.', true)); + $this->error(__('Sorry, the tests could not be found.')); } } @@ -216,7 +216,7 @@ class TestSuiteShell extends Shell { if ($isNeitherAppNorCore && !$isPlugin) { $message = sprintf( - __('%s is an invalid test category (either "app", "core" or name of a plugin)', true), + __('%s is an invalid test category (either "app", "core" or name of a plugin)'), $this->category ); $this->error($message); @@ -225,12 +225,12 @@ class TestSuiteShell extends Shell { $folder = $this->__findFolderByCategory($this->category); if (!file_exists($folder)) { - $this->err(sprintf(__('%s not found', true), $folder)); + $this->err(sprintf(__('%s not found'), $folder)); return false; } if (!in_array($this->type, array('all', 'group', 'case'))) { - $this->err(sprintf(__('%s is invalid. Should be case, group or all', true), $this->type)); + $this->err(sprintf(__('%s is invalid. Should be case, group or all'), $this->type)); return false; } @@ -240,7 +240,7 @@ class TestSuiteShell extends Shell { } $message = sprintf( - __('%s %s %s is an invalid test identifier', true), + __('%s %s %s is an invalid test identifier'), $this->category, $this->type, $this->file ); $this->err($message); @@ -266,7 +266,7 @@ class TestSuiteShell extends Shell { if ($this->doCoverage) { if (!extension_loaded('xdebug')) { - $this->out(__('You must install Xdebug to use the CakePHP(tm) Code Coverage Analyzation. Download it from http://www.xdebug.org/docs/install', true)); + $this->out(__('You must install Xdebug to use the CakePHP(tm) Code Coverage Analyzation. Download it from http://www.xdebug.org/docs/install')); $this->_stop(0); } } @@ -359,7 +359,7 @@ class TestSuiteShell extends Shell { */ function __installSimpleTest() { if (!App::import('Vendor', 'simpletest' . DS . 'reporter')) { - $this->err(__('Sorry, Simpletest could not be found. Download it from http://simpletest.org and install it to your vendors directory.', true)); + $this->err(__('Sorry, Simpletest could not be found. Download it from http://simpletest.org and install it to your vendors directory.')); exit; } } diff --git a/cake/console/templates/default/actions/controller_actions.ctp b/cake/console/templates/default/actions/controller_actions.ctp index c5de02596..fb255f073 100644 --- a/cake/console/templates/default/actions/controller_actions.ctp +++ b/cake/console/templates/default/actions/controller_actions.ctp @@ -27,10 +27,10 @@ public function view($id = null) { if (!$id) { - $this->Session->setFlash(sprintf(__('Invalid %s', true), '')); + $this->Session->setFlash(sprintf(__('Invalid %s'), '')); $this->redirect(array('action' => 'index')); - $this->flash(sprintf(__('Invalid %s', true), ''), array('action' => 'index')); + $this->flash(sprintf(__('Invalid %s'), ''), array('action' => 'index')); } $this->set('', $this->->read(null, $id)); @@ -42,14 +42,14 @@ $this->->create(); if ($this->->save($this->data)) { - $this->Session->setFlash(sprintf(__('The %s has been saved', true), '')); + $this->Session->setFlash(sprintf(__('The %s has been saved'), '')); $this->redirect(array('action' => 'index')); - $this->flash(sprintf(__('%s saved.', true), ''), array('action' => 'index')); + $this->flash(sprintf(__('%s saved.'), ''), array('action' => 'index')); } else { - $this->Session->setFlash(sprintf(__('The %s could not be saved. Please, try again.', true), '')); + $this->Session->setFlash(sprintf(__('The %s could not be saved. Please, try again.'), '')); } } @@ -74,23 +74,23 @@ public function edit($id = null) { if (!$id && empty($this->data)) { - $this->Session->setFlash(sprintf(__('Invalid %s', true), '')); + $this->Session->setFlash(sprintf(__('Invalid %s'), '')); $this->redirect(array('action' => 'index')); - $this->flash(sprintf(__('Invalid %s', true), ''), array('action' => 'index')); + $this->flash(sprintf(__('Invalid %s'), ''), array('action' => 'index')); } if (!empty($this->data)) { if ($this->->save($this->data)) { - $this->Session->setFlash(sprintf(__('The %s has been saved', true), '')); + $this->Session->setFlash(sprintf(__('The %s has been saved'), '')); $this->redirect(array('action' => 'index')); - $this->flash(sprintf(__('The %s has been saved.', true), ''), array('action' => 'index')); + $this->flash(sprintf(__('The %s has been saved.'), ''), array('action' => 'index')); } else { - $this->Session->setFlash(sprintf(__('The %s could not be saved. Please, try again.', true), '')); + $this->Session->setFlash(sprintf(__('The %s could not be saved. Please, try again.'), '')); } } @@ -117,24 +117,24 @@ public function delete($id = null) { if (!$id) { - $this->Session->setFlash(sprintf(__('Invalid id for %s', true), '')); + $this->Session->setFlash(sprintf(__('Invalid id for %s'), '')); $this->redirect(array('action'=>'index')); - $this->flash(sprintf(__('Invalid %s', true), ''), array('action' => 'index')); + $this->flash(sprintf(__('Invalid %s'), ''), array('action' => 'index')); } if ($this->->delete($id)) { - $this->Session->setFlash(sprintf(__('%s deleted', true), '')); + $this->Session->setFlash(sprintf(__('%s deleted'), '')); $this->redirect(array('action'=>'index')); - $this->flash(sprintf(__('%s deleted', true), ''), array('action' => 'index')); + $this->flash(sprintf(__('%s deleted'), ''), array('action' => 'index')); } - $this->Session->setFlash(sprintf(__('%s was not deleted', true), '')); + $this->Session->setFlash(sprintf(__('%s was not deleted'), '')); - $this->flash(sprintf(__('%s was not deleted', true), ''), array('action' => 'index')); + $this->flash(sprintf(__('%s was not deleted'), ''), array('action' => 'index')); $this->redirect(array('action' => 'index')); } \ No newline at end of file diff --git a/cake/console/templates/default/views/form.ctp b/cake/console/templates/default/views/form.ctp index 218290ecf..a146238b9 100644 --- a/cake/console/templates/default/views/form.ctp +++ b/cake/console/templates/default/views/form.ctp @@ -20,7 +20,7 @@
Form->create('{$modelClass}');?>\n";?>
- ";?> + ";?>
Form->end(__('Submit', true));?>\n"; + echo "Form->end(__('Submit'));?>\n"; ?>
-

"; ?>

+

"; ?>

    -
  • Html->link(__('Delete', true), array('action' => 'delete', \$this->Form->value('{$modelClass}.{$primaryKey}')), null, sprintf(__('Are you sure you want to delete # %s?', true), \$this->Form->value('{$modelClass}.{$primaryKey}'))); ?>";?>
  • +
  • Html->link(__('Delete'), array('action' => 'delete', \$this->Form->value('{$modelClass}.{$primaryKey}')), null, sprintf(__('Are you sure you want to delete # %s?'), \$this->Form->value('{$modelClass}.{$primaryKey}'))); ?>";?>
  • -
  • Html->link(sprintf(__('List %s', true), __('{$pluralHumanName}', true)), array('action' => 'index'));?>";?>
  • +
  • Html->link(sprintf(__('List %s'), __('{$pluralHumanName}')), array('action' => 'index'));?>";?>
  • $data) { foreach ($data as $alias => $details) { if ($details['controller'] != $this->name && !in_array($details['controller'], $done)) { - echo "\t\t
  • Html->link(sprintf(__('List %s', true), __('" . Inflector::humanize($details['controller']) . "', true)), array('controller' => '{$details['controller']}', 'action' => 'index')); ?>
  • \n"; - echo "\t\t
  • Html->link(sprintf(__('New %s', true), __('" . Inflector::humanize(Inflector::underscore($alias)) . "', true)), array('controller' => '{$details['controller']}', 'action' => 'add')); ?>
  • \n"; + echo "\t\t
  • Html->link(sprintf(__('List %s'), __('" . Inflector::humanize($details['controller']) . "')), array('controller' => '{$details['controller']}', 'action' => 'index')); ?>
  • \n"; + echo "\t\t
  • Html->link(sprintf(__('New %s'), __('" . Inflector::humanize(Inflector::underscore($alias)) . "')), array('controller' => '{$details['controller']}', 'action' => 'add')); ?>
  • \n"; $done[] = $details['controller']; } } diff --git a/cake/console/templates/default/views/home.ctp b/cake/console/templates/default/views/home.ctp index 01cd41a3d..aa09edff4 100644 --- a/cake/console/templates/default/views/home.ctp +++ b/cake/console/templates/default/views/home.ctp @@ -10,11 +10,11 @@ endif; '; - __('Your tmp directory is writable.'); + echo __('Your tmp directory is writable.'); echo ''; else: echo ''; - __('Your tmp directory is NOT writable.'); + echo __('Your tmp directory is NOT writable.'); echo ''; endif; ?> @@ -24,11 +24,11 @@ endif; \$settings = Cache::settings(); if (!empty(\$settings)): echo ''; - printf(__('The %s is being used for caching. To change the config edit APP/config/core.php ', true), ''. \$settings['engine'] . 'Engine'); + printf(__('The %s is being used for caching. To change the config edit APP/config/core.php '), ''. \$settings['engine'] . 'Engine'); echo ''; else: echo ''; - __('Your cache is NOT working. Please check the settings in APP/config/core.php'); + echo __('Your cache is NOT working. Please check the settings in APP/config/core.php'); echo ''; endif; ?> @@ -38,14 +38,14 @@ endif; \$filePresent = null; if (file_exists(CONFIGS . 'database.php')): echo ''; - __('Your database configuration file is present.'); + echo __('Your database configuration file is present.'); \$filePresent = true; echo ''; else: echo ''; - __('Your database configuration file is NOT present.'); + echo __('Your database configuration file is NOT present.'); echo '
    '; - __('Rename config/database.php.default to config/database.php'); + echo __('Rename config/database.php.default to config/database.php'); echo '
    '; endif; ?> @@ -62,22 +62,22 @@ if (!empty(\$filePresent)): isConnected()): echo ''; - __('Cake is able to connect to the database.'); + echo __('Cake is able to connect to the database.'); echo ''; else: echo ''; - __('Cake is NOT able to connect to the database.'); + echo __('Cake is NOT able to connect to the database.'); echo ''; endif; ?>

    \n"; $output .= "\n"; -$output .= "

    \n"; +$output .= "

    \n"; $output .= "

    \n"; $output .= "', APP . 'views' . DS . 'layouts' . DS . 'default.ctp.
    ', APP . 'webroot' . DS . 'css');\n"; $output .= "?>\n"; $output .= "

    \n"; diff --git a/cake/console/templates/default/views/index.ctp b/cake/console/templates/default/views/index.ctp index 35e059b8c..12f1add92 100644 --- a/cake/console/templates/default/views/index.ctp +++ b/cake/console/templates/default/views/index.ctp @@ -18,13 +18,13 @@ */ ?>
    -

    ";?>

    +

    ";?>

    - + \n"; - echo "\t\t\tHtml->link(__('View', true), array('action' => 'view', \${$singularVar}['{$modelClass}']['{$primaryKey}'])); ?>\n"; - echo "\t\t\tHtml->link(__('Edit', true), array('action' => 'edit', \${$singularVar}['{$modelClass}']['{$primaryKey}'])); ?>\n"; - echo "\t\t\tHtml->link(__('Delete', true), array('action' => 'delete', \${$singularVar}['{$modelClass}']['{$primaryKey}']), null, sprintf(__('Are you sure you want to delete # %s?', true), \${$singularVar}['{$modelClass}']['{$primaryKey}'])); ?>\n"; + echo "\t\t\tHtml->link(__('View'), array('action' => 'view', \${$singularVar}['{$modelClass}']['{$primaryKey}'])); ?>\n"; + echo "\t\t\tHtml->link(__('Edit'), array('action' => 'edit', \${$singularVar}['{$modelClass}']['{$primaryKey}'])); ?>\n"; + echo "\t\t\tHtml->link(__('Delete'), array('action' => 'delete', \${$singularVar}['{$modelClass}']['{$primaryKey}']), null, sprintf(__('Are you sure you want to delete # %s?'), \${$singularVar}['{$modelClass}']['{$primaryKey}'])); ?>\n"; echo "\t\t\n"; echo "\t\n"; @@ -65,28 +65,28 @@

    Paginator->counter(array( - 'format' => __('Page %page% of %pages%, showing %current% records out of %count% total, starting on record %start%, ending on %end%', true) + 'format' => __('Page %page% of %pages%, showing %current% records out of %count% total, starting on record %start%, ending on %end%') )); ?>";?>

    - Paginator->prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?>\n";?> + Paginator->prev('<< '.__('previous'), array(), null, array('class'=>'disabled'));?>\n";?> | Paginator->numbers();?>\n"?> | - Paginator->next(__('next', true).' >>', array(), null, array('class' => 'disabled'));?>\n";?> + Paginator->next(__('next').' >>', array(), null, array('class' => 'disabled'));?>\n";?>
    -

    "; ?>

    +

    "; ?>

      -
    • Html->link(sprintf(__('New %s', true), __('{$singularHumanName}', true)), array('action' => 'add')); ?>";?>
    • +
    • Html->link(sprintf(__('New %s'), __('{$singularHumanName}')), array('action' => 'add')); ?>";?>
    • $data) { foreach ($data as $alias => $details) { if ($details['controller'] != $this->name && !in_array($details['controller'], $done)) { - echo "\t\t
    • Html->link(sprintf(__('List %s', true), __('" . Inflector::humanize($details['controller']) . "', true)), array('controller' => '{$details['controller']}', 'action' => 'index')); ?>
    • \n"; - echo "\t\t
    • Html->link(sprintf(__('New %s', true), __('" . Inflector::humanize(Inflector::underscore($alias)) . "', true)), array('controller' => '{$details['controller']}', 'action' => 'add')); ?>
    • \n"; + echo "\t\t
    • Html->link(sprintf(__('List %s'), __('" . Inflector::humanize($details['controller']) . "')), array('controller' => '{$details['controller']}', 'action' => 'index')); ?>
    • \n"; + echo "\t\t
    • Html->link(sprintf(__('New %s'), __('" . Inflector::humanize(Inflector::underscore($alias)) . "')), array('controller' => '{$details['controller']}', 'action' => 'add')); ?>
    • \n"; $done[] = $details['controller']; } } diff --git a/cake/console/templates/default/views/view.ctp b/cake/console/templates/default/views/view.ctp index 545ea10f1..0e22bcd3c 100644 --- a/cake/console/templates/default/views/view.ctp +++ b/cake/console/templates/default/views/view.ctp @@ -18,7 +18,7 @@ */ ?>
      -

      ";?>

      +

      ";?>

      \n";?> $details) { if ($field === $details['foreignKey']) { $isKey = true; - echo "\t\t>\n"; + echo "\t\t>\n"; echo "\t\t>\n\t\t\tHtml->link(\${$singularVar}['{$alias}']['{$details['displayField']}'], array('controller' => '{$details['controller']}', 'action' => 'view', \${$singularVar}['{$alias}']['{$details['primaryKey']}'])); ?>\n\t\t\t \n\t\t\n"; break; } } } if ($isKey !== true) { - echo "\t\t>\n"; + echo "\t\t>\n"; echo "\t\t>\n\t\t\t\n\t\t\t \n\t\t\n"; } } @@ -42,20 +42,20 @@ foreach ($fields as $field) {
      -

      "; ?>

      +

      "; ?>

        Html->link(sprintf(__('Edit %s', true), __('{$singularHumanName}', true)), array('action' => 'edit', \${$singularVar}['{$modelClass}']['{$primaryKey}'])); ?> \n"; - echo "\t\t
      • Html->link(sprintf(__('Delete %s', true), __('{$singularHumanName}', true)), array('action' => 'delete', \${$singularVar}['{$modelClass}']['{$primaryKey}']), null, sprintf(__('Are you sure you want to delete # %s?', true), \${$singularVar}['{$modelClass}']['{$primaryKey}'])); ?>
      • \n"; - echo "\t\t
      • Html->link(sprintf(__('List %s', true), __('{$pluralHumanName}', true)), array('action' => 'index')); ?>
      • \n"; - echo "\t\t
      • Html->link(sprintf(__('New %s', true), __('{$singularHumanName}', true)), array('action' => 'add')); ?>
      • \n"; + echo "\t\t
      • Html->link(sprintf(__('Edit %s'), __('{$singularHumanName}')), array('action' => 'edit', \${$singularVar}['{$modelClass}']['{$primaryKey}'])); ?>
      • \n"; + echo "\t\t
      • Html->link(sprintf(__('Delete %s'), __('{$singularHumanName}')), array('action' => 'delete', \${$singularVar}['{$modelClass}']['{$primaryKey}']), null, sprintf(__('Are you sure you want to delete # %s?'), \${$singularVar}['{$modelClass}']['{$primaryKey}'])); ?>
      • \n"; + echo "\t\t
      • Html->link(sprintf(__('List %s'), __('{$pluralHumanName}')), array('action' => 'index')); ?>
      • \n"; + echo "\t\t
      • Html->link(sprintf(__('New %s'), __('{$singularHumanName}')), array('action' => 'add')); ?>
      • \n"; $done = array(); foreach ($associations as $type => $data) { foreach ($data as $alias => $details) { if ($details['controller'] != $this->name && !in_array($details['controller'], $done)) { - echo "\t\t
      • Html->link(sprintf(__('List %s', true), __('" . Inflector::humanize($details['controller']) . "', true)), array('controller' => '{$details['controller']}', 'action' => 'index')); ?>
      • \n"; - echo "\t\t
      • Html->link(sprintf(__('New %s', true), __('" . Inflector::humanize(Inflector::underscore($alias)) . "', true)), array('controller' => '{$details['controller']}', 'action' => 'add')); ?>
      • \n"; + echo "\t\t
      • Html->link(sprintf(__('List %s'), __('" . Inflector::humanize($details['controller']) . "')), array('controller' => '{$details['controller']}', 'action' => 'index')); ?>
      • \n"; + echo "\t\t
      • Html->link(sprintf(__('New %s'), __('" . Inflector::humanize(Inflector::underscore($alias)) . "')), array('controller' => '{$details['controller']}', 'action' => 'add')); ?>
      • \n"; $done[] = $details['controller']; } } diff --git a/cake/console/templates/skel/views/layouts/default.ctp b/cake/console/templates/skel/views/layouts/default.ctp index 6abce2205..0bb3e060b 100644 --- a/cake/console/templates/skel/views/layouts/default.ctp +++ b/cake/console/templates/skel/views/layouts/default.ctp @@ -22,7 +22,7 @@ Html->charset(); ?> - <?php __('CakePHP: the rapid development php framework:'); ?> + <?php echo __('CakePHP: the rapid development php framework:'); ?> <?php echo $title_for_layout; ?>
        @@ -47,7 +47,7 @@
    Paginator->sort('{$field}');?>";?> ";?>";?>