[Fusionforge-commits] r18062 - in trunk/src/common: tracker/views widget

Marc-Etienne VARGENAU vargenau at fusionforge.org
Wed Sep 25 11:55:07 CEST 2013


Author: vargenau
Date: 2013-09-25 11:55:07 +0200 (Wed, 25 Sep 2013)
New Revision: 18062

Modified:
   trunk/src/common/tracker/views/form-adminroadmap.php
   trunk/src/common/widget/Widget_ProjectPublicAreas.class.php
   trunk/src/common/widget/Widget_Rss.class.php
Log:
Can't --> Cannot

Modified: trunk/src/common/tracker/views/form-adminroadmap.php
===================================================================
--- trunk/src/common/tracker/views/form-adminroadmap.php	2013-09-25 09:51:24 UTC (rev 18061)
+++ trunk/src/common/tracker/views/form-adminroadmap.php	2013-09-25 09:55:07 UTC (rev 18062)
@@ -67,7 +67,7 @@
 	$roadmap_list = getArrayFromRequest('roadmap_list');
 
 	if (! $roadmap_name) {
-		$error_msg .= _("Can't create or rename roadmap")._(': ')._('name is empty');
+		$error_msg .= _("Cannot create or rename roadmap")._(': ')._('name is empty');
 	}
 	else {
 		$roadmap = new Roadmap($group, $roadmap_id);
@@ -77,7 +77,7 @@
 				$feedback .= sprintf(_('Roadmap %s created'), $roadmap_name);
 			}
 			else {
-				$error_msg .= _("Can't create roadmap: ").$roadmap->getErrorMessage();
+				$error_msg .= _("Cannot create roadmap: ").$roadmap->getErrorMessage();
 			}
 		}
 		else {
@@ -88,14 +88,14 @@
 					$feedback .= sprintf(_('Roadmap %s renamed to %s'), $old_roadmap_name, $roadmap_name);
 				}
 				else {
-					$error_msg .= _("Can't rename roadmap: ").$roadmap->getErrorMessage();
+					$error_msg .= _("Cannot rename roadmap: ").$roadmap->getErrorMessage();
 				}
 			}
 		}
 		if (! $error_msg && is_array($roadmap_list) && ! empty($roadmap_list)) {
 			$result = $roadmap->setList($roadmap_list);
 			if (! $result) {
-				$error_msg .= _("Can't set roadmap: ").$roadmap->getErrorMessage();
+				$error_msg .= _("Cannot set roadmap: ").$roadmap->getErrorMessage();
 			}
 		}
 	}
@@ -119,11 +119,11 @@
 		} else {
 			$result = $roadmap->setState((array_key_exists($roadmap->getID(), $roadmap_states) ? 1 : 0));
 			if (! $result) {
-				$error_msg .= _("Can't set roadmap state: ").$roadmap->getErrorMessage();
+				$error_msg .= _("Cannot set roadmap state: ").$roadmap->getErrorMessage();
 			}
 			$result = $roadmap->isDefault(($default_roadmap == $roadmap->getID() ? 1 : 0));
 			if (! $result) {
-				$error_msg .= _("Can't set default value: ").$roadmap->getErrorMessage();
+				$error_msg .= _("Cannot set default value: ").$roadmap->getErrorMessage();
 			}
 			if (! $error_msg && $updated === false) {
 				$feedback .= _('Roadmap configuration is updated');
@@ -141,7 +141,7 @@
 		$feedback .= sprintf(_('Roadmap %s is deleted'), $roadmap->getName());
 	}
 	else {
-		$error_msg .= _("Can't delete roadmap: ").$roadmap->getErrorMessage();
+		$error_msg .= _("Cannot delete roadmap: ").$roadmap->getErrorMessage();
 	}
 }
 
@@ -190,7 +190,7 @@
 	?>
 	<form action="<?php echo getStringFromServer('PHP_SELF').'?group_id='.$group_id.'&admin_roadmap=1' ?>" method="post">
 	<?php
