[evolvis-commits] r12226: Still trying to finalise the gettext transition: ↵ Removing dynamic =?UTF-8?Q?strings=20in=20the=20search?==?UTF-8?Q?=20engines?=, by calculating them =?UTF-8?Q?=E2=86=B5=20earlier=20in=20the=20co?==?UTF-8?Q?de=20path?=. ↵

mirabilos at evolvis.org mirabilos at evolvis.org
Mon Feb 28 01:30:27 CET 2011


Author: mirabilos
Date: 2011-02-28 01:30:26 +0100 (Mon, 28 Feb 2011)
New Revision: 12226

Modified:
   trunk/gforge_base/evolvisforge-5.1/gforge/www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php
Log:
Still trying to finalise the gettext transition:
Removing dynamic strings in the search engines, by calculating them
earlier in the code path.


Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php	2011-02-28 00:30:20 UTC (rev 12225)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php	2011-02-28 00:30:26 UTC (rev 12226)
@@ -101,32 +101,32 @@
 		
 		if (in_array('short_forum', $this->selectedParentSections)) {
 			$renderer = new ForumsHtmlSearchRenderer($this->words, $this->offset, $this->isExact, $this->groupId, $this->getSelectedChildSections('short_forum'));
-			$html .= $this->getPartResult($renderer, 'short_forum');
+			$html .= $this->getPartResult($renderer, 'short_forum', _('Forum Search Results'));
 		}
 		
 		if (in_array('short_tracker', $this->selectedParentSections)) {
 			$renderer = new TrackersHtmlSearchRenderer($this->words, $this->offset, $this->isExact, $this->groupId,  $this->getSelectedChildSections('short_tracker'));
-			$html .= $this->getPartResult($renderer,  'short_tracker');
+			$html .= $this->getPartResult($renderer,  'short_tracker', _('Tracker Search Results'));
 		}
 		
 		if (in_array('short_pm', $this->selectedParentSections)) {
 			$renderer = new TasksHtmlSearchRenderer($this->words, $this->offset, $this->isExact, $this->groupId, $this->getSelectedChildSections('short_pm'));
-			$html .= $this->getPartResult($renderer, 'short_pm');
+			$html .= $this->getPartResult($renderer, 'short_pm', _('Task Search Results'));
 		}
 
 		if (in_array('short_docman', $this->selectedParentSections)) {
 			$renderer = new DocsHtmlSearchRenderer($this->words, $this->offset, $this->isExact, $this->groupId, $this->getSelectedChildSections('short_docman'));
-			$html .= $this->getPartResult($renderer, 'short_docman');
+			$html .= $this->getPartResult($renderer, 'short_docman', _('Documentation Search Results'));
 		}
 
 		if (in_array('short_files', $this->selectedParentSections)) {
 			$renderer = new FilesHtmlSearchRenderer($this->words, $this->offset, $this->isExact, $this->groupId, $this->getSelectedChildSections('short_files'));
-			$html .= $this->getPartResult($renderer, 'short_files');
+			$html .= $this->getPartResult($renderer, 'short_files', _('Files Search Results'));
 		}
 		
 		if (in_array('short_news', $this->selectedParentSections)) {
 			$renderer = new NewsHtmlSearchRenderer($this->words, $this->offset, $this->isExact, $this->groupId);
-			$html .= $this->getPartResult($renderer, 'short_news');
+			$html .= $this->getPartResult($renderer, 'short_news', _('News Search Results'));
 		}
 
 		return $html.'<br />'; 
@@ -137,11 +137,11 @@
 	* 
   	* @return string result of the renderer
 	*/			
