Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use language in paginator class.

This commit is contained in:
Taylor Otwell 2011-07-26 23:23:34 -05:00
parent 7e439ab52e
commit c76d0fb669
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
system/lang.php
View File

@ -9,21 +9,21 @@ class Lang {
*
* @var array
*/
private static $lines = array();
public static $lines = array();
/**
* The key of the line that is being requested.
*
* @var string
*/
private $key;
public $key;
/**
* The place-holder replacements.
*
* @var array
*/
private $replacements = array();
public $replacements = array();
/**
* Create a new Lang instance.
@ -117,7 +117,9 @@ private function parse($key)
*/
private function load($file, $language)
{
if ( ! array_key_exists($language.$file, static::$lines) and file_exists($path = APP_PATH.'lang/'.$language.'/'.$file.EXT))
if (array_key_exists($language.$file, static::$lines)) return;
if (file_exists($path = APP_PATH.'lang/'.$language.'/'.$file.EXT))
{
static::$lines[$language.$file] = require $path;
}

4
system/paginator.php
View File

@ -150,7 +150,7 @@ private function slider($adjacent)
*/
public function previous()
{
$text = Lang::line('pagination.previous')->get();
$text = Lang::line('pagination.previous')->get($this->language);
return ($this->page > 1) ? $this->link($this->page - 1, $text, 'prev_page').' ' : HTML::span($text, array('class' => 'disabled prev_page')).' ';
}
@ -162,7 +162,7 @@ public function previous()
*/
public function next()
{
$text = Lang::line('pagination.next')->get();
$text = Lang::line('pagination.next')->get($this->language);
return ($this->page < $this->last_page) ? $this->link($this->page + 1, $text, 'next_page') : HTML::span($text, array('class' => 'disabled next_page'));
}