Permalink
Browse files

Updating code formatting to conform with standards.

  • Loading branch information...
davidpersson authored and gwoo committed Feb 24, 2010
1 parent 10a230a commit f76ad26a5af68e6f51f9acfd8f7190279307b7d3
Showing with 8 additions and 8 deletions.
  1. +3 −3 libraries/lithium/g11n/Message.php
  2. +5 −5 libraries/lithium/g11n/catalog/adapter/Cldr.php
@@ -68,6 +68,7 @@ class Message extends \lithium\core\StaticObject {
* ));
* }}}
*
+ * @see lithium\util\String::insert()
* @param string $id The id to use when looking up the translation.
* @param array $options Valid options are:
* - `'count'`: Used to determine the correct plural form.
@@ -78,7 +79,6 @@ class Message extends \lithium\core\StaticObject {
* - `'noop'`: If `true` no whatsoever lookup takes place.
* @return string|void The translation or the value of the `'default'` option if none
* could be found.
- * @see lithium\util\String::insert()
*/
public static function translate($id, array $options = array()) {
$defaults = array(
@@ -120,8 +120,8 @@ public static function translate($id, array $options = array()) {
* }
* }}}
*
- * @return array Named aliases (`'t'` and `'tn'`) for translation functions.
* @see lithium\net\http\Media::_handle()
+ * @return array Named aliases (`'t'` and `'tn'`) for translation functions.
*/
public static function aliases() {
$t = function($message, array $options = array()) {
@@ -141,14 +141,14 @@ public static function aliases() {
* scope into account. Hereupon the correct plural form is determined by passing the
* value of the `'count'` option to a closure.
*
+ * @see lithium\g11n\Catalog
* @param string $id The lookup key.
* @param integer $count Used to determine the correct plural form.
* @param string $locale The target locale.
* @param array $options Passed through to `Catalog::read()`. Valid options are:
* - `'scope'`: The scope of the message.
* @return string|void The translation or `null` if none could be found or the plural
* form could not be determined.
- * @see lithium\g11n\Catalog
* @filter
* @todo Message pages need caching.
*/
@@ -108,7 +108,7 @@ protected function _readValidation($path, $locale) {
$query .= "/postCodeRegex[@territoryId=\"{$territory}\"]";
$nodes = $this->_parseXml($file, $query);
- $regex = (string)current($nodes);
+ $regex = (string) current($nodes);
return $this->_merge($data, array(
'id' => 'postalCode',
@@ -127,8 +127,8 @@ protected function _readList($path, $category, $locale) {
foreach ($nodes as $node) {
$data = $this->_merge($data, array(
- 'id' => (string)$node['type'],
- 'translated' => (string)$node
+ 'id' => (string) $node['type'],
+ 'translated' => (string) $node
));
}
return $data;
@@ -145,8 +145,8 @@ protected function _readCurrency($path, $locale) {
$displayNames = $node->xpath('displayName');
$data = $this->_merge($data, array(
- 'id' => (string)$node['type'],
- 'translated' => (string)current($displayNames)
+ 'id' => (string) $node['type'],
+ 'translated' => (string) current($displayNames)
));
}
return $data;

0 comments on commit f76ad26

Please sign in to comment.