latest php-gettext from https://code.launchpad.net/~danilo/php-gettext/
This commit is contained in:
parent
4526c3f712
commit
ee96a08700
|
@ -1,3 +1,7 @@
|
||||||
|
2009-11-27 Danilo Šegan <danilo@gnome.org>
|
||||||
|
|
||||||
|
* Makefile: discontinue use of ChangeLog with 1.0.8.
|
||||||
|
|
||||||
2006-02-28 Danilo Šegan <danilo@gnome.org>
|
2006-02-28 Danilo Šegan <danilo@gnome.org>
|
||||||
|
|
||||||
* gettext.php: Added some comments about these workarounds for
|
* gettext.php: Added some comments about these workarounds for
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
PHP-gettext 1.0
|
PHP-gettext 1.0 (https://launchpad.net/php-gettext)
|
||||||
|
|
||||||
Copyright 2003, 2006 -- Danilo "angry with PHP[1]" Segan
|
Copyright 2003, 2006, 2009 -- Danilo "angry with PHP[1]" Segan
|
||||||
Licensed under GPLv2 (or any later version, see COPYING)
|
Licensed under GPLv2 (or any later version, see COPYING)
|
||||||
|
|
||||||
[1] PHP is actually cyrillic, and translates roughly to
|
[1] PHP is actually cyrillic, and translates roughly to
|
||||||
|
@ -59,27 +59,7 @@ Features
|
||||||
|
|
||||||
Bugs
|
Bugs
|
||||||
|
|
||||||
Plural-forms field in MO header (translation for empty string,
|
Report them on https://bugs.launchpad.net/php-gettext
|
||||||
i.e. "") is treated according to PHP syntactic rules (it's
|
|
||||||
eval()ed). Since these should actually follow C syntax, there are
|
|
||||||
some problems.
|
|
||||||
|
|
||||||
For instance, I'm used to using this:
|
|
||||||
Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : \
|
|
||||||
n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;
|
|
||||||
but it fails with PHP (it sets $plural=2 instead of 0 for $n==1).
|
|
||||||
|
|
||||||
The fix is usually simple, but I'm lazy to go into the details of
|
|
||||||
PHP operator precedence, and maybe try to fix it. In here, I had
|
|
||||||
to put everything after the first ':' in parenthesis:
|
|
||||||
Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : \
|
|
||||||
(n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);
|
|
||||||
That works, and I'm satisfied.
|
|
||||||
|
|
||||||
Besides this one, there are probably a bunch of other bugs, since
|
|
||||||
I hate PHP (did I mention it already? no? strange), and don't
|
|
||||||
know it very well. So, feel free to fix any of those and report
|
|
||||||
them back to me at <danilo@kvota.net>.
|
|
||||||
|
|
||||||
Usage
|
Usage
|
||||||
|
|
||||||
|
@ -137,18 +117,10 @@ Example
|
||||||
There is also simple "update" script that can be used to generate
|
There is also simple "update" script that can be used to generate
|
||||||
POT file and to update the translation using msgmerge.
|
POT file and to update the translation using msgmerge.
|
||||||
|
|
||||||
Interesting TODO:
|
TODO:
|
||||||
|
|
||||||
o Try to parse "plural-forms" header field, and to follow C syntax
|
o Improve speed to be even more comparable to the native gettext
|
||||||
rules. This won't be easy.
|
implementation.
|
||||||
|
|
||||||
Boring TODO:
|
|
||||||
|
|
||||||
o Learn PHP and fix bugs, slowness and other stuff resulting from
|
|
||||||
my lack of knowledge (but *maybe*, it's not my knowledge that is
|
|
||||||
bad, but PHP itself ;-).
|
|
||||||
|
|
||||||
(This is mostly done thanks to Nico Kaiser.)
|
|
||||||
|
|
||||||
o Try to use hash tables in MO files: with pre-loading, would it
|
o Try to use hash tables in MO files: with pre-loading, would it
|
||||||
be useful at all?
|
be useful at all?
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
<?php
|
<?php
|
||||||
/*
|
/*
|
||||||
Copyright (c) 2005 Steven Armstrong <sa at c-area dot ch>
|
Copyright (c) 2005 Steven Armstrong <sa at c-area dot ch>
|
||||||
|
Copyright (c) 2009 Danilo Segan <danilo@kvota.net>
|
||||||
|
|
||||||
Drop in replacement for native gettext.
|
Drop in replacement for native gettext.
|
||||||
|
|
||||||
|
@ -22,15 +23,21 @@
|
||||||
|
|
||||||
*/
|
*/
|
||||||
/*
|
/*
|
||||||
LC_CTYPE 0
|
LC_CTYPE 0
|
||||||
LC_NUMERIC 1
|
LC_NUMERIC 1
|
||||||
LC_TIME 2
|
LC_TIME 2
|
||||||
LC_COLLATE 3
|
LC_COLLATE 3
|
||||||
LC_MONETARY 4
|
LC_MONETARY 4
|
||||||
LC_MESSAGES 5
|
LC_MESSAGES 5
|
||||||
LC_ALL 6
|
LC_ALL 6
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
// LC_MESSAGES is not available if php-gettext is not loaded
|
||||||
|
// while the other constants are already available from session extension.
|
||||||
|
if (!defined('LC_MESSAGES')) {
|
||||||
|
define('LC_MESSAGES', 5);
|
||||||
|
}
|
||||||
|
|
||||||
require('streams.php');
|
require('streams.php');
|
||||||
require('gettext.php');
|
require('gettext.php');
|
||||||
|
|
||||||
|
@ -44,29 +51,96 @@ $LC_CATEGORIES = array('LC_CTYPE', 'LC_NUMERIC', 'LC_TIME', 'LC_COLLATE', 'LC_MO
|
||||||
$EMULATEGETTEXT = 0;
|
$EMULATEGETTEXT = 0;
|
||||||
$CURRENTLOCALE = '';
|
$CURRENTLOCALE = '';
|
||||||
|
|
||||||
|
/* Class to hold a single domain included in $text_domains. */
|
||||||
|
class domain {
|
||||||
|
var $l10n;
|
||||||
|
var $path;
|
||||||
|
var $codeset;
|
||||||
|
}
|
||||||
|
|
||||||
// Utility functions
|
// Utility functions
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return a list of locales to try for any POSIX-style locale specification.
|
||||||
|
*/
|
||||||
|
function get_list_of_locales($locale) {
|
||||||
|
/* Figure out all possible locale names and start with the most
|
||||||
|
* specific ones. I.e. for sr_CS.UTF-8@latin, look through all of
|
||||||
|
* sr_CS.UTF-8@latin, sr_CS@latin, sr@latin, sr_CS.UTF-8, sr_CS, sr.
|
||||||
|
*/
|
||||||
|
$locale_names = array();
|
||||||
|
$lang = NULL;
|
||||||
|
$country = NULL;
|
||||||
|
$charset = NULL;
|
||||||
|
$modifier = NULL;
|
||||||
|
if ($locale) {
|
||||||
|
if (preg_match("/^(?P<lang>[a-z]{2,3})" // language code
|
||||||
|
."(?:_(?P<country>[A-Z]{2}))?" // country code
|
||||||
|
."(?:\.(?P<charset>[-A-Za-z0-9_]+))?" // charset
|
||||||
|
."(?:@(?P<modifier>[-A-Za-z0-9_]+))?$/", // @ modifier
|
||||||
|
$locale, $matches)) {
|
||||||
|
|
||||||
|
if (isset($matches["lang"])) $lang = $matches["lang"];
|
||||||
|
if (isset($matches["country"])) $country = $matches["country"];
|
||||||
|
if (isset($matches["charset"])) $charset = $matches["charset"];
|
||||||
|
if (isset($matches["modifier"])) $modifier = $matches["modifier"];
|
||||||
|
|
||||||
|
if ($modifier) {
|
||||||
|
if ($country) {
|
||||||
|
if ($charset)
|
||||||
|
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@$modifier");
|
||||||
|
}
|
||||||
|
if ($country) {
|
||||||
|
if ($charset)
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
|
||||||
|
// If the locale name doesn't match POSIX style, just include it as-is.
|
||||||
|
if (!in_array($locale, $locale_names))
|
||||||
|
array_push($locale_names, $locale);
|
||||||
|
}
|
||||||
|
return $locale_names;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Utility function to get a StreamReader for the given text domain.
|
* Utility function to get a StreamReader for the given text domain.
|
||||||
*/
|
*/
|
||||||
function _get_reader($domain=null, $category=5, $enable_cache=true) {
|
function _get_reader($domain=null, $category=5, $enable_cache=true) {
|
||||||
global $text_domains, $default_domain, $LC_CATEGORIES;
|
global $text_domains, $default_domain, $LC_CATEGORIES;
|
||||||
if (!isset($domain)) $domain = $default_domain;
|
if (!isset($domain)) $domain = $default_domain;
|
||||||
if (!isset($text_domains[$domain]->l10n)) {
|
if (!isset($text_domains[$domain]->l10n)) {
|
||||||
// get the current locale
|
// get the current locale
|
||||||
$locale = _setlocale(LC_MESSAGES, 0);
|
$locale = _setlocale(LC_MESSAGES, 0);
|
||||||
$p = isset($text_domains[$domain]->path) ? $text_domains[$domain]->path : './';
|
$bound_path = isset($text_domains[$domain]->path) ?
|
||||||
$path = $p . "$locale/". $LC_CATEGORIES[$category] ."/$domain.mo";
|
$text_domains[$domain]->path : './';
|
||||||
if (file_exists($path)) {
|
$subpath = $LC_CATEGORIES[$category] ."/$domain.mo";
|
||||||
$input = new FileReader($path);
|
|
||||||
}
|
$locale_names = get_list_of_locales($locale);
|
||||||
else {
|
$input = null;
|
||||||
$input = null;
|
foreach ($locale_names as $locale) {
|
||||||
}
|
$full_path = $bound_path . $locale . "/" . $subpath;
|
||||||
$text_domains[$domain]->l10n = new gettext_reader($input, $enable_cache);
|
if (file_exists($full_path)) {
|
||||||
}
|
$input = new FileReader($full_path);
|
||||||
return $text_domains[$domain]->l10n;
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!array_key_exists($domain, $text_domains)) {
|
||||||
|
// Initialize an empty domain object.
|
||||||
|
$text_domains[$domain] = new domain();
|
||||||
|
}
|
||||||
|
$text_domains[$domain]->l10n = new gettext_reader($input,
|
||||||
|
$enable_cache);
|
||||||
|
}
|
||||||
|
return $text_domains[$domain]->l10n;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -80,8 +154,10 @@ function locale_emulation() {
|
||||||
/**
|
/**
|
||||||
* Checks if the current locale is supported on this system.
|
* Checks if the current locale is supported on this system.
|
||||||
*/
|
*/
|
||||||
function _check_locale() {
|
function _check_locale_and_function($function=false) {
|
||||||
global $EMULATEGETTEXT;
|
global $EMULATEGETTEXT;
|
||||||
|
if ($function and !function_exists($function))
|
||||||
|
return false;
|
||||||
return !$EMULATEGETTEXT;
|
return !$EMULATEGETTEXT;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -89,30 +165,37 @@ function _check_locale() {
|
||||||
* Get the codeset for the given domain.
|
* Get the codeset for the given domain.
|
||||||
*/
|
*/
|
||||||
function _get_codeset($domain=null) {
|
function _get_codeset($domain=null) {
|
||||||
global $text_domains, $default_domain, $LC_CATEGORIES;
|
global $text_domains, $default_domain, $LC_CATEGORIES;
|
||||||
if (!isset($domain)) $domain = $default_domain;
|
if (!isset($domain)) $domain = $default_domain;
|
||||||
return (isset($text_domains[$domain]->codeset))? $text_domains[$domain]->codeset : ini_get('mbstring.internal_encoding');
|
return (isset($text_domains[$domain]->codeset))? $text_domains[$domain]->codeset : ini_get('mbstring.internal_encoding');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Convert the given string to the encoding set by bind_textdomain_codeset.
|
* Convert the given string to the encoding set by bind_textdomain_codeset.
|
||||||
*/
|
*/
|
||||||
function _encode($text) {
|
function _encode($text) {
|
||||||
$source_encoding = mb_detect_encoding($text);
|
$target_encoding = _get_codeset();
|
||||||
$target_encoding = _get_codeset();
|
if (function_exists("mb_detect_encoding")) {
|
||||||
if ($source_encoding != $target_encoding) {
|
$source_encoding = mb_detect_encoding($text);
|
||||||
return mb_convert_encoding($text, $target_encoding, $source_encoding);
|
if ($source_encoding != $target_encoding)
|
||||||
}
|
$text = mb_convert_encoding($text, $target_encoding, $source_encoding);
|
||||||
else {
|
}
|
||||||
return $text;
|
return $text;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// Custom implementation of the standard gettext related functions
|
// Custom implementation of the standard gettext related functions
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns passed in $locale, or environment variable $LANG if $locale == ''.
|
||||||
|
*/
|
||||||
|
function _get_default_locale($locale) {
|
||||||
|
if ($locale == '') // emulate variable support
|
||||||
|
return getenv('LANG');
|
||||||
|
else
|
||||||
|
return $locale;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sets a requested locale, if needed emulates it.
|
* Sets a requested locale, if needed emulates it.
|
||||||
*/
|
*/
|
||||||
|
@ -126,18 +209,26 @@ function _setlocale($category, $locale) {
|
||||||
// even if we tried to read locale without setting it first
|
// even if we tried to read locale without setting it first
|
||||||
return _setlocale($category, $CURRENTLOCALE);
|
return _setlocale($category, $CURRENTLOCALE);
|
||||||
} else {
|
} else {
|
||||||
$ret = 0;
|
if (function_exists('setlocale')) {
|
||||||
if (function_exists('setlocale')) // I don't know if this ever happens ;)
|
$ret = setlocale($category, $locale);
|
||||||
$ret = setlocale($category, $locale);
|
if (($locale == '' and !$ret) or // failed setting it by env
|
||||||
if ($ret and ($locale == '' or $ret == $locale)) {
|
($locale != '' and $ret != $locale)) { // failed setting it
|
||||||
$EMULATEGETTEXT = 0;
|
// Failed setting it according to environment.
|
||||||
$CURRENTLOCALE = $ret;
|
$CURRENTLOCALE = _get_default_locale($locale);
|
||||||
} else {
|
|
||||||
if ($locale == '') // emulate variable support
|
|
||||||
$CURRENTLOCALE = getenv('LANG');
|
|
||||||
else
|
|
||||||
$CURRENTLOCALE = $locale;
|
|
||||||
$EMULATEGETTEXT = 1;
|
$EMULATEGETTEXT = 1;
|
||||||
|
} else {
|
||||||
|
$CURRENTLOCALE = $ret;
|
||||||
|
$EMULATEGETTEXT = 0;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// No function setlocale(), emulate it all.
|
||||||
|
$CURRENTLOCALE = _get_default_locale($locale);
|
||||||
|
$EMULATEGETTEXT = 1;
|
||||||
|
}
|
||||||
|
// Allow locale to be changed on the go for one translation domain.
|
||||||
|
global $text_domains, $default_domain;
|
||||||
|
if (array_key_exists($default_domain, $text_domains)) {
|
||||||
|
unset($text_domains[$default_domain]->l10n);
|
||||||
}
|
}
|
||||||
return $CURRENTLOCALE;
|
return $CURRENTLOCALE;
|
||||||
}
|
}
|
||||||
|
@ -147,135 +238,241 @@ function _setlocale($category, $locale) {
|
||||||
* Sets the path for a domain.
|
* Sets the path for a domain.
|
||||||
*/
|
*/
|
||||||
function _bindtextdomain($domain, $path) {
|
function _bindtextdomain($domain, $path) {
|
||||||
global $text_domains;
|
global $text_domains;
|
||||||
// ensure $path ends with a slash
|
// ensure $path ends with a slash ('/' should work for both, but lets still play nice)
|
||||||
if ($path[strlen($path) - 1] != '/') $path .= '/';
|
if (substr(php_uname(), 0, 7) == "Windows") {
|
||||||
elseif ($path[strlen($path) - 1] != '\\') $path .= '\\';
|
if ($path[strlen($path)-1] != '\\' and $path[strlen($path)-1] != '/')
|
||||||
$text_domains[$domain]->path = $path;
|
$path .= '\\';
|
||||||
|
} else {
|
||||||
|
if ($path[strlen($path)-1] != '/')
|
||||||
|
$path .= '/';
|
||||||
|
}
|
||||||
|
if (!array_key_exists($domain, $text_domains)) {
|
||||||
|
// Initialize an empty domain object.
|
||||||
|
$text_domains[$domain] = new domain();
|
||||||
|
}
|
||||||
|
$text_domains[$domain]->path = $path;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Specify the character encoding in which the messages from the DOMAIN message catalog will be returned.
|
* Specify the character encoding in which the messages from the DOMAIN message catalog will be returned.
|
||||||
*/
|
*/
|
||||||
function _bind_textdomain_codeset($domain, $codeset) {
|
function _bind_textdomain_codeset($domain, $codeset) {
|
||||||
global $text_domains;
|
global $text_domains;
|
||||||
$text_domains[$domain]->codeset = $codeset;
|
$text_domains[$domain]->codeset = $codeset;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sets the default domain.
|
* Sets the default domain.
|
||||||
*/
|
*/
|
||||||
function _textdomain($domain) {
|
function _textdomain($domain) {
|
||||||
global $default_domain;
|
global $default_domain;
|
||||||
$default_domain = $domain;
|
$default_domain = $domain;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Lookup a message in the current domain.
|
* Lookup a message in the current domain.
|
||||||
*/
|
*/
|
||||||
function _gettext($msgid) {
|
function _gettext($msgid) {
|
||||||
$l10n = _get_reader();
|
$l10n = _get_reader();
|
||||||
//return $l10n->translate($msgid);
|
return _encode($l10n->translate($msgid));
|
||||||
return _encode($l10n->translate($msgid));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Alias for gettext.
|
* Alias for gettext.
|
||||||
*/
|
*/
|
||||||
function __($msgid) {
|
function __($msgid) {
|
||||||
return _gettext($msgid);
|
return _gettext($msgid);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Plural version of gettext.
|
* Plural version of gettext.
|
||||||
*/
|
*/
|
||||||
function _ngettext($single, $plural, $number) {
|
function _ngettext($singular, $plural, $number) {
|
||||||
$l10n = _get_reader();
|
$l10n = _get_reader();
|
||||||
//return $l10n->ngettext($single, $plural, $number);
|
return _encode($l10n->ngettext($singular, $plural, $number));
|
||||||
return _encode($l10n->ngettext($single, $plural, $number));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Override the current domain.
|
* Override the current domain.
|
||||||
*/
|
*/
|
||||||
function _dgettext($domain, $msgid) {
|
function _dgettext($domain, $msgid) {
|
||||||
$l10n = _get_reader($domain);
|
$l10n = _get_reader($domain);
|
||||||
//return $l10n->translate($msgid);
|
return _encode($l10n->translate($msgid));
|
||||||
return _encode($l10n->translate($msgid));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Plural version of dgettext.
|
* Plural version of dgettext.
|
||||||
*/
|
*/
|
||||||
function _dngettext($domain, $single, $plural, $number) {
|
function _dngettext($domain, $singular, $plural, $number) {
|
||||||
$l10n = _get_reader($domain);
|
$l10n = _get_reader($domain);
|
||||||
//return $l10n->ngettext($single, $plural, $number);
|
return _encode($l10n->ngettext($singular, $plural, $number));
|
||||||
return _encode($l10n->ngettext($single, $plural, $number));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Overrides the domain and category for a single lookup.
|
* Overrides the domain and category for a single lookup.
|
||||||
*/
|
*/
|
||||||
function _dcgettext($domain, $msgid, $category) {
|
function _dcgettext($domain, $msgid, $category) {
|
||||||
$l10n = _get_reader($domain, $category);
|
$l10n = _get_reader($domain, $category);
|
||||||
//return $l10n->translate($msgid);
|
return _encode($l10n->translate($msgid));
|
||||||
return _encode($l10n->translate($msgid));
|
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
* Plural version of dcgettext.
|
* Plural version of dcgettext.
|
||||||
*/
|
*/
|
||||||
function _dcngettext($domain, $single, $plural, $number, $category) {
|
function _dcngettext($domain, $singular, $plural, $number, $category) {
|
||||||
$l10n = _get_reader($domain, $category);
|
$l10n = _get_reader($domain, $category);
|
||||||
//return $l10n->ngettext($single, $plural, $number);
|
return _encode($l10n->ngettext($singular, $plural, $number));
|
||||||
return _encode($l10n->ngettext($single, $plural, $number));
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Context version of gettext.
|
||||||
|
*/
|
||||||
|
function _pgettext($context, $msgid) {
|
||||||
|
$l10n = _get_reader();
|
||||||
|
return _encode($l10n->pgettext($context, $msgid));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Override the current domain in a context gettext call.
|
||||||
|
*/
|
||||||
|
function _dpgettext($domain, $context, $msgid) {
|
||||||
|
$l10n = _get_reader($domain);
|
||||||
|
return _encode($l10n->pgettext($context, $msgid));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Overrides the domain and category for a single context-based lookup.
|
||||||
|
*/
|
||||||
|
function _dcpgettext($domain, $context, $msgid, $category) {
|
||||||
|
$l10n = _get_reader($domain, $category);
|
||||||
|
return _encode($l10n->pgettext($context, $msgid));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Context version of ngettext.
|
||||||
|
*/
|
||||||
|
function _npgettext($context, $singular, $plural) {
|
||||||
|
$l10n = _get_reader();
|
||||||
|
return _encode($l10n->npgettext($context, $singular, $plural));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Override the current domain in a context ngettext call.
|
||||||
|
*/
|
||||||
|
function _dnpgettext($domain, $context, $singular, $plural) {
|
||||||
|
$l10n = _get_reader($domain);
|
||||||
|
return _encode($l10n->npgettext($context, $singular, $plural));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Overrides the domain and category for a plural context-based lookup.
|
||||||
|
*/
|
||||||
|
function _dcnpgettext($domain, $context, $singular, $plural, $category) {
|
||||||
|
$l10n = _get_reader($domain, $category);
|
||||||
|
return _encode($l10n->npgettext($context, $singular, $plural));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// Wrappers to use if the standard gettext functions are available, but the current locale is not supported by the system.
|
// Wrappers to use if the standard gettext functions are available,
|
||||||
// Use the standard impl if the current locale is supported, use the custom impl otherwise.
|
// but the current locale is not supported by the system.
|
||||||
|
// Use the standard impl if the current locale is supported, use the
|
||||||
|
// custom impl otherwise.
|
||||||
|
|
||||||
function T_setlocale($category, $locale) {
|
function T_setlocale($category, $locale) {
|
||||||
return _setlocale($category, $locale);
|
return _setlocale($category, $locale);
|
||||||
}
|
}
|
||||||
|
|
||||||
function T_bindtextdomain($domain, $path) {
|
function T_bindtextdomain($domain, $path) {
|
||||||
if (_check_locale()) return bindtextdomain($domain, $path);
|
if (_check_locale_and_function()) return bindtextdomain($domain, $path);
|
||||||
else return _bindtextdomain($domain, $path);
|
else return _bindtextdomain($domain, $path);
|
||||||
}
|
}
|
||||||
function T_bind_textdomain_codeset($domain, $codeset) {
|
function T_bind_textdomain_codeset($domain, $codeset) {
|
||||||
// bind_textdomain_codeset is available only in PHP 4.2.0+
|
// bind_textdomain_codeset is available only in PHP 4.2.0+
|
||||||
if (_check_locale() and function_exists('bind_textdomain_codeset')) return bind_textdomain_codeset($domain, $codeset);
|
if (_check_locale_and_function('bind_textdomain_codeset'))
|
||||||
else return _bind_textdomain_codeset($domain, $codeset);
|
return bind_textdomain_codeset($domain, $codeset);
|
||||||
|
else return _bind_textdomain_codeset($domain, $codeset);
|
||||||
}
|
}
|
||||||
function T_textdomain($domain) {
|
function T_textdomain($domain) {
|
||||||
if (_check_locale()) return textdomain($domain);
|
if (_check_locale_and_function()) return textdomain($domain);
|
||||||
else return _textdomain($domain);
|
else return _textdomain($domain);
|
||||||
}
|
}
|
||||||
function T_gettext($msgid) {
|
function T_gettext($msgid) {
|
||||||
if (_check_locale()) return gettext($msgid);
|
if (_check_locale_and_function()) return gettext($msgid);
|
||||||
else return _gettext($msgid);
|
else return _gettext($msgid);
|
||||||
}
|
}
|
||||||
function T_($msgid) {
|
function T_($msgid) {
|
||||||
if (_check_locale()) return _($msgid);
|
if (_check_locale_and_function()) return _($msgid);
|
||||||
return __($msgid);
|
return __($msgid);
|
||||||
}
|
}
|
||||||
function T_ngettext($single, $plural, $number) {
|
function T_ngettext($singular, $plural, $number) {
|
||||||
if (_check_locale()) return ngettext($single, $plural, $number);
|
if (_check_locale_and_function())
|
||||||
else return _ngettext($single, $plural, $number);
|
return ngettext($singular, $plural, $number);
|
||||||
|
else return _ngettext($singular, $plural, $number);
|
||||||
}
|
}
|
||||||
function T_dgettext($domain, $msgid) {
|
function T_dgettext($domain, $msgid) {
|
||||||
if (_check_locale()) return dgettext($domain, $msgid);
|
if (_check_locale_and_function()) return dgettext($domain, $msgid);
|
||||||
else return _dgettext($domain, $msgid);
|
else return _dgettext($domain, $msgid);
|
||||||
}
|
}
|
||||||
function T_dngettext($domain, $single, $plural, $number) {
|
function T_dngettext($domain, $singular, $plural, $number) {
|
||||||
if (_check_locale()) return dngettext($domain, $single, $plural, $number);
|
if (_check_locale_and_function())
|
||||||
else return _dngettext($domain, $single, $plural, $number);
|
return dngettext($domain, $singular, $plural, $number);
|
||||||
|
else return _dngettext($domain, $singular, $plural, $number);
|
||||||
}
|
}
|
||||||
function T_dcgettext($domain, $msgid, $category) {
|
function T_dcgettext($domain, $msgid, $category) {
|
||||||
if (_check_locale()) return dcgettext($domain, $msgid, $category);
|
if (_check_locale_and_function())
|
||||||
else return _dcgettext($domain, $msgid, $category);
|
return dcgettext($domain, $msgid, $category);
|
||||||
|
else return _dcgettext($domain, $msgid, $category);
|
||||||
}
|
}
|
||||||
function T_dcngettext($domain, $single, $plural, $number, $category) {
|
function T_dcngettext($domain, $singular, $plural, $number, $category) {
|
||||||
if (_check_locale()) return dcngettext($domain, $single, $plural, $number, $category);
|
if (_check_locale_and_function())
|
||||||
else return _dcngettext($domain, $single, $plural, $number, $category);
|
return dcngettext($domain, $singular, $plural, $number, $category);
|
||||||
|
else return _dcngettext($domain, $singular, $plural, $number, $category);
|
||||||
|
}
|
||||||
|
|
||||||
|
function T_pgettext($context, $msgid) {
|
||||||
|
if (_check_locale_and_function('pgettext'))
|
||||||
|
return pgettext($context, $msgid);
|
||||||
|
else
|
||||||
|
return _pgettext($context, $msgid);
|
||||||
|
}
|
||||||
|
|
||||||
|
function T_dpgettext($domain, $context, $msgid) {
|
||||||
|
if (_check_locale_and_function('dpgettext'))
|
||||||
|
return dpgettext($domain, $context, $msgid);
|
||||||
|
else
|
||||||
|
return _dpgettext($domain, $context, $msgid);
|
||||||
|
}
|
||||||
|
|
||||||
|
function T_dcpgettext($domain, $context, $msgid, $category) {
|
||||||
|
if (_check_locale_and_function('dcpgettext'))
|
||||||
|
return dcpgettext($domain, $context, $msgid, $category);
|
||||||
|
else
|
||||||
|
return _dcpgettext($domain, $context, $msgid, $category);
|
||||||
|
}
|
||||||
|
|
||||||
|
function T_npgettext($context, $singular, $plural, $number) {
|
||||||
|
if (_check_locale_and_function('npgettext'))
|
||||||
|
return npgettext($context, $singular, $plural, $number);
|
||||||
|
else
|
||||||
|
return _npgettext($context, $singular, $plural, $number);
|
||||||
|
}
|
||||||
|
|
||||||
|
function T_dnpgettext($domain, $context, $singular, $plural, $number) {
|
||||||
|
if (_check_locale_and_function('dnpgettext'))
|
||||||
|
return dnpgettext($domain, $context, $singular, $plural, $number);
|
||||||
|
else
|
||||||
|
return _dnpgettext($domain, $context, $singular, $plural, $number);
|
||||||
|
}
|
||||||
|
|
||||||
|
function T_dcnpgettext($domain, $context, $singular, $plural,
|
||||||
|
$number, $category) {
|
||||||
|
if (_check_locale_and_function('dcnpgettext'))
|
||||||
|
return dcnpgettext($domain, $context, $singular,
|
||||||
|
$plural, $number, $category);
|
||||||
|
else
|
||||||
|
return _dcnpgettext($domain, $context, $singular,
|
||||||
|
$plural, $number, $category);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -283,36 +480,56 @@ function T_dcngettext($domain, $single, $plural, $number, $category) {
|
||||||
// Wrappers used as a drop in replacement for the standard gettext functions
|
// Wrappers used as a drop in replacement for the standard gettext functions
|
||||||
|
|
||||||
if (!function_exists('gettext')) {
|
if (!function_exists('gettext')) {
|
||||||
function bindtextdomain($domain, $path) {
|
function bindtextdomain($domain, $path) {
|
||||||
return _bindtextdomain($domain, $path);
|
return _bindtextdomain($domain, $path);
|
||||||
}
|
}
|
||||||
function bind_textdomain_codeset($domain, $codeset) {
|
function bind_textdomain_codeset($domain, $codeset) {
|
||||||
return _bind_textdomain_codeset($domain, $codeset);
|
return _bind_textdomain_codeset($domain, $codeset);
|
||||||
}
|
}
|
||||||
function textdomain($domain) {
|
function textdomain($domain) {
|
||||||
return _textdomain($domain);
|
return _textdomain($domain);
|
||||||
}
|
}
|
||||||
function gettext($msgid) {
|
function gettext($msgid) {
|
||||||
return _gettext($msgid);
|
return _gettext($msgid);
|
||||||
}
|
}
|
||||||
function _($msgid) {
|
function _($msgid) {
|
||||||
return __($msgid);
|
return __($msgid);
|
||||||
}
|
}
|
||||||
function ngettext($single, $plural, $number) {
|
function ngettext($singular, $plural, $number) {
|
||||||
return _ngettext($single, $plural, $number);
|
return _ngettext($singular, $plural, $number);
|
||||||
}
|
}
|
||||||
function dgettext($domain, $msgid) {
|
function dgettext($domain, $msgid) {
|
||||||
return _dgettext($domain, $msgid);
|
return _dgettext($domain, $msgid);
|
||||||
}
|
}
|
||||||
function dngettext($domain, $single, $plural, $number) {
|
function dngettext($domain, $singular, $plural, $number) {
|
||||||
return _dngettext($domain, $single, $plural, $number);
|
return _dngettext($domain, $singular, $plural, $number);
|
||||||
}
|
}
|
||||||
function dcgettext($domain, $msgid, $category) {
|
function dcgettext($domain, $msgid, $category) {
|
||||||
return _dcgettext($domain, $msgid, $category);
|
return _dcgettext($domain, $msgid, $category);
|
||||||
}
|
}
|
||||||
function dcngettext($domain, $single, $plural, $number, $category) {
|
function dcngettext($domain, $singular, $plural, $number, $category) {
|
||||||
return _dcngettext($domain, $single, $plural, $number, $category);
|
return _dcngettext($domain, $singular, $plural, $number, $category);
|
||||||
}
|
}
|
||||||
|
function pgettext($context, $msgid) {
|
||||||
|
return _pgettext($context, $msgid);
|
||||||
|
}
|
||||||
|
function npgettext($context, $singular, $plural, $number) {
|
||||||
|
return _npgettext($context, $singular, $plural, $number);
|
||||||
|
}
|
||||||
|
function dpgettext($domain, $context, $msgid) {
|
||||||
|
return _dpgettext($domain, $context, $msgid);
|
||||||
|
}
|
||||||
|
function dnpgettext($domain, $context, $singular, $plural, $number) {
|
||||||
|
return _dnpgettext($domain, $context, $singular, $plural, $number);
|
||||||
|
}
|
||||||
|
function dcpgettext($domain, $context, $msgid, $category) {
|
||||||
|
return _dcpgettext($domain, $context, $msgid, $category);
|
||||||
|
}
|
||||||
|
function dcnpgettext($domain, $context, $singular, $plural,
|
||||||
|
$number, $category) {
|
||||||
|
return _dcnpgettext($domain, $context, $singular, $plural,
|
||||||
|
$number, $category);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
?>
|
|
@ -1,6 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
/*
|
/*
|
||||||
Copyright (c) 2003 Danilo Segan <danilo@kvota.net>.
|
Copyright (c) 2003, 2009 Danilo Segan <danilo@kvota.net>.
|
||||||
Copyright (c) 2005 Nico Kaiser <nico@siriux.net>
|
Copyright (c) 2005 Nico Kaiser <nico@siriux.net>
|
||||||
|
|
||||||
This file is part of PHP-gettext.
|
This file is part of PHP-gettext.
|
||||||
|
@ -63,13 +63,19 @@ class gettext_reader {
|
||||||
function readint() {
|
function readint() {
|
||||||
if ($this->BYTEORDER == 0) {
|
if ($this->BYTEORDER == 0) {
|
||||||
// low endian
|
// low endian
|
||||||
return array_shift(unpack('V', $this->STREAM->read(4)));
|
$input=unpack('V', $this->STREAM->read(4));
|
||||||
|
return array_shift($input);
|
||||||
} else {
|
} else {
|
||||||
// big endian
|
// big endian
|
||||||
return array_shift(unpack('N', $this->STREAM->read(4)));
|
$input=unpack('N', $this->STREAM->read(4));
|
||||||
|
return array_shift($input);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function read($bytes) {
|
||||||
|
return $this->STREAM->read($bytes);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Reads an array of Integers from the Stream
|
* Reads an array of Integers from the Stream
|
||||||
*
|
*
|
||||||
|
@ -102,17 +108,15 @@ class gettext_reader {
|
||||||
// Caching can be turned off
|
// Caching can be turned off
|
||||||
$this->enable_cache = $enable_cache;
|
$this->enable_cache = $enable_cache;
|
||||||
|
|
||||||
// $MAGIC1 = (int)0x950412de; //bug in PHP 5.0.2, see https://savannah.nongnu.org/bugs/?func=detailitem&item_id=10565
|
$MAGIC1 = "\x95\x04\x12\xde";
|
||||||
$MAGIC1 = (int) - 1794895138;
|
$MAGIC2 = "\xde\x12\x04\x95";
|
||||||
// $MAGIC2 = (int)0xde120495; //bug
|
|
||||||
$MAGIC2 = (int) - 569244523;
|
|
||||||
|
|
||||||
$this->STREAM = $Reader;
|
$this->STREAM = $Reader;
|
||||||
$magic = $this->readint();
|
$magic = $this->read(4);
|
||||||
if ($magic == ($MAGIC1 & 0xFFFFFFFF)) { // to make sure it works for 64-bit platforms
|
if ($magic == $MAGIC1) {
|
||||||
$this->BYTEORDER = 0;
|
|
||||||
} elseif ($magic == ($MAGIC2 & 0xFFFFFFFF)) {
|
|
||||||
$this->BYTEORDER = 1;
|
$this->BYTEORDER = 1;
|
||||||
|
} elseif ($magic == $MAGIC2) {
|
||||||
|
$this->BYTEORDER = 0;
|
||||||
} else {
|
} else {
|
||||||
$this->error = 1; // not MO file
|
$this->error = 1; // not MO file
|
||||||
return false;
|
return false;
|
||||||
|
@ -140,10 +144,14 @@ class gettext_reader {
|
||||||
return;
|
return;
|
||||||
|
|
||||||
/* get original and translations tables */
|
/* get original and translations tables */
|
||||||
$this->STREAM->seekto($this->originals);
|
if (!is_array($this->table_originals)) {
|
||||||
$this->table_originals = $this->readintarray($this->total * 2);
|
$this->STREAM->seekto($this->originals);
|
||||||
$this->STREAM->seekto($this->translations);
|
$this->table_originals = $this->readintarray($this->total * 2);
|
||||||
$this->table_translations = $this->readintarray($this->total * 2);
|
}
|
||||||
|
if (!is_array($this->table_translations)) {
|
||||||
|
$this->STREAM->seekto($this->translations);
|
||||||
|
$this->table_translations = $this->readintarray($this->total * 2);
|
||||||
|
}
|
||||||
|
|
||||||
if ($this->enable_cache) {
|
if ($this->enable_cache) {
|
||||||
$this->cache_translations = array ();
|
$this->cache_translations = array ();
|
||||||
|
@ -261,6 +269,55 @@ class gettext_reader {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sanitize plural form expression for use in PHP eval call.
|
||||||
|
*
|
||||||
|
* @access private
|
||||||
|
* @return string sanitized plural form expression
|
||||||
|
*/
|
||||||
|
function sanitize_plural_expression($expr) {
|
||||||
|
// Get rid of disallowed characters.
|
||||||
|
$expr = preg_replace('@[^a-zA-Z0-9_:;\(\)\?\|\&=!<>+*/\%-]@', '', $expr);
|
||||||
|
|
||||||
|
// Add parenthesis for tertiary '?' operator.
|
||||||
|
$expr .= ';';
|
||||||
|
$res = '';
|
||||||
|
$p = 0;
|
||||||
|
for ($i = 0; $i < strlen($expr); $i++) {
|
||||||
|
$ch = $expr[$i];
|
||||||
|
switch ($ch) {
|
||||||
|
case '?':
|
||||||
|
$res .= ' ? (';
|
||||||
|
$p++;
|
||||||
|
break;
|
||||||
|
case ':':
|
||||||
|
$res .= ') : (';
|
||||||
|
break;
|
||||||
|
case ';':
|
||||||
|
$res .= str_repeat( ')', $p) . ';';
|
||||||
|
$p = 0;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
$res .= $ch;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return $res;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Parse full PO header and extract only plural forms line.
|
||||||
|
*
|
||||||
|
* @access private
|
||||||
|
* @return string verbatim plural form header field
|
||||||
|
*/
|
||||||
|
function extract_plural_forms_header_from_po_header($header) {
|
||||||
|
if (preg_match("/(^|\n)plural-forms: ([^\n]*)\n/i", $header, $regs))
|
||||||
|
$expr = $regs[2];
|
||||||
|
else
|
||||||
|
$expr = "nplurals=2; plural=n == 1 ? 0 : 1;";
|
||||||
|
return $expr;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get possible plural forms from MO header
|
* Get possible plural forms from MO header
|
||||||
*
|
*
|
||||||
|
@ -279,11 +336,8 @@ class gettext_reader {
|
||||||
} else {
|
} else {
|
||||||
$header = $this->get_translation_string(0);
|
$header = $this->get_translation_string(0);
|
||||||
}
|
}
|
||||||
if (eregi("plural-forms: ([^\n]*)\n", $header, $regs))
|
$expr = $this->extract_plural_forms_header_from_po_header($header);
|
||||||
$expr = $regs[1];
|
$this->pluralheader = $this->sanitize_plural_expression($expr);
|
||||||
else
|
|
||||||
$expr = "nplurals=2; plural=n == 1 ? 0 : 1;";
|
|
||||||
$this->pluralheader = $expr;
|
|
||||||
}
|
}
|
||||||
return $this->pluralheader;
|
return $this->pluralheader;
|
||||||
}
|
}
|
||||||
|
@ -330,7 +384,7 @@ class gettext_reader {
|
||||||
$select = $this->select_string($number);
|
$select = $this->select_string($number);
|
||||||
|
|
||||||
// this should contains all strings separated by NULLs
|
// this should contains all strings separated by NULLs
|
||||||
$key = $single.chr(0).$plural;
|
$key = $single . chr(0) . $plural;
|
||||||
|
|
||||||
|
|
||||||
if ($this->enable_cache) {
|
if ($this->enable_cache) {
|
||||||
|
@ -353,6 +407,26 @@ class gettext_reader {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function pgettext($context, $msgid) {
|
||||||
|
$key = $context . chr(4) . $msgid;
|
||||||
|
$ret = $this->translate($key);
|
||||||
|
if (strpos($ret, "\004") !== FALSE) {
|
||||||
|
return $msgid;
|
||||||
|
} else {
|
||||||
|
return $ret;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function npgettext($context, $singular, $plural, $number) {
|
||||||
|
$key = $context . chr(4) . $singular;
|
||||||
|
$ret = $this->ngettext($key, $plural, $number);
|
||||||
|
if (strpos($ret, "\004") !== FALSE) {
|
||||||
|
return $singular;
|
||||||
|
} else {
|
||||||
|
return $ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
/*
|
/*
|
||||||
Copyright (c) 2003, 2005 Danilo Segan <danilo@kvota.net>.
|
Copyright (c) 2003, 2005, 2006, 2009 Danilo Segan <danilo@kvota.net>.
|
||||||
|
|
||||||
This file is part of PHP-gettext.
|
This file is part of PHP-gettext.
|
||||||
|
|
||||||
|
@ -21,8 +21,8 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
// Simple class to wrap file streams, string streams, etc.
|
// Simple class to wrap file streams, string streams, etc.
|
||||||
// seek is essential, and it should be byte stream
|
// seek is essential, and it should be byte stream
|
||||||
class StreamReader {
|
class StreamReader {
|
||||||
// should return a string [FIXME: perhaps return array of bytes?]
|
// should return a string [FIXME: perhaps return array of bytes?]
|
||||||
function read($bytes) {
|
function read($bytes) {
|
||||||
|
@ -43,7 +43,7 @@ class StreamReader {
|
||||||
function length() {
|
function length() {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
|
|
||||||
class StringReader {
|
class StringReader {
|
||||||
var $_pos;
|
var $_pos;
|
||||||
|
@ -78,7 +78,7 @@ class StringReader {
|
||||||
return strlen($this->_str);
|
return strlen($this->_str);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
};
|
||||||
|
|
||||||
|
|
||||||
class FileReader {
|
class FileReader {
|
||||||
|
@ -93,8 +93,8 @@ class FileReader {
|
||||||
$this->_pos = 0;
|
$this->_pos = 0;
|
||||||
$this->_fd = fopen($filename,'rb');
|
$this->_fd = fopen($filename,'rb');
|
||||||
if (!$this->_fd) {
|
if (!$this->_fd) {
|
||||||
$this->error = 3; // Cannot read file, probably permissions
|
$this->error = 3; // Cannot read file, probably permissions
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
$this->error = 2; // File doesn't exist
|
$this->error = 2; // File doesn't exist
|
||||||
|
@ -138,7 +138,7 @@ class FileReader {
|
||||||
fclose($this->_fd);
|
fclose($this->_fd);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
};
|
||||||
|
|
||||||
// Preloads entire file in memory first, then creates a StringReader
|
// Preloads entire file in memory first, then creates a StringReader
|
||||||
// over it (it assumes knowledge of StringReader internals)
|
// over it (it assumes knowledge of StringReader internals)
|
||||||
|
@ -150,8 +150,8 @@ class CachedFileReader extends StringReader {
|
||||||
$fd = fopen($filename,'rb');
|
$fd = fopen($filename,'rb');
|
||||||
|
|
||||||
if (!$fd) {
|
if (!$fd) {
|
||||||
$this->error = 3; // Cannot read file, probably permissions
|
$this->error = 3; // Cannot read file, probably permissions
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
$this->_str = fread($fd, $length);
|
$this->_str = fread($fd, $length);
|
||||||
fclose($fd);
|
fclose($fd);
|
||||||
|
@ -161,7 +161,7 @@ class CachedFileReader extends StringReader {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
|
|
||||||
|
|
||||||
?>
|
?>
|
Loading…
Reference in New Issue
Block a user