[Fusionforge-commits] r7068 - in trunk/gforge: common/forum common/include plugins/mediawiki/usr/share/mediawiki1.7/includes www/include

Alain Peyrat aljeux at libremir.placard.fr.eu.org
Wed Feb 25 20:32:08 CET 2009


Author: aljeux
Date: 2009-02-25 20:32:08 +0100 (Wed, 25 Feb 2009)
New Revision: 7068

Modified:
   trunk/gforge/common/forum/Forum.class.php
   trunk/gforge/common/forum/ForumMessage.class.php
   trunk/gforge/common/include/Group.class.php
   trunk/gforge/common/include/GroupJoinRequest.class.php
   trunk/gforge/common/include/User.class.php
   trunk/gforge/common/include/gettext.php
   trunk/gforge/common/include/session.php
   trunk/gforge/plugins/mediawiki/usr/share/mediawiki1.7/includes/GForgePre.php
   trunk/gforge/www/include/pre.php
Log:
Global rename of setup_gettext_from_browser() to setup_gettext_from_context()

Modified: trunk/gforge/common/forum/Forum.class.php
===================================================================
--- trunk/gforge/common/forum/Forum.class.php	2009-02-25 14:44:20 UTC (rev 7067)
+++ trunk/gforge/common/forum/Forum.class.php	2009-02-25 19:32:08 UTC (rev 7068)
@@ -186,7 +186,7 @@
 			setup_gettext_from_sys_lang ();
 			$string=sprintf(_('Welcome to %1$s'), $forum_name);
 			// and switch back to the user preference
-			setup_gettext_from_browser ();
+			setup_gettext_from_context();
 			if (!$fm->create($string, $string)) {
 				$this->setError($fm->getErrorMessage());
 				return false;

Modified: trunk/gforge/common/forum/ForumMessage.class.php
===================================================================
--- trunk/gforge/common/forum/ForumMessage.class.php	2009-02-25 14:44:20 UTC (rev 7067)
+++ trunk/gforge/common/forum/ForumMessage.class.php	2009-02-25 19:32:08 UTC (rev 7068)
@@ -711,7 +711,7 @@
 		}
 
 		// Switch back to the user language settings
-		setup_gettext_from_browser();
+		setup_gettext_from_context();
 		return true;
 	}
 	

Modified: trunk/gforge/common/include/Group.class.php
===================================================================
--- trunk/gforge/common/include/Group.class.php	2009-02-25 14:44:20 UTC (rev 7067)
+++ trunk/gforge/common/include/Group.class.php	2009-02-25 19:32:08 UTC (rev 7068)
@@ -1935,18 +1935,18 @@
 		if (!$ats || !is_object($ats)) {
 			$this->setError(_('Error creating ArtifactTypes object'));
 			db_rollback();
-			setup_gettext_from_browser ();
+			setup_gettext_from_context();
 			return false;
 		} else if ($ats->isError()) {
 			$this->setError(sprintf (_('ATS%d: %s'), 1, $ats->getErrorMessage()));
 			db_rollback();
-			setup_gettext_from_browser ();
+			setup_gettext_from_context();
 			return false;
 		}
 		if (!$ats->createTrackers()) {
 			$this->setError(sprintf (_('ATS%d: %s'), 2, $ats->getErrorMessage()));
 			db_rollback();
-			setup_gettext_from_browser ();
+			setup_gettext_from_context();
 			return false;
 		}
 
@@ -1959,21 +1959,21 @@
 		if (!$f->create(_('Open-Discussion'),_('General Discussion'),1,'',1,0)) {
 			$this->setError(sprintf (_('F%d: %s'), 1, $f->getErrorMessage()));
 			db_rollback();
-			setup_gettext_from_browser ();
+			setup_gettext_from_context();
 			return false;
 		}
 		$f = new Forum($this);
 		if (!$f->create(_('Help'),_('Get Public Help'),1,'',1,0)) {
 			$this->setError(sprintf (_('F%d: %s'), 2, $f->getErrorMessage()));
 			db_rollback();
-			setup_gettext_from_browser ();
+			setup_gettext_from_context();
 			return false;
 		}
 		$f = new Forum($this);
 		if (!$f->create(_('Developers'),_('Project Developer Discussion'),0,'',1,0)) {
 			$this->setError(sprintf (_('F%d: %s'), 3, $f->getErrorMessage()));
 			db_rollback();
-			setup_gettext_from_browser ();
+			setup_gettext_from_context();
 			return false;
 		}
 
