[evolvis-commits] r8447: Moved arguments to messages in the getText() function call↵

mirabilos at evolvis.org mirabilos at evolvis.org
Thu Feb 24 16:42:59 CET 2011


Author: mirabilos
Date: 2011-02-24 16:42:59 +0100 (Thu, 24 Feb 2011)
New Revision: 8447

Modified:
   trunk/gforge_base/evolvisforge-5.1/gforge/www/forum/include/ForumHTML.class
   trunk/gforge_base/evolvisforge-5.1/gforge/www/forum/index.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/forum/message.php
Log:
Moved arguments to messages in the getText() function call


Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/forum/include/ForumHTML.class
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/forum/include/ForumHTML.class	2011-02-24 15:42:58 UTC (rev 8446)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/forum/include/ForumHTML.class	2011-02-24 15:42:59 UTC (rev 8447)
@@ -323,8 +323,9 @@
 
 		} else {
 			echo "<CENTER>";
-			echo '<h3><FONT COLOR="RED">'.$Language->getText('forum_utils','couldpostif').' '.
-				'<a href="/account/login.php?return_to='. urlencode($REQUEST_URI) .'">['.$Language->getText('forum_utils','loggedin').']</a></FONT></h3>';
+			echo '<h3><FONT COLOR="RED">';
+			echo $Language->getText('forum_utils','couldpostif',array('<a href="/account/login.php?return_to='.urlencode($REQUEST_URI).' ">','</a>'));
+			echo '</FONT></h3>';
 			echo "</CENTER>";
 		}
 

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/forum/index.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/forum/index.php	2011-02-24 15:42:58 UTC (rev 8446)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/forum/index.php	2011-02-24 15:42:59 UTC (rev 8447)
@@ -34,12 +34,12 @@
         exit_error($Language->getText('general','error'),$ff->getErrorMessage());
     }
 
-	forum_header(array('title'=>$Language->getText('forum','forums_for').' '. $g->getPublicName() ,'pagename'=>'forum','sectionvals'=>array($g->getPublicName())));
+	forum_header(array('title'=>$Language->getText('forum','forums_for', array($g->getPublicName())) ,'pagename'=>'forum','sectionvals'=>array($g->getPublicName())));
 
 	$farr =& $ff->getForums();
 	
 	if ($ff->isError() || count($farr) < 1) {
-		echo '<h1>'.$Language->getText('forum','error_no_forums_found').' '. $g->getPublicName() .'</h1>';
+		echo '<h1>'.$Language->getText('forum','error_no_forums_found', array($g->getPublicName())) .'</h1>';
 		echo $ff->getErrorMessage();
 		forum_footer(array());
 		exit;

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/forum/message.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/forum/message.php	2011-02-24 15:42:58 UTC (rev 8446)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/forum/message.php	2011-02-24 15:42:59 UTC (rev 8447)
@@ -56,21 +56,21 @@
 
 	$f=new Forum($g,$forum_id);
 	if (!$f || !is_object($f)) {
-		exit_error($Language->getText('general','error'),$Language->getText('general','error_getting_new','Forum'));
+		exit_error($Language->getText('general','error'),$Language->getText('forum_message','error_getting_new_forum'));
 	} elseif ($f->isError()) {
 		exit_error($Language->getText('general','error'),$f->getErrorMessage());
 	}
 
 	$fm=new ForumMessage($f,$msg_id);
 	if (!$fm || !is_object($fm)) {
-		exit_error($Language->getText('general','error'),$Language->getText('general','error_getting_new','ForumMessage'));
+		exit_error($Language->getText('general','error'),$Language->getText('general','error_getting_new_forummessage'));
 	} elseif ($fm->isError()) {
 		exit_error($Language->getText('general','error'),$fm->getErrorMessage());
 	}
 
 	$fmf = new ForumMessageFactory($f);
 	if (!$fmf || !is_object($fmf)) {
-		exit_error($Language->getText('general','error'),$Language->getText('general','error_getting_new','ForumMessageFactory'));
+		exit_error($Language->getText('general','error'),$Language->getText('general','error_getting_new_forummessagefactory'));
 	} elseif ($fmf->isError()) {
 		exit_error($Language->getText('general','error'),$fmf->getErrorMessage());
 	}
@@ -82,7 +82,7 @@
 
 	$fh = new ForumHTML($f);
 	if (!$fh || !is_object($fh)) {
-		exit_error($Language->getText('general','error'),$Language->getText('general','error_getting_new','ForumHTML'));
+		exit_error($Language->getText('general','error'),$Language->getText('general','error_getting_newforumhtml'));
 	} elseif ($fh->isError()) {
 		exit_error($Language->getText('general','error'),$fh->getErrorMessage());
 	}



More information about the evolvis-commits mailing list