ivo/ponzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactoring various classes.

Browse Source
This commit is contained in:
Taylor Otwell
2011-09-16 20:30:22 -05:00
parent c3f5abc37a
commit 32391b7f32
6 changed files with 79 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
laravel/lang.php
View File

@@ -41,15 +41,21 @@ class Lang_Factory {
*
* // Begin retrieving a language line with replacements
* $lang = Lang::line('validation.required', array('attribute' => 'email'));
*
* // Begin retrieving a language line in a given language
* $lang = Lang::line('messages.welcome', null, 'sp');
* </code>
*
* @param string $key
* @param array $replacements
* @param string $language
* @return Lang
*/
public function line($key, $replacements = array())
public function line($key, $replacements = array(), $language = null)
{
return new Lang($key, $replacements, $this->config->get('application.language'), $this->paths);
$language = ( ! is_null($language)) $this->config->get('application.language') : $language;
return new Lang($key, (array) $replacements, $language, $this->paths);
}
}