-	function getPartResult($renderer, $section) {
+	function getPartResult($renderer, $section, $title=$section) {
 		$result = '';
 		$renderer->searchQuery->executeQuery();
 		
-		$result .= '<h3><a name="'.$section.'"></a>'.sprintf(_('%1$s Search Result'), $Language->getText('group', $section)).'</h3>';
+		$result .= '<h3><a name="'.$section.'"></a>'.$title.'</h3>';
 		
 		if ($renderer->searchQuery->getRowsCount() > 0) {
 			$result .= $GLOBALS['HTML']->listTabletop($renderer->tableHeaders);
@@ -260,4 +260,9 @@
 	}
 }
 
+// Local Variables:
+// mode: php
+// c-file-style: "bsd"
+// End:
+
 ?>

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php	2011-02-28 00:30:20 UTC (rev 12225)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/search/include/renderers/FullProjectHtmlSearchRenderer.class.php	2011-02-28 00:30:26 UTC (rev 12226)
@@ -93,47 +93,47 @@
 		$validLength = (strlen($this->words) >= 3);
 
 		if ($validLength || (is_numeric($this->words) && $trackersRenderer->searchQuery->implementsSearchById())) {
-			$html .= $this->getPartResult($trackersRenderer, 'short_tracker');
+			$html .= $this->getPartResult($trackersRenderer, 'short_tracker', _('Tracker Search Results'));
 		}
 
 		if ($validLength || (is_numeric($this->words) && $forumsRenderer->searchQuery->implementsSearchById())) {
-			$html .= $this->getPartResult($forumsRenderer, 'short_forum');
+			$html .= $this->getPartResult($forumsRenderer, 'short_forum', _('Forum Search Results'));
 		}
 
 		if ($validLength || (is_numeric($this->words) && $tasksRenderer->searchQuery->implementsSearchById())) {
-			$html .= $this->getPartResult($tasksRenderer, 'short_pm');
+			$html .= $this->getPartResult($tasksRenderer, 'short_pm', _('Task Search Results'));
 		}
 
 		if ($validLength || (is_numeric($this->words) && $docsRenderer->searchQuery->implementsSearchById())) {
-			$html .= $this->getPartResult($docsRenderer, 'short_docman');
+			$html .= $this->getPartResult($docsRenderer, 'short_docman', _('Documentation Search Results'));
 		}
 		
 		if ($validLength || (is_numeric($this->words) && $frsRenderer->searchQuery->implementsSearchById())) {
-			$html .= $this->getPartResult($newsRenderer, 'short_files');
+			$html .= $this->getPartResult($newsRenderer, 'short_files', _('Files Search Results'));
 		}
 
 		if ($validLength || (is_numeric($this->words) && $newsRenderer->searchQuery->implementsSearchById())) {
-			$html .= $this->getPartResult($newsRenderer, 'short_news');
+			$html .= $this->getPartResult($newsRenderer, 'short_news', _('News Search Results'));
 		}
 
 /*		
 		$renderer = new ForumsHtmlSearchRenderer($this->words, $this->offset, $this->isExact, $this->groupId);
-		$html .= $this->getPartResult($renderer, 'short_forum');
+		$html .= $this->getPartResult($renderer, 'short_forum', _('Forum Search Results'));
 		
 		$renderer = new TrackersHtmlSearchRenderer($this->words, $this->offset, $this->isExact, $this->groupId);
-		$html .= $this->getPartResult($renderer,  'short_tracker');
+		$html .= $this->getPartResult($renderer,  'short_tracker', _('Tracker Search Results'));
 		
 		$renderer = new TasksHtmlSearchRenderer($this->words, $this->offset, $this->isExact, $this->groupId);
-		$html .= $this->getPartResult($renderer, 'short_pm');
+		$html .= $this->getPartResult($renderer, 'short_pm', _('Task Search Results'));
 
 		$renderer = new DocsHtmlSearchRenderer($this->words, $this->offset, $this->isExact, $this->groupId);
-		$html .= $this->getPartResult($renderer, 'short_docman');
+		$html .= $this->getPartResult($renderer, 'short_docman', _('Documentation Search Results'));
 
 		$renderer = new FrsHtmlSearchRenderer($this->words, $this->offset, $this->isExact, $this->groupId);
-		$html .= $this->getPartResult($renderer, 'short_files');
+		$html .= $this->getPartResult($renderer, 'short_files', _('Files Search Results'));
 		
 		$renderer = new NewsHtmlSearchRenderer($this->words, $this->offset, $this->isExact, $this->groupId);
-		$html .= $this->getPartResult($renderer, 'short_news');
+		$html .= $this->getPartResult($renderer, 'short_news', _('News Search Results'));
 */
 
 		return $html.'<br />'; 
@@ -144,11 +144,11 @@
 	* 
   	* @return string result of the renderer
 	*/			
-	function getPartResult($renderer, $section) {
+	function getPartResult($renderer, $section, $title=$section) {
 		$result = '';
 		$renderer->searchQuery->executeQuery();
 		
-		$result .= '<h3><a name="'.$section.'"></a>'.sprintf(_('%1$s Search Result'), $Language->getText('group', $section)).'</h3>';
+		$result .= '<h3><a name="'.$section.'"></a>'.$title.'</h3>';
 		
 		if ($renderer->searchQuery->getRowsCount() > 0) {
 			$result .= $GLOBALS['HTML']->listTabletop($renderer->tableHeaders);
@@ -164,4 +164,9 @@
 
 }
 
+// Local Variables:
+// mode: php
+// c-file-style: "bsd"
+// End:
+
 ?>



More information about the evolvis-commits mailing list