[vhffs-dev] [svn] commit: r87 - in /trunk/vhffs-panel: alert_submit.pl history.pl logout.pl lost.pl lost_ack.pl subscribe_complete.pl user/prefs.pl

[vhffs-dev@xxxxxxxxx]

Author: jd
Date: Wed Aug  3 20:58:41 2005
New Revision: 87

Log:
bad english fix

Modified:
    trunk/vhffs-panel/alert_submit.pl
    trunk/vhffs-panel/history.pl
    trunk/vhffs-panel/logout.pl
    trunk/vhffs-panel/lost.pl
    trunk/vhffs-panel/lost_ack.pl
    trunk/vhffs-panel/subscribe_complete.pl
    trunk/vhffs-panel/user/prefs.pl

Modified: trunk/vhffs-panel/alert_submit.pl
==============================================================================
--- trunk/vhffs-panel/alert_submit.pl (original)
+++ trunk/vhffs-panel/alert_submit.pl Wed Aug  3 20:58:41 2005
@@ -41,7 +41,7 @@
 	my $to = $vhffs->get_config->get_alert_mail;
 	my $from = $user->get_mail;
 	my $subject = gettext("Alert on Vhffs platform");
-	my $message = gettext("Message sent be the following account") .": ". $user->get_username ."\n".$cgi->param("MESSAGE");
+	my $message = gettext("Message sent by the following account") .": ". $user->get_username ."\n".$cgi->param("MESSAGE");
 
 	use Vhffs::Functions;
 
@@ -51,7 +51,7 @@
 }
 else
 {
-	$template->param( MESSAGE => gettext("Cannot send message, CGI error ...") );
+	$template->param( MESSAGE => gettext("Cannot send message, CGI error...") );
 }
 
 display Vhffs::Panel::Main($panel, $template->output);

Modified: trunk/vhffs-panel/history.pl
==============================================================================
--- trunk/vhffs-panel/history.pl (original)
+++ trunk/vhffs-panel/history.pl Wed Aug  3 20:58:41 2005
@@ -58,14 +58,14 @@
 {
 
 	$template = new HTML::Template( filename => "$templatesdir/misc/simplemsg.tmpl" );
-	$message = gettext("Cannot get informations on this object");
+	$message = gettext("Cannot get information on this object");
 	$template->param( MESSAGE => $message );
 
 }
 elsif( ( Vhffs::Acl::what_perm_for_user( $user , $object , $vhffs ) < Vhffs::Constants::ACL_VIEW ) && ( $user->is_admin != 1 ) && ( $user->is_moderator != 1 ) )
 {
 	$template = new HTML::Template( filename => "$templatesdir/misc/simplemsg.tmpl" );
-	$message = gettext("You're not allowed to view the ACL of this object");
+	$message = gettext("You're not allowed to view this object ACL");
 	$template->param( MESSAGE => $message );
 }
 else

Modified: trunk/vhffs-panel/logout.pl
==============================================================================
--- trunk/vhffs-panel/logout.pl (original)
+++ trunk/vhffs-panel/logout.pl Wed Aug  3 20:58:41 2005
@@ -29,7 +29,7 @@
 my $template = new HTML::Template( filename => $templatedir."/main/logout.tmpl" );
 
 $template->param( TITLE => gettext("VHFFS Logout") );
-$template->param( TEXT_LOGOUT => gettext("You left your VHFFS session !") );
+$template->param( TEXT_LOGOUT => gettext("You left your VHFFS session!") );
 $template->param( TEXT_LOGIN => gettext("Login") );
 
 display_light Vhffs::Panel::Main($template);

Modified: trunk/vhffs-panel/lost.pl
==============================================================================
--- trunk/vhffs-panel/lost.pl (original)
+++ trunk/vhffs-panel/lost.pl Wed Aug  3 20:58:41 2005
@@ -23,10 +23,10 @@
 my $tmpl = new HTML::Template( filename => $templatedir."/main/lost.tmpl", associate => $cgi );
 
 #$tmpl->param( TITLE => gettext("VHFFS Password Lost") );
-$tmpl->param( TEXT_LOSTPASS => gettext("You lost your password ? Well it is badly !") );
-$tmpl->param( TEXT_BLABLA => gettext("But fortunately we thought has all, and it is enough to type your login here<br/>so that your new password will be sent to you by email !") );
+$tmpl->param( TEXT_LOSTPASS => gettext("You lost your password? You're a bad guy!") );
+$tmpl->param( TEXT_BLABLA => gettext("But fortunately we're smart, so just type your login here<br/>and a new password will be sent to you by email!") );
 $tmpl->param( TEXT_USERNAME => gettext("Username") );
-$tmpl->param( TEXT_BUTTON => gettext("Give me a new Password") );
-$tmpl->param( TEXT_BACK => gettext("Back to Login") );
+$tmpl->param( TEXT_BUTTON => gettext("Give me a new password") );
+$tmpl->param( TEXT_BACK => gettext("Back to login page") );
 
 display_light Vhffs::Panel::Main($tmpl);

Modified: trunk/vhffs-panel/lost_ack.pl
==============================================================================
--- trunk/vhffs-panel/lost_ack.pl (original)
+++ trunk/vhffs-panel/lost_ack.pl Wed Aug  3 20:58:41 2005
@@ -36,13 +36,13 @@
     
     # Send a mail with plain password inside
     my $subject = "Password changed";