@@ -1986,7 +1986,7 @@
 		if (!$dg->create(_('Uncategorized Submissions'))) {
 			$this->setError(sprintf(_('DG: %s'),$dg->getErrorMessage()));
 			db_rollback();
-			setup_gettext_from_browser ();
+			setup_gettext_from_context();
 			return false;
 		}
 
@@ -1999,7 +1999,7 @@
 		if (!$frs->create($this->getUnixName())) {
 			$this->setError(sprintf(_('FRSP: %s'),$frs->getErrorMessage()));
 			db_rollback();
-			setup_gettext_from_browser ();
+			setup_gettext_from_context();
 			return false;
 		}
 
@@ -2012,14 +2012,14 @@
 		if (!$pg->create(_('To Do'),_('Things We Have To Do'),1)) {
 			$this->setError(sprintf(_('PG%d: %s'),1,$pg->getErrorMessage()));
 			db_rollback();
-			setup_gettext_from_browser ();
+			setup_gettext_from_context();
 			return false;
 		}
 		$pg = new ProjectGroup($this);
 		if (!$pg->create(_('Next Release'),_('Items For Our Next Release'),1)) {
 			$this->setError(sprintf(_('PG%d: %s'),2,$pg->getErrorMessage()));
 			db_rollback();
-			setup_gettext_from_browser ();
+			setup_gettext_from_context();
 			return false;
 		}
 
@@ -2035,7 +2035,7 @@
 			if (!$role->createDefault($todo[$c])) {
 				$this->setError(sprintf(_('R%d: %s'),$c,$role->getErrorMessage()));
 				db_rollback();
-				setup_gettext_from_browser ();
+				setup_gettext_from_context();
 				return false;
 			}
 		}
@@ -2058,13 +2058,13 @@
 			if (!$mlist->create('commits',_('Commits'),1,$idadmin_group)) {
 				$this->setError(sprintf(_('ML: %s'),$mlist->getErrorMessage()));
 				db_rollback();
-				setup_gettext_from_browser ();
+				setup_gettext_from_context();
 				return false;
 			}
 		}
 
 		// Switch back to user preference
-		setup_gettext_from_browser ();
+		setup_gettext_from_context();
 
 		db_commit();
 
@@ -2146,7 +2146,7 @@
 	
 			util_send_message($row_admins['email'], sprintf(_('%1$s Project Approved'), $GLOBALS['sys_name']), $message);
 
-			setup_gettext_from_browser () ;
+			setup_gettext_from_context();
 		}
 
 		return true;
@@ -2202,7 +2202,7 @@
 			}
 
 			util_send_message($row_admins['email'], sprintf(_('%1$s Project Denied'), $GLOBALS['sys_name']), $response);
-			setup_gettext_from_browser () ;
+			setup_gettext_from_context();
 		}
 
 		return true;
@@ -2265,7 +2265,7 @@
 						       $submitter->getRealName(), 
 						       $submitter->getUnixName()));
 			util_send_message($admin_email, sprintf(_('New %1$s Project Submitted'), $GLOBALS['sys_name']), $message);
-			setup_gettext_from_browser () ;
+			setup_gettext_from_context();
 		}
 		
 
@@ -2281,7 +2281,7 @@
 The %1$s admin team will now examine your project submission.  You will be notified of their decision.'), $GLOBALS['sys_name'], $this->getPublicName(), util_unconvert_htmlspecialchars($this->getRegistrationPurpose()), $this->getLicenseName(), $GLOBALS['sys_default_domain']));
 				
 		util_send_message($email, sprintf(_('New %1$s Project Submitted'), $GLOBALS['sys_name']), $message);
-		setup_gettext_from_browser () ;
+		setup_gettext_from_context();
 		
 		return true;
 	}

