[Fusionforge-commits] r10905 - in trunk/src: plugins/scmcvs/common plugins/scmsvn/common www/account www/developer www/people

Alain Peyrat aljeux at libremir.placard.fr.eu.org
Fri Oct 8 18:30:33 CEST 2010


Author: aljeux
Date: 2010-10-08 18:30:32 +0200 (Fri, 08 Oct 2010)
New Revision: 10905

Modified:
   trunk/src/plugins/scmcvs/common/CVSPlugin.class.php
   trunk/src/plugins/scmsvn/common/SVNPlugin.class.php
   trunk/src/www/account/editsshkeys.php
   trunk/src/www/account/first.php
   trunk/src/www/account/lostlogin.php
   trunk/src/www/account/lostpw.php
   trunk/src/www/account/register.php
   trunk/src/www/account/verify.php
   trunk/src/www/developer/monitor.php
   trunk/src/www/people/editjob.php
   trunk/src/www/people/index.php
Log:
Reformatted messages.

Modified: trunk/src/plugins/scmcvs/common/CVSPlugin.class.php
===================================================================
--- trunk/src/plugins/scmcvs/common/CVSPlugin.class.php	2010-10-08 15:05:26 UTC (rev 10904)
+++ trunk/src/plugins/scmcvs/common/CVSPlugin.class.php	2010-10-08 16:30:32 UTC (rev 10905)
@@ -67,12 +67,15 @@
 	}
 	
 	function getBlurb () {
-		return _('<p>CVS documentation is available <a href="http://cvsbook.red-bean.com/">here</a>.</p>');
+		return '<p>' . _('CVS documentation is available <a href="http://cvsbook.red-bean.com/">here</a>.') . '</p>';
 	}
 
 	function getInstructionsForAnon ($project) {
 		$cvsrootend = $project->getSCMBox().':'.forge_get_config('repos_path', 'scmcvs').'/'.$project->getUnixName();
-		$b = _('<p><b>Anonymous CVS Access</b></p><p>This project\'s CVS repository can be checked out through anonymous (pserver) CVS with the following instruction set. The module you wish to check out must be specified as the <i>modulename</i>. When prompted for a password for <i>anonymous</i>, simply press the Enter key.</p>');
+        $b = '<h2>' . _('Anonymous CVS Access') . '</h2>';
+        $b .= '<p>';
+        $b .= _('This project\'s CVS repository can be checked out through anonymous (pserver) CVS with the following instruction set. The module you wish to check out must be specified as the <i>modulename</i>. When prompted for a password for <i>anonymous</i>, simply press the Enter key.');
+        $b .= '</p>';
 		$b .= '<p>
 		       <tt>cvs -d :pserver:anonymous@' . $cvsrootend.' login</tt><br/>
 		       <tt>cvs -d :pserver:anonymous@' . $cvsrootend.' checkout <em>'._('modulename').'</em></tt>
@@ -86,13 +89,19 @@
 		if (session_loggedin()) {
 			$u =& user_get_object(user_getid()) ;
 			$d = $u->getUnixName() ;
-			$b = _('<p><b>Developer CVS Access via SSH</b></p><p>Only project developers can access the CVS tree via this method. SSH must be installed on your client machine. Substitute <i>modulename</i> with the proper value. Enter your site password when prompted.</p>');
+        	$b = '<h2>' . _('Developer CVS Access via SSH') . '</h2>';
+        	$b .= '<p>';
+        	$b .= _('Only project developers can access the CVS tree via this method. SSH must be installed on your client machine. Substitute <i>modulename</i> with the proper values. Enter your site password when prompted.');
+        	$b .= '</p>';
 			$b .= '<p>
 			       <tt>export CVS_RSH=ssh</tt><br/>
 			       <tt>cvs -d :ext:'.$d.'@'.$cvsrootend.' checkout <em>'._('modulename').'</em></tt>
 			       </p>';
 		} else {
-			$b = _('<p><b>Developer CVS Access via SSH</b></p><p>Only project developers can access the CVS tree via this method. SSH must be installed on your client machine. Substitute <i>modulename</i> and <i>developername</i> with the proper values. Enter your site password when prompted.</p>');
+        	$b = '<h2>' . _('Developer CVS Access via SSH') . '</h2>';
+        	$b .= '<p>';
+        	$b .= _('Only project developers can access the CVS tree via this method. SSH must be installed on your client machine. Substitute <i>modulename</i> and <i>developername</i> with the proper values. Enter your site password when prompted.');
+        	$b .= '</p>';
 			$b .= '<p>
 			       <tt>export CVS_RSH=ssh</tt><br/>
 			       <tt>cvs -d :ext:<em>'._('developername').'</em>@'.$cvsrootend.' checkout <em>'._('modulename').'</em></tt>
@@ -118,7 +127,9 @@
 	function getBrowserLinkBlock ($project) {
 		global $HTML ;
 		$b = $HTML->boxMiddle(_('CVS Repository Browser'));
-		$b .= _('<p>Browsing the CVS tree gives you a view into the current status of this project\'s code. You may also view the complete histories of any file in the repository.</p>');
+        $b .= '<p>';
+        $b .= _('Browsing the CVS tree gives you a view into the current status of this project\'s code. You may also view the complete histories of any file in the repository.');
+        $b .= '</p>';
 		$b .= '<p>[' ;
 		$b .= util_make_link ("/scm/browser.php?group_id=".$project->getID(),
 				      _('Browse CVS Repository')

Modified: trunk/src/plugins/scmsvn/common/SVNPlugin.class.php
===================================================================
--- trunk/src/plugins/scmsvn/common/SVNPlugin.class.php	2010-10-08 15:05:26 UTC (rev 10904)
+++ trunk/src/plugins/scmsvn/common/SVNPlugin.class.php	2010-10-08 16:30:32 UTC (rev 10905)
@@ -76,11 +76,15 @@
 	}
 	
 	function getBlurb () {
-		return _('<p>Documentation for Subversion (sometimes referred to as "SVN") is available <a href="http://svnbook.red-bean.com/">here</a>.</p>') ;
+		return '<p>' . _('Documentation for Subversion (sometimes referred to as "SVN") is available <a href="http://svnbook.red-bean.com/">here</a>.') . '</p>';
 	}
 
 	function getInstructionsForAnon ($project) {
-		$b =  _('<p><b>Anonymous Subversion Access</b></p><p>This project\'s SVN repository can be checked out through anonymous access with the following command(s).</p>');
+		$b = '<h2>' . _("Anonymous Subversion Access") . '</h2>';
+		$b .= '<p>';
+		$b .= _("This project's SVN repository can be checked out through anonymous access with the following command(s).");
+		$b .= '</p>';
+
 		$b .= '<p>' ;
 		if (forge_get_config('use_ssh', 'scmsvn')) {
 			$b .= '<tt>svn checkout svn://'.$project->getSCMBox().$this->svn_root.'/'.$project->getUnixName().'/trunk</tt><br />';
@@ -99,20 +103,40 @@
 			$u =& user_get_object(user_getid()) ;
 			$d = $u->getUnixName() ;
 			if (forge_get_config('use_ssh', 'scmsvn')) {
-				$b .= _('<p><b>Developer Subversion Access via SSH</b></p><p>Only project developers can access the SVN tree via this method. SSH must be installed on your client machine. Enter your site password when prompted.</p>');
+				$b .= '<h2>';
+				$b .= _('Developer Subversion Access via SSH');
+				$b .= '</h2>';
+				$b .= '<p>';
+				$b .= _('Only project developers can access the SVN tree via this method. SSH must be installed on your client machine. Enter your site password when prompted.');
+				$b .= '</p>';
 				$b .= '<p><tt>svn checkout svn+ssh://'.$d.'@' . $project->getSCMBox() . $this->svn_root .'/'. $project->getUnixName().'/trunk</tt></p>' ;
 			}
 			if (forge_get_config('use_dav', 'scmsvn')) {
-				$b .= _('<p><b>Developer Subversion Access via DAV</b></p><p>Only project developers can access the SVN tree via this method. Enter your site password when prompted.</p>');
+				$b .= '<h2>';
+				$b .= _('Developer Subversion Access via DAV');
+				$b .= '</h2>';
+				$b .= '<p>';
+				$b .= _('Only project developers can access the SVN tree via this method. Enter your site password when prompted.');
+				$b .= '</p>';
 				$b .= '<p><tt>svn checkout --username '.$d.' http'.((forge_get_config('use_ssl', 'scmsvn')) ? 's' : '').'://'. $project->getSCMBox() . $this->svn_root .'/'.$project->getUnixName().'/trunk</tt></p>' ;
 			}
 		} else {
 			if (forge_get_config('use_ssh', 'scmsvn')) {
-				$b .= _('<p><b>Developer Subversion Access via SSH</b></p><p>Only project developers can access the SVN tree via this method. SSH must be installed on your client machine. Substitute <i>developername</i> with the proper values. Enter your site password when prompted.</p>');
+				$b .= '<h2>';
+				$b .= _('Developer Subversion Access via SSH');
+				$b .= '</h2>';
+				$b .= '<p>';
+				$b .= _('Only project developers can access the SVN tree via this method. SSH must be installed on your client machine. Substitute <i>developername</i> with the proper values. Enter your site password when prompted.');
+				$b .= '</p>';
 				$b .= '<p><tt>svn checkout svn+ssh://<i>'._('developername').'</i>@' . $project->getSCMBox() . $this->svn_root .'/'. $project->getUnixName().'/trunk</tt></p>' ;
 			}
 			if (forge_get_config('use_dav', 'scmsvn')) {
-				$b .= _('<p><b>Developer Subversion Access via DAV</b></p><p>Only project developers can access the SVN tree via this method. Substitute <i>developername</i> with the proper values. Enter your site password when prompted.</p>');
+				$b .= '<h2>';
+				$b .= _('Developer Subversion Access via DAV');
+				$b .= '</h2>';
+				$b .= '<p>';
+				$b .= _('Only project developers can access the SVN tree via this method. Substitute <i>developername</i> with the proper values. Enter your site password when prompted.');
+				$b .= '</p>';
 				$b .= '<p><tt>svn checkout --username <i>'._('developername').'</i> http'.((forge_get_config('use_ssl', 'scmsvn')) ? 's' : '').'://'. $project->getSCMBox() . $this->svn_root .'/'.$project->getUnixName().'/trunk</tt></p>' ;
 			}
 		}
@@ -126,7 +150,9 @@
 	function getBrowserLinkBlock ($project) {
 		global $HTML ;
 		$b = $HTML->boxMiddle(_('Subversion Repository Browser'));
-		$b .= _('<p>Browsing the Subversion tree gives you a view into the current status of this project\'s code. You may also view the complete histories of any file in the repository.</p>');
+		$b .= '<p>';
+		$b .= _('Browsing the Subversion tree gives you a view into the current status of this project\'s code. You may also view the complete histories of any file in the repository.');
+		$b .= '</p>';
 		$b .= '<p>[' ;
 		$b .= util_make_link ("/scm/browser.php?group_id=".$project->getID(),
 				      _('Browse Subversion Repository')

Modified: trunk/src/www/account/editsshkeys.php
===================================================================
--- trunk/src/www/account/editsshkeys.php	2010-10-08 15:05:26 UTC (rev 10904)
+++ trunk/src/www/account/editsshkeys.php	2010-10-08 16:30:32 UTC (rev 10905)
@@ -73,7 +73,8 @@
 	// not valid registration, or first time to page
 	site_user_header(array('title'=>'Change Authorized Keys'));
 
-	echo _('<p>To avoid having to type your password every time for your CVS/SSH developer account, you may upload your public key(s) here and they will be placed on the CVS server in your ~/.ssh/authorized_keys file. This is done by a cron job, so it may not happen immediately.  Please allow for a one hour delay.</p><p>To generate a public key, run the program \'ssh-keygen\' (you can use both protocol 1 or 2). The public key will be placed at \'~/.ssh/identity.pub\' (protocol version 1) and \'~/.ssh/id_dsa.pub\' or \'~/.ssh/id_rsa.pub\' (protocol version 2). Read the ssh documentation for further information on sharing keys.</p>');
+	echo '<p>' . _('To avoid having to type your password every time for your CVS/SSH developer account, you may upload your public key(s) here and they will be placed on the CVS server in your ~/.ssh/authorized_keys file. This is done by a cron job, so it may not happen immediately.  Please allow for a one hour delay.') . '</p>';
+	echo '<p>' . _('To generate a public key, run the program \'ssh-keygen\' (you can use both protocol 1 or 2). The public key will be placed at \'~/.ssh/identity.pub\' (protocol version 1) and \'~/.ssh/id_dsa.pub\' or \'~/.ssh/id_rsa.pub\' (protocol version 2). Read the ssh documentation for further information on sharing keys.') . '</p>';
 	?>
 
 <form action="<?php echo util_make_url('/account/editsshkeys.php'); ?>" method="post">

Modified: trunk/src/www/account/first.php
===================================================================
--- trunk/src/www/account/first.php	2010-10-08 15:05:26 UTC (rev 10904)
+++ trunk/src/www/account/first.php	2010-10-08 16:30:32 UTC (rev 10905)
@@ -28,8 +28,14 @@
 
 site_user_header(array('title'=>sprintf(_('Welcome to %1$s'), forge_get_config ('forge_name'))));
 
-printf(_('<p>You are now a registered user on %1$s, the online development environment for Open Source projects.</p><p>As a registered user, you can participate fully in the activities on the site. You may now post messages to the project message forums, post bugs for software in %1$s, sign on as a project developer, or even start your own project.</p><p>Enjoy the site, and please provide us with feedback on ways that we can improve %1$s.</p><p>--the %1$s staff.</p>'), forge_get_config ('forge_name'));
+print '<p>' . _('You are now a registered user on %1$s, the online development environment for Open Source projects.') . '</p>';
 
+print '<p>' . _('As a registered user, you can participate fully in the activities on the site. You may now post messages to the project message forums, post bugs for software in %1$s, sign on as a project developer, or even start your own project.') . '</p>';
+
+print '<p>';
+printf(_('--the %1$s staff.'), forge_get_config ('forge_name'));
+print '</p>';
+
 site_user_footer(array());
 
 ?>

Modified: trunk/src/www/account/lostlogin.php
===================================================================
--- trunk/src/www/account/lostlogin.php	2010-10-08 15:05:26 UTC (rev 10904)
+++ trunk/src/www/account/lostlogin.php	2010-10-08 16:30:32 UTC (rev 10905)
@@ -73,8 +73,11 @@
 		$u->setNewEmailAndHash('', 0);
 
 		$HTML->header(array('title'=>"Password changed"));
-		printf (_('<h2>Password changed</h2><p>Congratulations, you have re-set your account password. You may <a href="%1$s">login</a> to the site now.</p>'),
+		print '<h2>' . _('Password changed') . '</h2>';
+		print '<p>';
+		printf (_('Congratulations, you have re-set your account password. You may <a href="%1$s">login</a> to the site now.'),
 			  util_make_url ("/account/login.php"));
+		print '</p>';
 		$HTML->footer(array());
 		exit();
 	}
@@ -84,7 +87,8 @@
 
 $title = _("Lost Password Login") ;
 $HTML->header(array('title'=>$title));
-echo '<h2>'.$title.'</h2><p>' ;
+echo '<h1>'.$title.'</h1>' ;
+echo '<p>' ;
 printf (_('Welcome, %s. You may now change your password.'),$u->getUnixName());
 echo '</p>';
 ?>

Modified: trunk/src/www/account/lostpw.php
===================================================================
--- trunk/src/www/account/lostpw.php	2010-10-08 15:05:26 UTC (rev 10904)
+++ trunk/src/www/account/lostpw.php	2010-10-08 16:30:32 UTC (rev 10905)
@@ -78,10 +78,10 @@
 	}
 }
 
-
 $HTML->header(array('title'=>"Lost Account Password"));
 
-echo _('<p>Hey... losing your password is serious business. It compromises the security of your account, your projects, and this site.</p><p>Clicking "Send Lost PW Hash" below will email a URL to the email address we have on file for you. In this URL is a 128-bit confirmation hash for your account. Visiting the URL will allow you to change your password online and login.</p>');
+echo '<p>' . _('Hey... losing your password is serious business. It compromises the security of your account, your projects, and this site.') . '</p>';
+echo '<p>' . _('Clicking "Send Lost PW Hash" below will email a URL to the email address we have on file for you. In this URL is a 128-bit confirmation hash for your account. Visiting the URL will allow you to change your password online and login.') . '</p>';
 ?>
 
 <form action="<?php echo util_make_url('/account/lostpw.php'); ?>" method="post">

Modified: trunk/src/www/account/register.php
===================================================================
--- trunk/src/www/account/register.php	2010-10-08 15:05:26 UTC (rev 10904)
+++ trunk/src/www/account/register.php	2010-10-08 16:30:32 UTC (rev 10905)
@@ -80,7 +80,10 @@
 					      $address,$address2,$phone,$fax,$title,$ccode);
 		if ($register) {
 			site_header(array('title'=>'Register Confirmation'));
-			printf(_('<p>Congratulations. You have registered on %1$s.  <p> You are now being sent a confirmation email to verify your email address. Visiting the link sent to you in this email will activate your account.'), forge_get_config ('forge_name'));
+		echo '<p>';
+		printf(_('Congratulations. You have registered on %1$s.'), forge_get_config ('forge_name'));
+		echo '</p>';
+		print '<p>' . _('You are now being sent a confirmation email to verify your email address. Visiting the link sent to you in this email will activate your account.') . '</p>';
 			site_footer(array());
 			exit;
 		} else {
@@ -212,7 +215,7 @@
 </form>
 <p><a href="pending-resend.php"><?php echo _('[Resend confirmation email to a pending account]'); ?></a></p>
 
-<?php $HTML->footer(array());
+<?php site_footer(array());
 
 // Local Variables:
 // mode: php

Modified: trunk/src/www/account/verify.php
===================================================================
--- trunk/src/www/account/verify.php	2010-10-08 15:05:26 UTC (rev 10904)
+++ trunk/src/www/account/verify.php	2010-10-08 16:30:32 UTC (rev 10905)
@@ -71,10 +71,10 @@
 
 $HTML->header(array('title'=>'Verify'));
 
-echo _('<p>In order to complete your registration, login now. Your account will then be activated for normal logins.</p>');
+echo '<p>' . _('In order to complete your registration, login now. Your account will then be activated for normal logins.') . '</p>';
 
 if (isset($GLOBALS['error_msg'])) {
-	print '<p><span class="error">'.$GLOBALS['error_msg'].'</span>';
+	print '<p class="error">'.$GLOBALS['error_msg'].'</p>';
 }
 ?>
 

Modified: trunk/src/www/developer/monitor.php
===================================================================
--- trunk/src/www/developer/monitor.php	2010-10-08 15:05:26 UTC (rev 10904)
+++ trunk/src/www/developer/monitor.php	2010-10-08 16:30:32 UTC (rev 10905)
@@ -64,7 +64,8 @@
 				echo "<div class=\"error\">"._('Error inserting into user_diary_monitor')."</div>";
 			} else {
 				echo "<div class=\"feedback\">"._('User is now being monitored')."</div>";
-				echo _('<p>You will now be emailed this user\'s diary entries.</p><p>To turn off monitoring, simply click the <strong>Monitor user</strong> link again.</p>');
+				echo '<p>' . _('You will now be emailed this user\'s diary entries.') . '</p>';
+				echo '<p>' . _('To turn off monitoring, simply click the <strong>Monitor user</strong> link again.') . '</p>';
 			}
 
 		} else {

Modified: trunk/src/www/people/editjob.php
===================================================================
--- trunk/src/www/people/editjob.php	2010-10-08 15:05:26 UTC (rev 10904)
+++ trunk/src/www/people/editjob.php	2010-10-08 16:30:32 UTC (rev 10905)
@@ -145,18 +145,20 @@
 	/*
 		Fill in the info to create a job
 	*/
+	people_header(array('title'=>_('Edit Job')));
 
 	//for security, include group_id
 	$result=db_query_params("SELECT * FROM people_job WHERE job_id=$1 AND group_id=$2", array($job_id, $group_id));
 	if (!$result || db_numrows($result) < 1) {
 		$error_msg .= sprintf(_('POSTING fetch FAILED: %s'),db_error());
-	    people_header(array('title'=>_('Edit Job')));
+		echo '<h2>'._('No such posting for this project').'</h2>';
 	} else {
 
-	    people_header(array('title'=>_('Edit Job')));
-		echo _('<p>Now you can edit/change the list of skills attached to this posting. Developers will be able to match their skills with your requirements.</p><p>All postings are automatically closed after two weeks.</p>').'
-
-		<p /><form action="'.getStringFromServer('PHP_SELF').'" method="post">
+		echo '<p>' 
+        . _('Now you can edit/change the list of skills attached to this posting. Developers will be able to match their skills with your requirements.')
+        .'</p><p>'
+        . _('All postings are automatically closed after two weeks.').'
+		<form action="'.getStringFromServer('PHP_SELF').'" method="post">
 		<input type="hidden" name="group_id" value="'.$group_id.'" />
 		<input type="hidden" name="job_id" value="'.$job_id.'" />
 		<strong>'._('Category').'</strong><br />
@@ -176,7 +178,7 @@
 
 		//now show the list of desired skills
 		echo '<p>'.people_edit_job_inventory($job_id,$group_id).'</p>';
-		echo '<p /><form action="/people/" method="post"><input type="submit" name="submit" value="'._('Finished').'" /></form>';
+		echo '<form action="/people/" method="post"><input type="submit" name="submit" value="'._('Finished').'" /></form>';
 
 	}
 

Modified: trunk/src/www/people/index.php
===================================================================
--- trunk/src/www/people/index.php	2010-10-08 15:05:26 UTC (rev 10904)
+++ trunk/src/www/people/index.php	2010-10-08 16:30:32 UTC (rev 10905)
@@ -58,11 +58,29 @@
 
 	people_header(array('title'=>_('Help Wanted System')));
 
-	printf(_('<p>The %1$s Project Help Wanted board is for non-commercial, project volunteer openings. Commercial use is prohibited.</p><p>Project listings remain live for two weeks, or until closed by the poster, whichever comes first. (Project administrators may always re-post expired openings.)</p><p>Browse through the category menu to find projects looking for your help.</p><p>If you\'re a project admin, log in and submit help wanted requests through your project administration page.</p><p>To suggest new job categories, submit a request via the support manager.</p>'), forge_get_config ('forge_name'));
+	print '<p>';
+	printf(_('The %1$s Project Help Wanted board is for non-commercial, project volunteer openings. Commercial use is prohibited.'), forge_get_config ('forge_name'));
+	print '</p>';
 
+	print '<p>';
+	print _('Project listings remain live for two weeks, or until closed by the poster, whichever comes first. (Project administrators may always re-post expired openings.)');
+	print '</p>';
+
+	print '<p>';
+	print _('Browse through the category menu to find projects looking for your help.');
+	print '</p>';
+
+	print '<p>';
+	print _('If you\'re a project admin, log in and submit help wanted requests through your project administration page.');
+	print '</p>';
+
+	print '<p>';
+	print _('To suggest new job categories, submit a request via the support manager.');
+	print '</p>';
+
 	echo people_show_category_table();
 
-        echo '<h4>'._('Last posts').'</h4>';
+	echo '<h2>'._('Last posts').'</h2>';
 
 	$result=db_query_params('SELECT people_job.group_id,people_job.job_id,groups.group_name,groups.unix_group_name,people_job.title,people_job.post_date,people_job_category.name AS category_name 
 FROM people_job,people_job_category,groups 




More information about the Fusionforge-commits mailing list