-	echo '<p>'._('Name'). _(': ') . '<input type="text" name="roadmap_name" value="'.$roadmap->getName().'" size="40" /></p>';
+	echo '<p>'._('Name'). _(': ') . '<input required="required" type="text" name="roadmap_name" value="'.$roadmap->getName().'" size="40" /></p>';
 
 	if ($roadmap_id) {
 		echo '<input type="hidden" name="roadmap_id" value="'.$roadmap_id.'" />';
@@ -280,7 +280,7 @@
 					$feedback .= _('Release(s) order updated');
 				}
 				else {
-					$error_msg .= _("Can't modify release order: ").$selected_roadmap->getErrorMessage();
+					$error_msg .= _("Cannot modify release order: ").$selected_roadmap->getErrorMessage();
 				}
 			}
 			elseif (getStringFromRequest('release_auto_order')) {
@@ -367,7 +367,7 @@
 				$feedback .= _('Release(s) order updated');
 			}
 			else {
-				$error_msg .= _("Can't modify release order: ").$selected_roadmap->getErrorMessage();
+				$error_msg .= _("Cannot modify release order: ").$selected_roadmap->getErrorMessage();
 			}
 		}
 

Modified: trunk/src/common/widget/Widget_ProjectPublicAreas.class.php
===================================================================
--- trunk/src/common/widget/Widget_ProjectPublicAreas.class.php	2013-09-25 09:51:24 UTC (rev 18061)
+++ trunk/src/common/widget/Widget_ProjectPublicAreas.class.php	2013-09-25 09:55:07 UTC (rev 18062)
@@ -113,7 +113,7 @@
 			echo util_make_link ( '/forum/?group_id=' . $group_id, $link_content);
 			print ' (';
 			printf(ngettext("<strong>%d</strong> message","<strong>%d</strong> messages",$messages_count),$messages_count);
-			print ' in ';
+			print ' ' . _('in') . ' ';
 			printf(ngettext("<strong>%d</strong> forum","<strong>%d</strong> forums",$forums_count),$forums_count);
 			print ')' ;
 			print "\n</div>";
@@ -122,18 +122,18 @@
 		// ##################### Doc Manager
 
 		if ($project->usesDocman()) {
-			echo '<div class="public-area-box">'."\n";
-			$link_content = $HTML->getDocmanPic('') . ' ' . _('DocManager: Project Documentation');
+			echo '<div class="public-area-box">';
+			$link_content = $HTML->getDocmanPic('') . ' ' . _('DocManager: Project Documentation');
 			//	<a rel="sioc:container_of" xmlns:sioc="http://rdfs.org/sioc/ns#" href="'.util_make_url ('/docman/?group_id='.$group_id).'">';
 			print util_make_link( '/docman/?group_id='.$group_id, $link_content);
-			echo "\n</div>\n";
+			echo '</div>';
 		}
 
 		// ##################### Mailing lists
 
 		if ($project->usesMail()) {
-			echo '<div class="public-area-box">'."\n";
-			$link_content = $HTML->getMailPic('') . ' ' . _('Mailing Lists');
+			echo '<div class="public-area-box">';
+			$link_content = $HTML->getMailPic('') . ' ' . _('Mailing Lists');
 			print util_make_link( '/mail/?group_id='.$group_id, $link_content);
 			$n = project_get_mail_list_count($group_id);
 			echo ' ';
@@ -142,12 +142,12 @@
 		}
 
 		// ##################### Task Manager
