Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

- E_STRICT warnings

- fixed getStringID()


git-svn-id: http://svn.php.net/repository/pear/packages/Translation2/trunk@252087 c90b9560-bf6c-de11-be94-00142212c4b1
  • Loading branch information...
commit 0153da793bc3cb6f4e4c7b97a81d6f14dbf0e4db 1 parent 20bf2fa
@quipo quipo authored
View
6 Container/dataobjectsimple.php
@@ -30,7 +30,7 @@
* @category Internationalization
* @package Translation2
* @author Alan Knowles <alan@akbkhome.com>
- * @copyright 2004-2007 Alan Knowles
+ * @copyright 2004-2008 Alan Knowles
* @license http://www.debian.org/misc/bsd.license BSD License (3 Clause)
* @version CVS: $Id$
* @link http://pear.php.net/package/Translation2
@@ -69,7 +69,7 @@
* @category Internationalization
* @package Translation2
* @author Alan Knowles <alan@akbkhome.com>
- * @copyright 2004-2007 Alan Knowles
+ * @copyright 2004-2008 Alan Knowles
* @license http://www.debian.org/misc/bsd.license BSD License (3 Clause)
* @version CVS: $Id$
* @link http://pear.php.net/package/Translation2
@@ -147,7 +147,7 @@ function fetchLangs()
*
* @return array
*/
- function &getPage($pageID = null, $langID = null)
+ function getPage($pageID = null, $langID = null)
{
$langID = $this->_getLangID($langID);
if (PEAR::isError($langID)) {
View
6 Container/db.php
@@ -31,7 +31,7 @@
* @package Translation2
* @author Lorenzo Alberton <l.alberton@quipo.it>
* @author Ian Eure <ieure@php.net>
- * @copyright 2004-2007 Lorenzo Alberton, Ian Eure
+ * @copyright 2004-2008 Lorenzo Alberton, Ian Eure
* @license http://www.debian.org/misc/bsd.license BSD License (3 Clause)
* @version CVS: $Id$
* @link http://pear.php.net/package/Translation2
@@ -52,7 +52,7 @@
* @package Translation2
* @author Lorenzo Alberton <l.alberton@quipo.it>
* @author Ian Eure <ieure@php.net>
- * @copyright 2004-2007 Lorenzo Alberton, Ian Eure
+ * @copyright 2004-2008 Lorenzo Alberton, Ian Eure
* @license http://www.debian.org/misc/bsd.license BSD License (3 Clause)
* @version CVS: $Id$
* @link http://pear.php.net/package/Translation2
@@ -212,7 +212,7 @@ function fetchLangs()
*
* @return array
*/
- function &getPage($pageID = null, $langID = null)
+ function getPage($pageID = null, $langID = null)
{
$langID = $this->_getLangID($langID);
if (PEAR::isError($langID)) {
View
10 Container/gettext.php
@@ -31,7 +31,7 @@
* @package Translation2
* @author Lorenzo Alberton <l.alberton@quipo.it>
* @author Michael Wallner <mike@php.net>
- * @copyright 2004-2007 Lorenzo Alberton, Michael Wallner
+ * @copyright 2004-2008 Lorenzo Alberton, Michael Wallner
* @license http://www.debian.org/misc/bsd.license BSD License (3 Clause)
* @version CVS: $Id$
* @link http://pear.php.net/package/Translation2
@@ -57,7 +57,7 @@
* @package Translation2
* @author Lorenzo Alberton <l.alberton@quipo.it>
* @author Michael Wallner <mike@php.net>
- * @copyright 2004-2007 Lorenzo Alberton, Michael Wallner
+ * @copyright 2004-2008 Lorenzo Alberton, Michael Wallner
* @license http://www.debian.org/misc/bsd.license BSD License (3 Clause)
* @version CVS: $Id$
* @link http://pear.php.net/package/Translation2
@@ -322,12 +322,12 @@ function getOne($stringID, $pageID = null, $langID = null)
/**
* Get the stringID for the given string
*
- * @param string $stringID string ID
- * @param string $pageID page/group ID
+ * @param string $string string
+ * @param string $pageID page/group ID
*
* @return string|PEAR_Error
*/
- function getStringID($stringID, $pageID = null)
+ function getStringID($string, $pageID = null)
{
if (empty($pageID) || $pageID == TRANSLATION2_DEFAULT_PAGEID) {
$pageID = $this->options['default_domain'];
View
12 Container/mdb.php
@@ -30,7 +30,7 @@
* @category Internationalization
* @package Translation2
* @author Lorenzo Alberton <l.alberton@quipo.it>
- * @copyright 2004-2007 Lorenzo Alberton
+ * @copyright 2004-2008 Lorenzo Alberton
* @license http://www.debian.org/misc/bsd.license BSD License (3 Clause)
* @version CVS: $Id$
* @link http://pear.php.net/package/Translation2
@@ -50,7 +50,7 @@
* @category Internationalization
* @package Translation2
* @author Lorenzo Alberton <l.alberton@quipo.it>
- * @copyright 2004-2007 Lorenzo Alberton
+ * @copyright 2004-2008 Lorenzo Alberton
* @license http://www.debian.org/misc/bsd.license BSD License (3 Clause)
* @version CVS: $Id$
* @link http://pear.php.net/package/Translation2
@@ -192,7 +192,7 @@ function fetchLangs()
*
* @return array|PEAR_Error on error
*/
- function &getPage($pageID = null, $langID = null)
+ function getPage($pageID = null, $langID = null)
{
$langID = $this->_getLangID($langID);
if (PEAR::isError($langID)) {
@@ -264,12 +264,12 @@ function getOne($stringID, $pageID = null, $langID = null)
/**
* Get the stringID for the given string
*
- * @param string $stringID string ID
- * @param string $pageID page/group ID
+ * @param string $string string
+ * @param string $pageID page/group ID
*
* @return string
*/
- function getStringID($stringID, $pageID = null)
+ function getStringID($string, $pageID = null)
{
$lang_col = $this->_getLangCol($this->currentLang['id']);
$table = $this->_getLangTable($this->currentLang['id']);
View
12 Container/mdb2.php
@@ -30,7 +30,7 @@
* @category Internationalization
* @package Translation2
* @author Lorenzo Alberton <l.alberton@quipo.it>
- * @copyright 2004-2007 Lorenzo Alberton
+ * @copyright 2004-2008 Lorenzo Alberton
* @license http://www.debian.org/misc/bsd.license BSD License (3 Clause)
* @version CVS: $Id$
* @link http://pear.php.net/package/Translation2
@@ -50,7 +50,7 @@
* @category Internationalization
* @package Translation2
* @author Lorenzo Alberton <l.alberton@quipo.it>
- * @copyright 2004-2007 Lorenzo Alberton
+ * @copyright 2004-2008 Lorenzo Alberton
* @license http://www.debian.org/misc/bsd.license BSD License (3 Clause)
* @version CVS: $Id$
* @link http://pear.php.net/package/Translation2
@@ -206,7 +206,7 @@ function fetchLangs()
*
* @return array
*/
- function &getPage($pageID = null, $langID = null)
+ function getPage($pageID = null, $langID = null)
{
$langID = $this->_getLangID($langID);
if (PEAR::isError($langID)) {
@@ -287,12 +287,12 @@ function getOne($stringID, $pageID = null, $langID = null)
/**
* Get the stringID for the given string
*
- * @param string $stringID string ID
- * @param string $pageID page/group ID
+ * @param string $string string
+ * @param string $pageID page/group ID
*
* @return string
*/
- function getStringID($stringID, $pageID = null)
+ function getStringID($string, $pageID = null)
{
$lang_col = $this->_getLangCol($this->currentLang['id']);
$table = $this->_getLangTable($this->currentLang['id']);
View
14 Container/xml.php
@@ -31,7 +31,7 @@
* @package Translation2
* @author Lorenzo Alberton <l.alberton@quipo.it>
* @author Olivier Guilyardi <olivier@samalyse.com>
- * @copyright 2004-2007 Lorenzo Alberton, Olivier Guilyardi
+ * @copyright 2004-2008 Lorenzo Alberton, Olivier Guilyardi
* @license http://www.debian.org/misc/bsd.license BSD License (3 Clause)
* @version CVS: $Id$
* @link http://pear.php.net/package/Translation2
@@ -99,7 +99,7 @@
* @package Translation2
* @author Lorenzo Alberton <l.alberton@quipo.it>
* @author Olivier Guilyardi <olivier@samalyse.com>
- * @copyright 2004-2007 Lorenzo Alberton, Olivier Guilyardi
+ * @copyright 2004-2008 Lorenzo Alberton, Olivier Guilyardi
* @license http://www.debian.org/misc/bsd.license BSD License (3 Clause)
* @link http://pear.php.net/package/Translation2
*/
@@ -477,18 +477,18 @@ function getOne($stringID, $pageID = null, $langID = null)
/**
* Get the stringID for the given string
*
- * @param string $stringID string ID
- * @param string $pageID page/group ID
+ * @param string $string string
+ * @param string $pageID page/group ID
*
* @return string
*/
- function getStringID($stringID, $pageID = null)
+ function getStringID($string, $pageID = null)
{
$pageID = (is_null($pageID)) ? '#NULL' : $pageID;
- foreach ($this->_data['pages'][$pageID] as $str_id => $translations) {
+ foreach ($this->_data['pages'][$pageID] as $stringID => $translations) {
if (array_search($string, $translations) !== false) {
- return $str_id;
+ return $stringID;
}
}
View
10 package.xml
@@ -45,8 +45,8 @@ Currently, the following decorators are provided:
<email>mike@php.net</email>
<active>yes</active>
</developer>
- <date>2007-12-16</date>
- <time>21:26:30</time>
+ <date>2008-02-02</date>
+ <time>19:20:30</time>
<version>
<release>2.0.0RC4</release>
<api>2.0.0RC4</api>
@@ -57,6 +57,8 @@ Currently, the following decorators are provided:
</stability>
<license uri="http://www.debian.org/misc/bsd.license">BSD</license>
<notes>- fixed bug #12703: CacheLiteFunction decorator and getLang() issue
+- fixed some E_STRICT warnings
+- fixed getStringID()
</notes>
<contents>
<dir name="/">
@@ -200,9 +202,11 @@ Currently, the following decorators are provided:
<release>beta</release>
<api>beta</api>
</stability>
- <date>2007-12-16</date>
+ <date>2008-02-02</date>
<license uri="http://www.debian.org/misc/bsd.license">BSD</license>
<notes>- fixed bug #12703: CacheLiteFunction decorator and getLang() issue
+- fixed some E_STRICT warnings
+- fixed getStringID()
</notes>
</release>
<release>
Please sign in to comment.
Something went wrong with that request. Please try again.