-    my $content = sprintf("Hello %s %s,\n\nYou asked for a new password, here are your new login information :\nUser: %s\nPassword: %s\n\nVHFFS Administrators\n", $user->get_firstname, $user->get_lastname, $user->get_username, $plainpassword );
+    my $content = sprintf("Hello %s %s,\n\nYou asked for a new password, here are your new login information:\nUser: %s\nPassword: %s\n\nVHFFS Administrators\n", $user->get_firstname, $user->get_lastname, $user->get_username, $plainpassword );
     $user->send_mail( $subject, $content );
     
     $template = new HTML::Template( filename => $templatedir."/main/lost_ok.tmpl" );
     
     $template->param( TITLE => gettext("VHFFS Password Lost OK") );
-    $template->param( TEXT_WAITPASS => sprintf( gettext("Please wait %s, a new password will be send to you in few minutes..."), $username )  );
+    $template->param( TEXT_WAITPASS => sprintf( gettext("Please wait %s, a new password will be sent to you in a few minutes..."), $username )  );
     $template->param( TEXT_LOGIN => gettext("Login") );
     
     display_light Vhffs::Panel::Main($template);
@@ -53,7 +53,7 @@
     $template = new HTML::Template( filename => $templatedir."/main/lost_failed.tmpl" );
     
     $template->param( TITLE => gettext("VHFFS Password Lost failed") );
-    $template->param( TEXT_FAILED => gettext("Password recovery failed !") );
+    $template->param( TEXT_FAILED => gettext("Password recovery failed!") );
     $template->param( TEXT_LOGIN => gettext("Login") );
     
     display_light Vhffs::Panel::Main($template);

Modified: trunk/vhffs-panel/subscribe_complete.pl
==============================================================================
--- trunk/vhffs-panel/subscribe_complete.pl (original)
+++ trunk/vhffs-panel/subscribe_complete.pl Wed Aug  3 20:58:41 2005
@@ -77,7 +77,7 @@
 elsif( ( length ( $username ) < 3 ) || ( length ( $username ) > 12 ) )
 {
 	$template = new HTML::Template( filename => $templatedir."/user/create_failed.tmpl");
-	$message = gettext("Username must contain at least 3 caracters and 12 at more");
+	$message = gettext("Username must contain between 3 and 12 characters");
 	$template->param( TEXT_CREATEFAILED => $message );
 	$template->param( TEXT_CREATE => gettext("Subscribe"));
 }
@@ -126,14 +126,14 @@
 elsif( Vhffs::Functions::valid_mail( $mail ) == -1 )
 {
 	$template = new HTML::Template( filename => $templatedir."/user/create_failed.tmpl");
-	$message = gettext("You must declare a valid mail address ");
+	$message = gettext("You must declare a valid mail address");
 	$template->param( TEXT_CREATEFAILED => $message );
 	$template->param( TEXT_CREATE => gettext("Subscribe"));
 }
 elsif( ! ( $zipcode =~ /^[\d]+$/ ) )
 {
 	$template = new HTML::Template( filename => $templatedir."/user/create_failed.tmpl");
-	$message = gettext("Your Zipcode is not correct ! Please enter a correct zipcode");
+	$message = gettext("Your zipcode is not correct! Please enter a correct zipcode");
 	$template->param( TEXT_CREATEFAILED => $message );
 	$template->param( TEXT_CREATE => gettext("Subscribe"));
 }
@@ -177,7 +177,7 @@
 	if( $uid < 0 )
 	{
 	    #If the API returns a negative value as uid, the user cannot be created !
-	    $bad_news = gettext("Cannot create user, the username you entered already exist");
+	    $bad_news = gettext("Cannot create user, the username you entered already exists");
 	}
 	else
 	{
@@ -203,14 +203,14 @@
 	    else
 	    {
 		$good_news = gettext("User Successfully created");
-		$good_news2 = gettext("Please wait while we create the account, it will take some minutes");
+		$good_news2 = gettext("Please wait while we are creating the account, it will take some minutes");
 	    }
 	}
 	
     }
     else
     {
-	$bad_news = gettext("Cannot create User. Your username should contains at least 3 characters and must contains only a username in lower case and digits.");
+	$bad_news = gettext("Cannot create user. Your username should contains at least 3 characters and must contains only a username in lower case and digits.");
     }
     $template->param( TEXT_BACK => gettext("Back to Login") );
     $template->param( GOOD_NEWS => $good_news );

Modified: trunk/vhffs-panel/user/prefs.pl
==============================================================================
--- trunk/vhffs-panel/user/prefs.pl (original)
+++ trunk/vhffs-panel/user/prefs.pl Wed Aug  3 20:58:41 2005
@@ -70,7 +70,7 @@
 
 $template->param( TEXT_DELETE_USER => gettext("Delete YOUR user") );
 $template->param( TEXT_BEFORE_DELETE => gettext("This action is non-reversible. WHEN YOU DELETE IT, YOU CANNOT CANCEL.") );
-$template->param( ASK_DELETE_USER => gettext("Are you SURE you want DELETE this user ?") );
+$template->param( ASK_DELETE_USER => gettext("Are you SURE you want DELETE this user?") );
 $template->param( YES => gettext("Yes I'm sure of what I do") );
 $template->param( NO => gettext("No, I'm not sure, I prefer to keep it.") );
 $template->param( TEXT_DELETE => gettext("Delete") );