[Fusionforge-commits] r7061 - in trunk/gforge/common: forum include
Alain Peyrat
aljeux at libremir.placard.fr.eu.org
Tue Feb 24 17:50:12 CET 2009
Author: aljeux
Date: 2009-02-24 17:50:12 +0100 (Tue, 24 Feb 2009)
New Revision: 7061
Modified:
trunk/gforge/common/forum/Forum.class.php
trunk/gforge/common/include/gettext.php
Log:
use system side lang for forum Welcome msg
Modified: trunk/gforge/common/forum/Forum.class.php
===================================================================
--- trunk/gforge/common/forum/Forum.class.php 2009-02-24 10:46:14 UTC (rev 7060)
+++ trunk/gforge/common/forum/Forum.class.php 2009-02-24 16:50:12 UTC (rev 7061)
@@ -182,7 +182,12 @@
$this->fetchData($this->group_forum_id);
if ($create_default_message) {
$fm=new ForumMessage($this);
- if (!$fm->create("Welcome to ".$forum_name,"Welcome to ".$forum_name)) {
+ // Use the system side default language
+ setup_gettext_from_sys_lang ();
+ $string=sprintf(_('Welcome to %1$s'), $forum_name);
+ // and switch back to the user preference
+ setup_gettext_from_browser ();
+ if (!$fm->create($string, $string)) {
$this->setError($fm->getErrorMessage());
return false;
}
Modified: trunk/gforge/common/include/gettext.php
===================================================================
--- trunk/gforge/common/include/gettext.php 2009-02-24 10:46:14 UTC (rev 7060)
+++ trunk/gforge/common/include/gettext.php 2009-02-24 16:50:12 UTC (rev 7061)
@@ -190,6 +190,17 @@
setup_gettext_from_locale ($locale) ;
}
+function setup_gettext_from_sys_lang () {
+
+ $lang = "English";
+ if ($GLOBALS['sys_lang']) {
+ $lang = $GLOBALS['sys_lang'] ;
+ }
+
+ $locale = language_name_to_locale_code($lang).'.utf8';
+ setup_gettext_from_locale ($locale) ;
+}
+
function setup_gettext_from_locale ($locale) {
setlocale(LC_ALL, $locale);
setlocale (LC_TIME, _('en_US'));
More information about the Fusionforge-commits
mailing list