[Fusionforge-commits] r7565 - in trunk: . gforge/www/softwaremap

Roland Mas lolando at libremir.placard.fr.eu.org
Mon May 4 17:19:47 CEST 2009


Author: lolando
Date: 2009-05-04 17:19:47 +0200 (Mon, 04 May 2009)
New Revision: 7565

Modified:
   trunk/
   trunk/gforge/www/softwaremap/tag_cloud.php
Log:
Merged from 4.8: i18n and util_make_{url,link} for the tag cloud


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/Branch_4_7:6879,6881,6884,6897,6899,6902,6904,6906,6909,6911,6922,6932,6936,6939,6942,6944,6946-6948,6954,6956,6959,7000-7001,7012,7111,7130-7131,7133-7134,7138,7140-7142,7147-7148,7159-7160,7163,7168,7177,7179,7203,7205,7207,7210,7212,7251-7253,7255,7284,7287,7291,7293,7295-7296,7300,7355,7365-7366,7375-7376,7378,7395,7423-7426,7435,7458,7504
/branches/Branch_4_8:7334-7335,7344-7345,7382,7387,7389-7390,7396,7398,7401-7402,7428-7429,7437,7440,7443,7449-7455,7459,7462,7466,7469-7470,7476-7477,7478,7480,7485,7490-7491,7492,7505,7540,7556-7557

   + /branches/Branch_4_7:6879,6881,6884,6897,6899,6902,6904,6906,6909,6911,6922,6932,6936,6939,6942,6944,6946-6948,6954,6956,6959,7000-7001,7012,7111,7130-7131,7133-7134,7138,7140-7142,7147-7148,7159-7160,7163,7168,7177,7179,7203,7205,7207,7210,7212,7251-7253,7255,7284,7287,7291,7293,7295-7296,7300,7355,7365-7366,7375-7376,7378,7395,7423-7426,7435,7458,7504
/branches/Branch_4_8:7334-7335,7344-7345,7382,7387,7389-7390,7396,7398,7401-7402,7428-7429,7437,7440,7443,7449-7455,7459,7462,7466,7469-7470,7476-7477,7478,7480,7485,7490-7491,7492,7505,7540,7556-7558,7559

Modified: svk:merge
   - 9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7001
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7012
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7291
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7458
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7335
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7344
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7345
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7396
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7402
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7455
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7459
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7469
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7470
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7476
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7480
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7505
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7540
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7557

   + 9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7001
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7012
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7291
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7458
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7335
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7344
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7345
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7396
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7402
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7455
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7459
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7469
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7470
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7476
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7480
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7505
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7540
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7557
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7559


Modified: trunk/gforge/www/softwaremap/tag_cloud.php
===================================================================
--- trunk/gforge/www/softwaremap/tag_cloud.php	2009-05-04 15:19:36 UTC (rev 7564)
+++ trunk/gforge/www/softwaremap/tag_cloud.php	2009-05-04 15:19:47 UTC (rev 7565)
@@ -106,25 +106,29 @@
 		$html_limit .= sprintf(_('More than <strong>%1$s</strong> projects have <strong>%2$s</strong> as tag.'), $TROVE_HARDQUERYLIMIT, htmlspecialchars($selected_tag));
 	}
 	else {
-		$html_limit .= sprintf(_('<strong>%1$s</strong> projects in result set.'), $querytotalcount, htmlspecialchars($selected_tag));
+		$html_limit .= sprintf(ngettext('<strong>%d</strong> project in result set.',
+						'<strong>%d</strong> projects in result set.',
+						$querytotalcount),
+				       $querytotalcount) ;
 	}
 
 	// only display pages stuff if there is more to display
 	if ($querytotalcount > $TROVE_BROWSELIMIT) {
-		$html_limit .= ' Displaying '.$TROVE_BROWSELIMIT.' per page. Projects sorted by alphabetical order.<br />';
+		$html_limit .= ' ' ;
+		$html_limit .= sprintf (ngettext ('Displaying %d project per page. Projects sorted by alphabetical order.<br />',
+						  'Displaying %d projects per page. Projects sorted by alphabetical order.<br />',
+						  $TROVE_BROWSELIMIT),
+					$TROVE_BROWSELIMIT) ;
 
 		// display all the numbers
 		for ($i=1;$i<=ceil($querytotalcount/$TROVE_BROWSELIMIT);$i++) {
 			$html_limit .= ' ';
 			if ($page != $i) {
-				$html_limit .= '<a href="'.$_SERVER['PHP_SELF'];
-				$html_limit .= '?page='.$i;
-				$html_limit .= '">';
-			} else $html_limit .= '<strong>';
-			$html_limit .= '&lt;'.$i.'&gt;';
-			if ($page != $i) {
-				$html_limit .= '</a>';
-			} else $html_limit .= '</strong>';
+				$html_limit .= util_make_link ('/softwaremap/tag_cloud.php?tag='.$selected_tag.'&page='.$i,
+							       '&lt;'.$i.'&gt;');
+			} else {
+				$html_limit .= '<strong>&lt;'.$i.'&gt;</strong>';
+			}				
 			$html_limit .= ' ';
 		}
 	}
@@ -147,8 +151,8 @@
 		if ($row_grp && $viewthisrow) {
 			print '<table border="0" cellpadding="0" width="100%">';
 			print '<tr valign="top"><td colspan="2">';
-			print "<a href=\"/projects/". strtolower($row_grp['unix_group_name']) ."/\"><strong>"
-			.$row_grp['group_name']."</strong></a> ";
+			print util_make_link ('/projects/'. strtolower($row_grp['unix_group_name']).'/',
+					      '<strong>'.$row_grp['group_name'].'</strong> ');
 
 			if ($row_grp['short_description']) {
 				print "- " . $row_grp['short_description'];
@@ -175,16 +179,17 @@
 				$percentile = number_format(db_result($res, 0, 'percentile'));
 				$ranking = number_format(db_result($res, 0, 'ranking'));
 			}
-			print 'Activity Percentile: <strong>'. $percentile .'</strong>';
-			print '<br />Activity Ranking: <strong>'. $ranking .'</strong>';
-			print '<br />'._('Registered:&nbsp;').' <strong>'.date(_('Y-m-d H:i'),$row_grp['register_time']).'</strong>';
+			printf ('<br />'._('Activity Percentile: <strong>%3.0f</strong>'), $percentile);
+			printf ('<br />'._('Activity Ranking: <strong>%d</strong>'), $ranking);
+			printf ('<br />'._('Registered: <strong>%s</strong>'), 
+				date(_('Y-m-d H:i'),$row_grp['register_time']));
 			print '</td></tr>';
 			/*
 			 if ($row_grp['jobs_count']) {
 			 print '<tr><td colspan="2" align="center">'
-			 .'<a href="/people/?group_id='.$row_grp['group_id'].'">[This project needs help]</a></td></td>';
+			 .util_make_link ('/people/?group_id='.$row_grp['group_id'],_("[This project needs help]")).'</td></td>';
 			 }
-			 */
+			*/
 			print '</table>';
 			print '<hr />';
 		} // end if for row and range chacking




More information about the Fusionforge-commits mailing list