diff --git a/lib/Cake/Utility/String.php b/lib/Cake/Utility/String.php index e70c3365d..acfad5c24 100644 --- a/lib/Cake/Utility/String.php +++ b/lib/Cake/Utility/String.php @@ -672,15 +672,18 @@ class String { } /** - * Creates a comma separated list where the last two items are joined with 'and', forming natural English + * Creates a comma separated list where the last two items are joined with 'and', forming natural English. * - * @param array $list The list to be joined - * @param string $and The word used to join the last and second last items together with. Defaults to 'and' - * @param string $separator The separator used to join all the other items together. Defaults to ', ' + * @param array $list The list to be joined. + * @param string $and The word used to join the last and second last items together with. Defaults to 'and'. + * @param string $separator The separator used to join all the other items together. Defaults to ', '. * @return string The glued together string. * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/text.html#TextHelper::toList */ - public static function toList($list, $and = 'and', $separator = ', ') { + public static function toList($list, $and = null, $separator = ', ') { + if ($and === null) { + $and = __d('cake', 'and'); + } if (count($list) > 1) { return implode($separator, array_slice($list, null, -1)) . ' ' . $and . ' ' . array_pop($list); } diff --git a/lib/Cake/View/Helper/TextHelper.php b/lib/Cake/View/Helper/TextHelper.php index f5492535d..ec59893d6 100644 --- a/lib/Cake/View/Helper/TextHelper.php +++ b/lib/Cake/View/Helper/TextHelper.php @@ -329,16 +329,16 @@ class TextHelper extends AppHelper { } /** - * Creates a comma separated list where the last two items are joined with 'and', forming natural English + * Creates a comma separated list where the last two items are joined with 'and', forming natural English. * - * @param array $list The list to be joined - * @param string $and The word used to join the last and second last items together with. Defaults to 'and' - * @param string $separator The separator used to join all the other items together. Defaults to ', ' + * @param array $list The list to be joined. + * @param string $and The word used to join the last and second last items together with. Defaults to 'and'. + * @param string $separator The separator used to join all the other items together. Defaults to ', '. * @return string The glued together string. * @see String::toList() * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/text.html#TextHelper::toList */ - public function toList($list, $and = 'and', $separator = ', ') { + public function toList($list, $and = null, $separator = ', ') { return $this->_engine->toList($list, $and, $separator); }