[wp-cvs] wordpress index.php, 1.75, 1.76 wp-comments-popup.php, 1.12, 1.13 wp-comments.php, 1.20, 1.21 wp-login.php, 1.24, 1.25

Sun Jun 13 11:14:59 CDT 2004

Update of /cvsroot/cafelog/wordpress
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17856

Modified Files:
	index.php wp-comments-popup.php wp-comments.php wp-login.php 
Log Message:
Mark some strings for translation and improve string consistency.  From Albert.  http://mosquito.wordpress.org/bug_view_page.php?bug_id=0000024

Index: wp-login.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-login.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** wp-login.php	30 May 2004 08:24:24 -0000	1.24
--- wp-login.php	13 Jun 2004 16:14:57 -0000	1.25
***************
*** 183,187 ****
  <input type="hidden" name="action" value="retrievepassword" />
  <label><?php _e('Login:') ?> <input type="text" name="user_login" id="user_login" value="" size="12" /></label><br />
! <label><?php _e('Email:') ?> <input type="text" name="email" id="email" value="" size="12" /></label><br />
  <input type="submit" name="Submit2" value="OK" class="search">

--- 183,187 ----
  <input type="hidden" name="action" value="retrievepassword" />
  <label><?php _e('Login:') ?> <input type="text" name="user_login" id="user_login" value="" size="12" /></label><br />
! <label><?php _e('E-mail:') ?> <input type="text" name="email" id="email" value="" size="12" /></label><br />
  <input type="submit" name="Submit2" value="OK" class="search">

***************
*** 204,208 ****
  	$user_email = $user_data->user_email;

! 	if (!$user_email || $user_email != $_POST['email']) die(sprintf(__('Sorry, that user does not seem to exist in our database. Perhaps you have the wrong username or email address? <a href="%s">Try again</a>.'), 'wp-login.php?action=lostpassword'));
   	// Generate something random for a password... md5'ing current time with a rand salt
      $user_pass = substr((MD5("time" . rand(1,16000))), 0, 6);
--- 204,208 ----
  	$user_email = $user_data->user_email;

! 	if (!$user_email || $user_email != $_POST['email']) die(sprintf(__('Sorry, that user does not seem to exist in our database. Perhaps you have the wrong username or e-mail address? <a href="%s">Try again</a>.'), 'wp-login.php?action=lostpassword'));
   	// Generate something random for a password... md5'ing current time with a rand salt
      $user_pass = substr((MD5("time" . rand(1,16000))), 0, 6);