-					
+
 		if ($project->usesPm()) {
-			echo '<div class="public-area-box">'."\n";
-			$link_content = $HTML->getPmPic('') . ' ' . _('Tasks');
+			echo '<div class="public-area-box">';
+			$link_content = $HTML->getPmPic('') . ' ' . _('Tasks');
 			print util_make_link( '/pm/?group_id='.$group_id, $link_content);
-			
+
 			$pgf = new ProjectGroupFactory ($project);
 			$pgs = $pgf->getProjectGroups();
 			
@@ -169,7 +169,7 @@
 
 		if ($project->usesSurvey()) {
 			echo '<div class="public-area-box">'."\n";
-			$link_content = $HTML->getSurveyPic('') . ' ' . _('Surveys');
+			$link_content = $HTML->getSurveyPic('') . ' ' . _('Surveys');
 			echo util_make_link( '/survey/?group_id='.$group_id, $link_content);
 			echo ' (<strong>'. project_get_survey_count($group_id) .'</strong> ' . _('surveys').')';
 			echo "\n</div>\n";
@@ -180,7 +180,7 @@
 		if ($project->usesSCM()) {
 			echo '<div class="public-area-box">'."\n";
 
-			$link_content = $HTML->getScmPic('') . ' ' . _('SCM Repository');
+			$link_content = $HTML->getScmPic('') . ' ' . _('SCM Repository');
 			//	print '<hr size="1" /><a rel="doap:repository" href="'.util_make_url ('/scm/?group_id='.$group_id).'">';
 			print util_make_link( '/scm/?group_id='.$group_id, $link_content);
 
@@ -203,7 +203,7 @@
 			if ($project->isActive()) {
 				echo '<div class="public-area-box">'."\n";
 
-				$link_content = $HTML->getFtpPic('') . ' ' . _('Anonymous FTP Space');
+				$link_content = $HTML->getFtpPic('') . ' ' . _('Anonymous FTP Space');
 				//		print '<a rel="doap:anonymous root" href="ftp://' . $project->getUnixName() . '.' . forge_get_config('web_host') . '/pub/'. $project->getUnixName() .'/">';
 				if (forge_get_config('use_project_vhost')) {
 					print util_make_link('ftp://' . $project->getUnixName() . '.' . forge_get_config('web_host') . '/pub/'. $project->getUnixName(), $link_content, false, true);
@@ -220,6 +220,8 @@
 	}
 
 	function getDescription() {
-		return _('List all available services for this project along with some information next to it. Click on any of this item to access a service.<br />The role of this area is pretty much equivalent to the Project Main Menu at the top of the screen except that it shows additional information about each of the service (e.g. total number of open bugs, tasks, ...)');
+		return _('List all available services for this project along with some information next to it. Click on any of this item to access a service.')
+             . '<br />'
+             . _('The role of this area is pretty much equivalent to the Project Main Menu at the top of the screen except that it shows additional information about each of the service (e.g. total number of open bugs, tasks, ...)');
 	}
 }

Modified: trunk/src/common/widget/Widget_Rss.class.php
===================================================================
--- trunk/src/common/widget/Widget_Rss.class.php	2013-09-25 09:51:24 UTC (rev 18061)
+++ trunk/src/common/widget/Widget_Rss.class.php	2013-09-25 09:55:07 UTC (rev 18062)
@@ -98,7 +98,7 @@
 	function getInstallPreferences() {
 		$prefs  = '';
 		$prefs .= '<table>';
-		$prefs .= '<tr><td>Url:</td><td><input type="text" class="textfield_medium" name="rss[url]" value="'. _("http://search.twitter.com/search.atom?q=fusionforge&show_user=1") .'" /></td></tr>';
+		$prefs .= '<tr><td>URL:</td><td><input type="text" class="textfield_medium" name="rss[url]" value="'. _("http://search.twitter.com/search.atom?q=fusionforge&show_user=1") .'" /></td></tr>';
 		$prefs .= '</table>';
 		return $prefs;
 	}
@@ -123,7 +123,7 @@
 	function create(&$request) {
 		$content_id = false;
 		$vUrl = new Valid_String('url');
-		$vUrl->setErrorMessage("Can't add empty rss url");
+		$vUrl->setErrorMessage(_("Cannot add empty RSS URL"));
 		$vUrl->required();
 		if($request->validInArray('rss', $vUrl)) {
 			$rss = $request->get('rss');




More information about the Fusionforge-commits mailing list