diff options
Diffstat (limited to 'src/php-gettext')
-rw-r--r-- | src/php-gettext/gettext.inc | 12 | ||||
-rw-r--r-- | src/php-gettext/gettext.php | 2 | ||||
-rw-r--r-- | src/php-gettext/streams.php | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/php-gettext/gettext.inc b/src/php-gettext/gettext.inc index 399a0f2..b61cbce 100644 --- a/src/php-gettext/gettext.inc +++ b/src/php-gettext/gettext.inc @@ -89,18 +89,18 @@ function get_list_of_locales($locale) { if ($modifier) { if ($country) { if ($charset) - array_push($locale_names, "${lang}_$country.$charset@$modifier"); - array_push($locale_names, "${lang}_$country@$modifier"); + array_push($locale_names, "{$lang}_$country.$charset@$modifier"); + array_push($locale_names, "{$lang}_$country@$modifier"); } elseif ($charset) - array_push($locale_names, "${lang}.$charset@$modifier"); + array_push($locale_names, "{$lang}.$charset@$modifier"); array_push($locale_names, "$lang@$modifier"); } if ($country) { if ($charset) - array_push($locale_names, "${lang}_$country.$charset"); - array_push($locale_names, "${lang}_$country"); + array_push($locale_names, "{$lang}_$country.$charset"); + array_push($locale_names, "{$lang}_$country"); } elseif ($charset) - array_push($locale_names, "${lang}.$charset"); + array_push($locale_names, "{$lang}.$charset"); array_push($locale_names, $lang); } diff --git a/src/php-gettext/gettext.php b/src/php-gettext/gettext.php index a121f9c..5b3886e 100644 --- a/src/php-gettext/gettext.php +++ b/src/php-gettext/gettext.php @@ -98,7 +98,7 @@ class gettext_reader { * @param object Reader the StreamReader object * @param boolean enable_cache Enable or disable caching of strings (default on) */ - function gettext_reader($Reader, $enable_cache = true) { + function __construct($Reader, $enable_cache = true) { // If there isn't a StreamReader, turn on short circuit mode. if (! $Reader || isset($Reader->error) ) { $this->short_circuit = true; diff --git a/src/php-gettext/streams.php b/src/php-gettext/streams.php index 3cdc158..ab94719 100644 --- a/src/php-gettext/streams.php +++ b/src/php-gettext/streams.php @@ -49,7 +49,7 @@ class StringReader { var $_pos; var $_str; - function StringReader($str='') { + public function __construct($str='') { $this->_str = $str; $this->_pos = 0; } @@ -86,7 +86,7 @@ class FileReader { var $_fd; var $_length; - function FileReader($filename) { + public function __construct($filename) { if (file_exists($filename)) { $this->_length=filesize($filename); @@ -143,7 +143,7 @@ class FileReader { // Preloads entire file in memory first, then creates a StringReader // over it (it assumes knowledge of StringReader internals) class CachedFileReader extends StringReader { - function CachedFileReader($filename) { + public function __construct($filename) { if (file_exists($filename)) { $length=filesize($filename); |