***************
*** 216,225 ****

  	if ($m == false) {
! 		echo "<p>The email could not be sent.<br />\n";
! 		echo "Possible reason: your host may have disabled the mail() function...</p>";
  		die();
  	} else {
! 		echo "<p>The email was sent successfully to $user_login's email address.<br />
! 		<a href='wp-login.php' title='Check your email first, of course'>Click here to login!</a></p>";
  		// send a copy of password change notification to the admin
  		mail(get_settings('admin_email'), '[' . get_settings('blogname') . "] Password Lost/Change", "Password Lost and Changed for user: $user_login");
--- 216,226 ----

if ($m == false) {
! 		echo "<?php _e('The e-mail could not be sent.') ?> \n";
! 		echo "<?php _e('Possible reason: your host may have disabled the mail() function...') ?>";
 		die();
 	} else {
! 		echo "<?php _e('The e-mail was sent successfully to $user_login's e-mail address.') ?> 
! 		<?php _e('<a href='wp-login.php' title=\'Check your e-mail first, of course\'>Click here to login!</a>
! ') ?>";
 		// send a copy of password change notification to the admin
 		mail(get_settings('admin_email'), '[' . get_settings('blogname') . "] Password Lost/Change", "Password Lost and Changed for user: $user_login");

Index: wp-comments.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-comments.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** wp-comments.php	10 Jun 2004 08:40:58 -0000	1.20
--- wp-comments.php	13 Jun 2004 16:14:57 -0000	1.21
***************
*** 46,50 ****
  <h2 id="postcomment"><?php _e('Leave a comment'); ?></h2>

! <?php _e('Line and paragraph breaks automatic. E-mail address never displayed. <abbr title="HyperText Markup Language">HTML</abbr> allowed:'); ?> <code><?php echo allowed_tags(); ?></code>

  <form action="<?php echo get_settings('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
--- 46,50 ----
  <h2 id="postcomment"><?php _e('Leave a comment'); ?></h2>

! <?php _e("Line and paragraph breaks automatic, e-mail address never displayed, <acronym title=\"Hypertext Markup Language\">HTML</acronym> allowed:"); ?> <code><?php echo allowed_tags(); ?></code>

  <form action="<?php echo get_settings('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">

Index: wp-comments-popup.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-comments-popup.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** wp-comments-popup.php	24 May 2004 08:22:18 -0000	1.12
--- wp-comments-popup.php	13 Jun 2004 16:14:57 -0000	1.13
***************
*** 101,105 ****
  <!-- // this is just the end of the motor - don't touch that line either :) -->
  <?php //} ?> 
! <p class="credit"><?php timer_stop(1); ?> <?php echo sprintf(__("<cite>Powered by <a href=\"http://wordpress.org\" title=\"%s\"><strong>Wordpress</strong></a></cite>"),__("Powered by WordPress; state-of-the-art semantic personal publishing platform.")); ?></p>
  <?php // Seen at http://www.mijnkopthee.nl/log2/archive/2003/05/28/esc(18) ?>
  <script type="text/javascript">
--- 101,105 ----
  <!-- // this is just the end of the motor - don't touch that line either :) -->
  <?php //} ?> 
! <p class="credit"><?php timer_stop(1); ?> <?php echo sprintf(__("<cite>Powered by <a href=\"http://wordpress.org\" title=\"%s\"><strong>Wordpress</strong></a></cite>"),__("Powered by WordPress, state-of-the-art semantic personal publishing platform.")); ?></p>
  <?php // Seen at http://www.mijnkopthee.nl/log2/archive/2003/05/28/esc(18) ?>
  <script type="text/javascript">

Index: index.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/index.php,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -d -r1.75 -r1.76
*** index.php	10 Jun 2004 07:42:48 -0000	1.75
--- index.php	13 Jun 2004 16:14:57 -0000	1.76
***************
*** 101,105 ****
  		<li><a href="<?php bloginfo('comments_rss2_url'); ?>" title="<?php _e('The latest comments to all posts in RSS'); ?>"><?php _e('Comments <abbr title="Really Simple Syndication">RSS</abbr> 2.0'); ?></a></li>
  		<li><a href="http://validator.w3.org/check/referer" title="<?php _e('This page validates as XHTML 1.0 Transitional'); ?>"><?php _e('Valid <abbr title="eXtensible HyperText Markup Language">XHTML</abbr>'); ?></a></li>
! 		<li><a href="http://wordpress.org/" title="<?php _e('Powered by WordPress; state-of-the-art semantic personal publishing platform.'); ?>">WP</a></li>
  	</ul>
   </li>
--- 101,105 ----
  		<li><a href="<?php bloginfo('comments_rss2_url'); ?>" title="<?php _e('The latest comments to all posts in RSS'); ?>"><?php _e('Comments <abbr title="Really Simple Syndication">RSS</abbr> 2.0'); ?></a></li>
  		<li><a href="http://validator.w3.org/check/referer" title="<?php _e('This page validates as XHTML 1.0 Transitional'); ?>"><?php _e('Valid <abbr title="eXtensible HyperText Markup Language">XHTML</abbr>'); ?></a></li>
! 		<li><a href="http://wordpress.org/" title="<?php _e('Powered by WordPress, state-of-the-art semantic personal publishing platform.'); ?>">WP</a></li>
  	</ul>
   </li>
***************
*** 111,115 ****
  </div>

! <p class="credit"><!--<?php echo $wpdb->num_queries; ?> queries. <?php timer_stop(1); ?> seconds. --> <cite><?php echo sprintf(__("Powered by <a href='http://wordpress.org' title='%s'><strong>WordPress</strong></a>"), __("Powered by WordPress, state-of-the-art semantic personal publishing platform")); ?></cite></p>
  </body>
  </html>
--- 111,115 ----
  </div>

!  <cite><?php echo sprintf(__("Powered by <a href='http://wordpress.org' title='%s'>WordPress</a>"), __("Powered by WordPress, state-of-the-art semantic personal publishing platform.")); ?></cite>
 </body>
 </html>