projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add yes_text and no_text option attributes that allow the overriding of the Yes/No...
[squirrelmail.git]
/
functions
/
gettext.php
diff --git
a/functions/gettext.php
b/functions/gettext.php
index e95e80ba5b11952ab6874bec442e37a46c262b37..af1e118712324b756c85652831a932afa54212f6 100644
(file)
--- a/
functions/gettext.php
+++ b/
functions/gettext.php
@@
-1,21
+1,21
@@
<?php
<?php
+
/**
* SquirrelMail internal gettext functions
*
* Since 1.5.1 uses php-gettext classes.
* Original implementation was done by Tyler Akins (fidian)
/**
* SquirrelMail internal gettext functions
*
* Since 1.5.1 uses php-gettext classes.
* Original implementation was done by Tyler Akins (fidian)
- * @copyright (c) 1999-2005 The SquirrelMail Project Team
- * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ *
* @link http://www.php.net/gettext Original php gettext manual
* @link http://savannah.nongnu.org/projects/php-gettext php-gettext classes
* @link http://www.php.net/gettext Original php gettext manual
* @link http://savannah.nongnu.org/projects/php-gettext php-gettext classes
+ * @copyright © 1999-2007 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @since 1.1.2
* @package squirrelmail
* @subpackage i18n
*/
* @version $Id$
* @since 1.1.2
* @package squirrelmail
* @subpackage i18n
*/
-/** Almost everything requires global.php... */
-require_once(SM_PATH . 'functions/global.php');
/** Load classes and other functions */
include_once(SM_PATH . 'class/l10n.class.php');
/** Load classes and other functions */
include_once(SM_PATH . 'class/l10n.class.php');
@@
-34,7
+34,7
@@
function _($str) {
global $l10n, $gettext_domain;
if (! isset($l10n[$gettext_domain]) ||
! is_object($l10n[$gettext_domain]) ||
global $l10n, $gettext_domain;
if (! isset($l10n[$gettext_domain]) ||
! is_object($l10n[$gettext_domain]) ||
- $l10n[$gettext_domain]->error==1)
+ $l10n[$gettext_domain]->error==1)
return $str;
return $l10n[$gettext_domain]->translate($str);
}
return $str;
return $l10n[$gettext_domain]->translate($str);
}
@@
-96,9
+96,8
@@
if (! function_exists('dgettext')) {
global $l10n;
if (! isset($l10n[$domain]) ||
! is_object($l10n[$domain]) ||
global $l10n;
if (! isset($l10n[$domain]) ||
! is_object($l10n[$domain]) ||
- $l10n[$domain]->error==1)
+ $l10n[$domain]->error==1)
return $str;
return $l10n[$domain]->translate($str);
}
}
return $str;
return $l10n[$domain]->translate($str);
}
}
-?>
\ No newline at end of file