Modified: trunk/gforge/common/include/GroupJoinRequest.class.php
===================================================================
--- trunk/gforge/common/include/GroupJoinRequest.class.php	2009-02-25 14:44:20 UTC (rev 7067)
+++ trunk/gforge/common/include/GroupJoinRequest.class.php	2009-02-25 19:32:08 UTC (rev 7068)
@@ -259,7 +259,7 @@
 			if (! $ret) { return $ret; }
 
 		}
-		setup_gettext_from_browser () ;
+		setup_gettext_from_context();
 		return true ;
 	}
 
@@ -274,7 +274,7 @@
 		$subject = sprintf(_('Request to Join Project %1$s'), $this->Group->getPublicName());
 		$body = sprintf(_('Your request to join the %1$s project was denied by an administrator.'), $this->Group->getPublicName());
 		util_send_message($user->getEmail(),$subject,$body);
-		setup_gettext_from_browser () ;
+		setup_gettext_from_context();
 		return $this->delete(1);
 	}
 
@@ -288,7 +288,7 @@
 		$subject = sprintf(_('Request to Join Project %1$s'), $this->Group->getPublicName());
 		$body = sprintf(_('Your request to join the %1$s project was granted by an administrator.'), $this->Group->getPublicName());
 		util_send_message($user->getEmail(),$subject,$body);
-		setup_gettext_from_browser () ;
+		setup_gettext_from_context();
 	}
 
 	/**

Modified: trunk/gforge/common/include/User.class.php
===================================================================
--- trunk/gforge/common/include/User.class.php	2009-02-25 14:44:20 UTC (rev 7067)
+++ trunk/gforge/common/include/User.class.php	2009-02-25 19:32:08 UTC (rev 7068)
@@ -329,7 +329,7 @@
 			if ($send_mail) {
 				setup_gettext_from_lang_id($language_id);
 				$this->sendRegistrationEmail();
-				setup_gettext_from_browser() ;
+				setup_gettext_from_context();
 			}
 
 			db_commit();

Modified: trunk/gforge/common/include/gettext.php
===================================================================
--- trunk/gforge/common/include/gettext.php	2009-02-25 14:44:20 UTC (rev 7067)
+++ trunk/gforge/common/include/gettext.php	2009-02-25 19:32:08 UTC (rev 7068)
@@ -172,7 +172,7 @@
 	return db_result($res, 0, 'language_id');
 }
 
-function setup_gettext_from_browser() {
+function setup_gettext_from_context() {
 	setup_gettext_from_langname (choose_language_from_context ());
 }
 

Modified: trunk/gforge/common/include/session.php
===================================================================
--- trunk/gforge/common/include/session.php	2009-02-25 14:44:20 UTC (rev 7067)
+++ trunk/gforge/common/include/session.php	2009-02-25 19:32:08 UTC (rev 7068)
@@ -495,7 +495,7 @@
 	global $session_ser;
 	$session_ser = $sessionKey;
 	session_set();
-	setup_gettext_from_browser() ;
+	setup_gettext_from_context();
 	$LUSER =& session_get_user();
 	if (!is_object($LUSER) || $LUSER->isError()) {
 		return false;

Modified: trunk/gforge/plugins/mediawiki/usr/share/mediawiki1.7/includes/GForgePre.php
===================================================================
--- trunk/gforge/plugins/mediawiki/usr/share/mediawiki1.7/includes/GForgePre.php	2009-02-25 14:44:20 UTC (rev 7067)
+++ trunk/gforge/plugins/mediawiki/usr/share/mediawiki1.7/includes/GForgePre.php	2009-02-25 19:32:08 UTC (rev 7068)
@@ -189,7 +189,7 @@
 if (!$sys_lang) {
 	$sys_lang="English";
 }
-setup_gettext_from_browser() ;
+setup_gettext_from_context();
 
 /*
 

Modified: trunk/gforge/www/include/pre.php
===================================================================
--- trunk/gforge/www/include/pre.php	2009-02-25 14:44:20 UTC (rev 7067)
+++ trunk/gforge/www/include/pre.php	2009-02-25 19:32:08 UTC (rev 7068)
@@ -159,7 +159,7 @@
 require_once $gfcommon.'include/gettext.php';
 require_once $gfcommon.'include/group_section_texts.php';
 
-setup_gettext_from_browser() ;
+setup_gettext_from_context();
 
 /*
 




More information about the Fusionforge-commits mailing list