WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tweak new strings for better typography. Props demetris. Fixes #12962 

git-svn-id: http://svn.automattic.com/wordpress/trunk@14070 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
dd32 2010-04-11 10:41:54 +00:00
parent d18ac45778
commit 442d41291a
24 changed files with 113 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-activate.php
View File

@ -64,9 +64,9 @@ get_header();
<h2><?php _e('Your account is now active!'); ?></h2> <h2><?php _e('Your account is now active!'); ?></h2>
<?php <?php
if ( $signup->domain . $signup->path == '' ) { if ( $signup->domain . $signup->path == '' ) {
printf(__('<p class="lead-in">Your account has been activated. You may now <a href="%1$s">login</a> to the site using your chosen username of "%2$s". Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.</p>'), network_site_url('wp-login.php', 'login'), $signup->user_login, $signup->user_email, network_site_url('wp-login.php?action=lostpassword', 'login')); printf(__('<p class="lead-in">Your account has been activated. You may now <a href="%1$s">login</a> to the site using your chosen username of &#8220;%2$s&#8221;. Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.</p>'), network_site_url('wp-login.php', 'login'), $signup->user_login, $signup->user_email, network_site_url('wp-login.php?action=lostpassword', 'login'));
} else { } else {
printf(__('<p class="lead-in">Your site at <a href="%1$s">%2$s</a> is active. You may now login to your site using your chosen username of "%3$s". Please check your email inbox at %4$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%5$s">reset your password</a>.</p>'), 'http://' . $signup->domain, $signup->domain, $signup->user_login, $signup->user_email, network_site_url('wp-login.php?action=lostpassword')); printf(__('<p class="lead-in">Your site at <a href="%1$s">%2$s</a> is active. You may now log in to your site using your chosen username of &#8220;%3$s&#8221;. Please check your email inbox at %4$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%5$s">reset your password</a>.</p>'), 'http://' . $signup->domain, $signup->domain, $signup->user_login, $signup->user_email, network_site_url('wp-login.php?action=lostpassword'));
} }
} else { } else {
?> ?>

2
wp-admin/custom-background.php
View File

@ -246,7 +246,7 @@ class Custom_Background {
<?php if ( get_background_image() ) : ?> <?php if ( get_background_image() ) : ?>
<h3><?php _e('Remove Background Image'); ?></h3> <h3><?php _e('Remove Background Image'); ?></h3>
<p><?php _e('This will remove the background image. You will not be able to retrieve any customizations.') ?></p> <p><?php _e('This will remove the background image. You will not be able to restore any customizations.') ?></p>
<form method="post" action=""> <form method="post" action="">
<?php wp_nonce_field('custom-background'); ?> <?php wp_nonce_field('custom-background'); ?>
<input type="submit" class="button" name="remove-background" value="<?php esc_attr_e('Remove Background'); ?>" /> <input type="submit" class="button" name="remove-background" value="<?php esc_attr_e('Remove Background'); ?>" />

2
wp-admin/edit-tag-form.php
View File

@ -11,7 +11,7 @@ if ( !defined('ABSPATH') )
die('-1'); die('-1');
if ( empty($tag_ID) ) { ?> if ( empty($tag_ID) ) { ?>
<div id="message" class="updated"><p><strong><?php _e('An item was not selected for editing.'); ?></strong></p></div> <div id="message" class="updated"><p><strong><?php _e( 'You did not select an item for editing.' ); ?></strong></p></div>
<?php <?php
return; return;
} }

2
wp-admin/import/mt.php
View File

@ -36,7 +36,7 @@ class MT_Import {
$this->header(); $this->header();
?> ?>
<div class="narrow"> <div class="narrow">
<p><?php _e('Howdy! We&#8217;re about to begin importing all of your Movable Type or TypePad entries into WordPress. To begin, either choose a file to upload and click &#8220;Upload file and import&#8221;, or use FTP to upload your MT export file as <code>mt-export.txt</code> in your <code>/wp-content/</code> directory and then click "Import mt-export.txt"'); ?></p> <p><?php _e( 'Howdy! We are about to begin importing all of your Movable Type or TypePad entries into WordPress. To begin, either choose a file to upload and click &#8220;Upload file and import&#8221;, or use FTP to upload your MT export file as <code>mt-export.txt</code> in your <code>/wp-content/</code> directory and then click &#8220;Import mt-export.txt&#8221;.' ); ?></p>
<?php wp_import_upload_form( add_query_arg('step', 1) ); ?> <?php wp_import_upload_form( add_query_arg('step', 1) ); ?>
<form method="post" action="<?php echo esc_attr(add_query_arg('step', 1)); ?>" class="import-upload-form"> <form method="post" action="<?php echo esc_attr(add_query_arg('step', 1)); ?>" class="import-upload-form">

2
wp-admin/ms-edit.php
View File

@ -147,7 +147,7 @@ switch ( $_GET['action'] ) {
wp_die( __( 'You do not have permission to access this page.' ) ); wp_die( __( 'You do not have permission to access this page.' ) );
if ( is_array( $_POST['blog'] ) == false ) if ( is_array( $_POST['blog'] ) == false )
wp_die( __( "Can't create an empty site." ) ); wp_die( __( 'Can&#8217;t create an empty site.' ) );
$blog = $_POST['blog']; $blog = $_POST['blog'];
$domain = ''; $domain = '';
if ( ! preg_match( '/(--)/', $blog['domain'] ) && preg_match( '|^([a-zA-Z0-9-])+$|', $blog['domain'] ) ) if ( ! preg_match( '/(--)/', $blog['domain'] ) && preg_match( '|^([a-zA-Z0-9-])+$|', $blog['domain'] ) )

12
wp-admin/ms-options.php
View File

@ -74,7 +74,7 @@ if (isset($_GET['updated'])) {
<input name="dashboard_blog_orig" type="hidden" id="dashboard_blog_orig" value="<?php echo esc_attr( $blogname ); ?>" /> <input name="dashboard_blog_orig" type="hidden" id="dashboard_blog_orig" value="<?php echo esc_attr( $blogname ); ?>" />
<input name="dashboard_blog" type="text" id="dashboard_blog" value="<?php echo esc_attr( $blogname ); ?>" class="regular-text" /> <input name="dashboard_blog" type="text" id="dashboard_blog" value="<?php echo esc_attr( $blogname ); ?>" class="regular-text" />
<br /> <br />
<?php _e( "Site path ('dashboard', 'control', 'manager', etc) or blog id.<br />New users are added to this site as the user role defined below if they don't have a site. Leave blank for the main site. Users with the subscriber role on old site will be moved to the new site if changed. The new site will be created if it does not exist." ); ?> <?php _e( 'Site path (&#8220;dashboard&#8221;, &#8220;control&#8221;, &#8220;manager&#8221;, etc.) or blog ID.<br />New users are added to this site as the user role defined below if they don&#8217;t have a site. Leave blank for the main site. Users with the subscriber role on old site will be moved to the new site if changed. The new site will be created if it does not exist.' ); ?>
</td> </td>
</tr> </tr>
<tr valign="top"> <tr valign="top">
@ -85,7 +85,7 @@ if (isset($_GET['updated'])) {
?> ?>
</select> </select>
<br /> <br />
<?php _e( "The default role for new users on the Dashboard site. 'Subscriber' or 'Contributor' roles are recommended." ); ?> <?php _e( 'The default role for new users on the Dashboard site. &#8220;Subscriber&#8221; or &#8220;Contributor&#8221; roles are recommended.' ); ?>
</td> </td>
</tr> </tr>
<tr valign="top"> <tr valign="top">
@ -113,7 +113,7 @@ if (isset($_GET['updated'])) {
<label><input name="registration" type="radio" id="registration4" value="all"<?php checked( $reg, 'all') ?> /> <?php _e( 'Both sites and user accounts can be registered.' ); ?></label><br /> <label><input name="registration" type="radio" id="registration4" value="all"<?php checked( $reg, 'all') ?> /> <?php _e( 'Both sites and user accounts can be registered.' ); ?></label><br />
<p><?php _e( 'Disable or enable registration and who or what can be registered. (Default is disabled.)' ); ?></p> <p><?php _e( 'Disable or enable registration and who or what can be registered. (Default is disabled.)' ); ?></p>
<?php if ( is_subdomain_install() ) { <?php if ( is_subdomain_install() ) {
echo '<p>' . __( 'If registration is disabled, please set <code>NOBLOGREDIRECT</code> in <code>wp-config.php</code> to a url you will redirect visitors to if they visit a non-existent site.' ) . '</p>'; echo '<p>' . __( 'If registration is disabled, please set <code>NOBLOGREDIRECT</code> in <code>wp-config.php</code> to a URL you will redirect visitors to if they visit a non-existent site.' ) . '</p>';
} ?> } ?>
</td> </td>
</tr> </tr>
@ -152,7 +152,7 @@ if (isset($_GET['updated'])) {
$limited_email_domains = str_replace( ' ', "\n", $limited_email_domains ); ?> $limited_email_domains = str_replace( ' ', "\n", $limited_email_domains ); ?>
<textarea name="limited_email_domains" id="limited_email_domains" cols="45" rows="5"><?php echo wp_htmledit_pre( $limited_email_domains == '' ? '' : implode( "\n", (array) $limited_email_domains ) ); ?></textarea> <textarea name="limited_email_domains" id="limited_email_domains" cols="45" rows="5"><?php echo wp_htmledit_pre( $limited_email_domains == '' ? '' : implode( "\n", (array) $limited_email_domains ) ); ?></textarea>
<br /> <br />
<?php _e( 'If you want to limit site registrations to certain domains. Enter one domain per line.' ) ?> <?php _e( 'If you want to limit site registrations to certain domains. One domain per line.' ) ?>
</td> </td>
</tr> </tr>
@ -161,7 +161,7 @@ if (isset($_GET['updated'])) {
<td> <td>
<textarea name="banned_email_domains" id="banned_email_domains" cols="45" rows="5"><?php echo wp_htmledit_pre( get_site_option( 'banned_email_domains' ) == '' ? '' : implode( "\n", (array) get_site_option( 'banned_email_domains' ) ) ); ?></textarea> <textarea name="banned_email_domains" id="banned_email_domains" cols="45" rows="5"><?php echo wp_htmledit_pre( get_site_option( 'banned_email_domains' ) == '' ? '' : implode( "\n", (array) get_site_option( 'banned_email_domains' ) ) ); ?></textarea>
<br /> <br />
<?php _e('If you want to ban domains from site registrations. Enter one domain per line.') ?> <?php _e( 'If you want to ban domains from site registrations. One domain per line.' ) ?>
</td> </td>
</tr> </tr>
@ -234,7 +234,7 @@ if (isset($_GET['updated'])) {
<td><label><input type="checkbox" id="mu_media_buttons_image" name="mu_media_buttons[image]" value="1"<?php checked( ! empty( $mu_media_buttons['image'] ) ) ?>/> <?php _e( 'Images' ); ?></label><br /> <td><label><input type="checkbox" id="mu_media_buttons_image" name="mu_media_buttons[image]" value="1"<?php checked( ! empty( $mu_media_buttons['image'] ) ) ?>/> <?php _e( 'Images' ); ?></label><br />
<label><input type="checkbox" id="mu_media_buttons_video" name="mu_media_buttons[video]" value="1"<?php checked( ! empty( $mu_media_buttons['video'] ) ) ?>/> <?php _e( 'Videos' ); ?></label><br /> <label><input type="checkbox" id="mu_media_buttons_video" name="mu_media_buttons[video]" value="1"<?php checked( ! empty( $mu_media_buttons['video'] ) ) ?>/> <?php _e( 'Videos' ); ?></label><br />
<label><input type="checkbox" id="mu_media_buttons_audio" name="mu_media_buttons[audio]" value="1"<?php checked( ! empty( $mu_media_buttons['audio'] ) ) ?>/> <?php _e( 'Music' ); ?></label><br /> <label><input type="checkbox" id="mu_media_buttons_audio" name="mu_media_buttons[audio]" value="1"<?php checked( ! empty( $mu_media_buttons['audio'] ) ) ?>/> <?php _e( 'Music' ); ?></label><br />
<?php _e( 'The media upload buttons to display on the "Write Post" page. Make sure you update the allowed upload file types below as well.' ); ?></td> <?php _e( 'The media upload buttons to display on the &#8220;Write Post&#8221; page. Make sure you update the allowed upload file types below as well.' ); ?></td>
</tr> </tr>
<tr valign="top"> <tr valign="top">

16
wp-admin/ms-sites.php
View File

@ -274,7 +274,7 @@ switch ( $action ) {
<div id="blogedit_blogadduser" class="postbox"> <div id="blogedit_blogadduser" class="postbox">
<h3 class="hndle"><span><?php _e( 'Add a new user' ); ?></span></h3> <h3 class="hndle"><span><?php _e( 'Add a new user' ); ?></span></h3>
<div class="inside"> <div class="inside">
<p class="description"><?php _e( 'Enter the username of an existing user and hit "Update Options" to add the user.' ) ?></p> <p class="description"><?php _e( 'Enter the username of an existing user and hit &#8220;Update Options&#8221; to add the user.' ) ?></p>
<table class="form-table"> <table class="form-table">
<tr> <tr>
<th scope="row"><?php _e( 'User&nbsp;Login:' ) ?></th> <th scope="row"><?php _e( 'User&nbsp;Login:' ) ?></th>
@ -551,21 +551,21 @@ switch ( $action ) {
$actions['backend'] = "<span class='backend'><a href='" . esc_url( get_admin_url($blog['blog_id']) ) . "' class='edit'>" . __( 'Backend' ) . '</a></span>'; $actions['backend'] = "<span class='backend'><a href='" . esc_url( get_admin_url($blog['blog_id']) ) . "' class='edit'>" . __( 'Backend' ) . '</a></span>';
if ( $current_site->blog_id != $blog['blog_id'] ) { if ( $current_site->blog_id != $blog['blog_id'] ) {
if ( get_blog_status( $blog['blog_id'], 'deleted' ) == '1' ) if ( get_blog_status( $blog['blog_id'], 'deleted' ) == '1' )
$actions['activate'] = '<span class="activate"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;action2=activateblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to activate the site %s" ), $blogname ) ) ) ) . '">' . __( 'Activate' ) . '</a></span>'; $actions['activate'] = '<span class="activate"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;action2=activateblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to activate the site %s' ), $blogname ) ) ) ) . '">' . __( 'Activate' ) . '</a></span>';
else else
$actions['deactivate'] = '<span class="activate"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;action2=deactivateblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to deactivate the site %s" ), $blogname ) ) ) ) . '">' . __( 'Deactivate' ) . '</a></span>'; $actions['deactivate'] = '<span class="activate"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;action2=deactivateblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to deactivate the site %s' ), $blogname ) ) ) ) . '">' . __( 'Deactivate' ) . '</a></span>';
if ( get_blog_status( $blog['blog_id'], 'archived' ) == '1' ) if ( get_blog_status( $blog['blog_id'], 'archived' ) == '1' )
$actions['unarchive'] = '<span class="archive"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;action2=unarchiveblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to unarchive the site %s." ), $blogname ) ) ) ) . '">' . __( 'Unarchive' ) . '</a></span>'; $actions['unarchive'] = '<span class="archive"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;action2=unarchiveblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to unarchive the site %s.' ), $blogname ) ) ) ) . '">' . __( 'Unarchive' ) . '</a></span>';
else else
$actions['archive'] = '<span class="archive"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;action2=archiveblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to archive the site %s." ), $blogname ) ) ) ) . '">' . __( 'Archive' ) . '</a></span>'; $actions['archive'] = '<span class="archive"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;action2=archiveblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to archive the site %s.' ), $blogname ) ) ) ) . '">' . __( 'Archive' ) . '</a></span>';
if ( get_blog_status( $blog['blog_id'], 'spam' ) == '1' ) if ( get_blog_status( $blog['blog_id'], 'spam' ) == '1' )
$actions['unspam'] = '<span class="spam"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;action2=unspamblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to unspam the site %s." ), $blogname ) ) ) ) . '">' . __( 'Not Spam' ) . '</a></span>'; $actions['unspam'] = '<span class="spam"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;action2=unspamblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to unspam the site %s.' ), $blogname ) ) ) ) . '">' . __( 'Not Spam' ) . '</a></span>';
else else
$actions['spam'] = '<span class="spam"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;action2=spamblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to mark the site %s as spam." ), $blogname ) ) ) ) . '">' . __( 'Spam' ) . '</a></span>'; $actions['spam'] = '<span class="spam"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;action2=spamblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to mark the site %s as spam.' ), $blogname ) ) ) ) . '">' . __( 'Spam' ) . '</a></span>';
$actions['delete'] = '<span class="delete"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;action2=deleteblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to delete the site %s." ), $blogname ) ) ) ) . '">' . __( 'Delete' ) . '</a></span>'; $actions['delete'] = '<span class="delete"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;action2=deleteblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to delete the site %s.' ), $blogname ) ) ) ) . '">' . __( 'Delete' ) . '</a></span>';
} }
$actions['visit'] = "<span class='view'><a href='" . esc_url( get_home_url( $blog['blog_id'] ) ) . "' rel='permalink'>" . __( 'Visit' ) . '</a>'; $actions['visit'] = "<span class='view'><a href='" . esc_url( get_home_url( $blog['blog_id'] ) ) . "' rel='permalink'>" . __( 'Visit' ) . '</a>';

2
wp-admin/ms-themes.php
View File

@ -29,7 +29,7 @@ $allowed_themes = get_site_allowed_themes();
<form action="<?php echo esc_url( admin_url( 'ms-edit.php?action=updatethemes' ) ); ?>" method="post"> <form action="<?php echo esc_url( admin_url( 'ms-edit.php?action=updatethemes' ) ); ?>" method="post">
<?php screen_icon(); ?> <?php screen_icon(); ?>
<h2><?php _e( 'Network Themes' ) ?></h2> <h2><?php _e( 'Network Themes' ) ?></h2>
<p><?php _e( 'Disable themes network-wide. You can enable themes on a site by site basis.' ) ?></p> <p><?php _e( 'Disable themes network-wide. You can enable themes on a site-by-site basis.' ) ?></p>
<table class="widefat"> <table class="widefat">
<thead> <thead>
<tr> <tr>

4
wp-admin/ms-upgrade-network.php
View File

@ -54,7 +54,7 @@ switch ( $action ) {
} }
} }
echo "</ul>"; echo "</ul>";
?><p><?php _e("If your browser doesn't start loading the next page automatically click this link:"); ?> <a class="button" href="ms-upgrade-network.php?action=upgrade&amp;n=<?php echo ($n + 5) ?>"><?php _e("Next Sites"); ?></a></p> ?><p><?php _e( 'If your browser doesn&#8217;t start loading the next page automatically, click this link:' ); ?> <a class="button" href="ms-upgrade-network.php?action=upgrade&amp;n=<?php echo ($n + 5) ?>"><?php _e("Next Sites"); ?></a></p>
<script type='text/javascript'> <script type='text/javascript'>
<!-- <!--
function nextpage() { function nextpage() {
@ -66,7 +66,7 @@ switch ( $action ) {
break; break;
case 'show': case 'show':
default: default:
?><p><?php _e("You can update all the sites on your network through this page. It works by calling the update script of each site automatically. Hit the link below to update."); ?></p> ?><p><?php _e( 'You can update all the sites on your network through this page. It works by calling the update script of each site automatically. Hit the link below to update.' ); ?></p>
<p><a class="button" href="ms-upgrade-network.php?action=upgrade"><?php _e("Update Network"); ?></a></p><?php <p><a class="button" href="ms-upgrade-network.php?action=upgrade"><?php _e("Update Network"); ?></a></p><?php
do_action( 'wpmu_upgrade_page' ); do_action( 'wpmu_upgrade_page' );
break; break;

6
wp-admin/my-sites.php
View File

@ -31,7 +31,7 @@ if ( 'updateblogsettings' == $action && isset( $_POST['primary_blog'] ) ) {
update_user_option( $current_user->id, 'primary_blog', (int) $_POST['primary_blog'], true ); update_user_option( $current_user->id, 'primary_blog', (int) $_POST['primary_blog'], true );
$updated = true; $updated = true;
} else { } else {
wp_die( __( "The primary site, which you have choosen, doesn't exists." ) ); wp_die( __( 'The primary site you chose does not exist.' ) );
} }
} }
@ -56,9 +56,9 @@ if ( $updated ) { ?>
<?php <?php
$settings_html = apply_filters( 'myblogs_options', '', 'global' ); $settings_html = apply_filters( 'myblogs_options', '', 'global' );
if ( $settings_html != '' ) { if ( $settings_html != '' ) {
echo "<tr><td valign='top'><h3>" . __( 'Global Settings' ) . "</h3></td><td>"; echo '<tr><td valign="top"><h3>' . __( 'Global Settings' ) . '</h3></td><td>';
echo $settings_html; echo $settings_html;
echo "</td></tr>"; echo '</td></tr>';
} }
reset( $blogs ); reset( $blogs );
$num = count( $blogs ); $num = count( $blogs );

12
wp-admin/network.php
View File

@ -133,7 +133,7 @@ function network_step1( $errors = false ) {
$admin_email = ( ! empty( $_POST['email'] ) && ! in_array( 'invalid_email', $error_codes ) ) ? $_POST['email'] : get_option( 'admin_email' ); $admin_email = ( ! empty( $_POST['email'] ) && ! in_array( 'invalid_email', $error_codes ) ) ? $_POST['email'] : get_option( 'admin_email' );
?> ?>
<p><?php _e( 'Welcome to the Network installation process!' ); ?></p> <p><?php _e( 'Welcome to the Network installation process!' ); ?></p>
<p><?php _e( "Fill in the information below and you'll be on your way to creating a network of WordPress sites. We'll create configuration files in the next step." ); ?></p> <p><?php _e( 'Fill in the information below and you&#8217;ll be on your way to creating a network of WordPress sites. We will create configuration files in the next step.' ); ?></p>
<?php <?php
// @todo IIS and ! $is_apache // @todo IIS and ! $is_apache
@ -144,7 +144,7 @@ function network_step1( $errors = false ) {
} else { } else {
$subdomain_install = false; $subdomain_install = false;
if ( got_mod_rewrite() ) // dangerous assumptions if ( got_mod_rewrite() ) // dangerous assumptions
echo '<div class="updated inline"><p><strong>' . __( 'Note:' ) . '</strong> ' . __( 'Please make sure the Apache <code>mod_rewrite</code> module is installed as it will be used at the end of this install.' ) . '</p>'; echo '<div class="updated inline"><p><strong>' . __( 'Note:' ) . '</strong> ' . __( 'Please make sure the Apache <code>mod_rewrite</code> module is installed as it will be used at the end of this installation.' ) . '</p>';
else else
echo '<div class="error inline"><p><strong>' . __( 'Warning!' ) . '</strong> ' . __( 'It looks like the Apache <code>mod_rewrite</code> module is not installed.' ) . '</p>'; echo '<div class="error inline"><p><strong>' . __( 'Warning!' ) . '</strong> ' . __( 'It looks like the Apache <code>mod_rewrite</code> module is not installed.' ) . '</p>';
echo '<p>' . __( 'If <code>mod_rewrite</code> is disabled, ask your administrator to enable that module, or look at the <a href="http://httpd.apache.org/docs/mod/mod_rewrite.html">Apache documentation</a> or <a href="http://www.google.com/search?q=apache+mod_rewrite">elsewhere</a> for help setting it up.' ) . '</p></div>'; echo '<p>' . __( 'If <code>mod_rewrite</code> is disabled, ask your administrator to enable that module, or look at the <a href="http://httpd.apache.org/docs/mod/mod_rewrite.html">Apache documentation</a> or <a href="http://www.google.com/search?q=apache+mod_rewrite">elsewhere</a> for help setting it up.' ) . '</p></div>';
@ -153,7 +153,7 @@ function network_step1( $errors = false ) {
if ( allow_subdomain_install() ) : ?> if ( allow_subdomain_install() ) : ?>
<h3><?php esc_html_e( 'Addresses of Sites in your Network' ); ?></h3> <h3><?php esc_html_e( 'Addresses of Sites in your Network' ); ?></h3>
<p><?php _e( 'Please choose whether you would like sites in your WordPress network to use sub-domains or sub-directories. <strong>You cannot change this later.</strong>' ); ?></p> <p><?php _e( 'Please choose whether you would like sites in your WordPress network to use sub-domains or sub-directories. <strong>You cannot change this later.</strong>' ); ?></p>
<p><?php _e( "You will need a wildcard DNS record if you're going to use the virtual host (sub-domain) functionality." ); ?></p> <p><?php _e( 'You will need a wildcard DNS record if you are going to use the virtual host (sub-domain) functionality.' ); ?></p>
<?php // @todo: Link to an MS readme? ?> <?php // @todo: Link to an MS readme? ?>
<table class="form-table"> <table class="form-table">
<tr> <tr>
@ -173,12 +173,12 @@ function network_step1( $errors = false ) {
if ( $is_www ) : if ( $is_www ) :
?> ?>
<h3><?php esc_html_e( 'Server Address' ); ?></h3> <h3><?php esc_html_e( 'Server Address' ); ?></h3>
<p><?php printf( __( 'We recommend you change your siteurl to <code>%1$s</code> before enabling the network feature. It will still be possible to visit your site using the "www" prefix with an address like <code>%2$s</code> but any links will not have the "www" prefix.' ), substr( $hostname, 4 ), $hostname ); ?></h3> <p><?php printf( __( 'We recommend you change your siteurl to <code>%1$s</code> before enabling the network feature. It will still be possible to visit your site using the <code>www</code> prefix with an address like <code>%2$s</code> but any links will not have the <code>www</code> prefix.' ), substr( $hostname, 4 ), $hostname ); ?></h3>
<table class="form-table"> <table class="form-table">
<tr> <tr>
<th scope='row'><?php esc_html_e( 'Server Address' ); ?></th> <th scope='row'><?php esc_html_e( 'Server Address' ); ?></th>
<td> <td>
<?php printf( __( 'The Internet address of your network will be <code>%s</code>.' ), $hostname ); ?> <?php printf( __( 'The internet address of your network will be <code>%s</code>.' ), $hostname ); ?>
</td> </td>
</tr> </tr>
</table> </table>
@ -201,7 +201,7 @@ function network_step1( $errors = false ) {
<tr> <tr>
<th scope='row'><?php esc_html_e( 'Server Address' ); ?></th> <th scope='row'><?php esc_html_e( 'Server Address' ); ?></th>
<td> <td>
<?php printf( __( 'The Internet address of your network will be <code>%s</code>.' ), $hostname ); ?> <?php printf( __( 'The internet address of your network will be <code>%s</code>.' ), $hostname ); ?>
</td> </td>
</tr> </tr>
<?php endif; ?> <?php endif; ?>

4
wp-admin/options-discussion.php
View File

@ -52,7 +52,7 @@ include('admin-header.php');
<label for="comment_registration"> <label for="comment_registration">
<input name="comment_registration" type="checkbox" id="comment_registration" value="1" <?php checked('1', get_option('comment_registration')); ?> /> <input name="comment_registration" type="checkbox" id="comment_registration" value="1" <?php checked('1', get_option('comment_registration')); ?> />
<?php _e('Users must be registered and logged in to comment') ?> <?php _e('Users must be registered and logged in to comment') ?>
<?php if ( !get_option( 'users_can_register' ) && is_multisite() ) _e( ' (Signup has been disabled. Only members of this site can comment)' ); ?> <?php if ( !get_option( 'users_can_register' ) && is_multisite() ) _e( ' (Signup has been disabled. Only members of this site can comment.)' ); ?>
</label> </label>
<br /> <br />
@ -160,7 +160,7 @@ printf( __('Comments should be displayed with the %s comments at the top of each
<th scope="row"><?php _e('Avatar Display') ?></th> <th scope="row"><?php _e('Avatar Display') ?></th>
<td><fieldset><legend class="screen-reader-text"><span><?php _e('Avatar Display') ?></span></legend> <td><fieldset><legend class="screen-reader-text"><span><?php _e('Avatar Display') ?></span></legend>
<?php <?php
$yesorno = array(0 => __("Don&#8217;t show Avatars"), 1 => __('Show Avatars')); $yesorno = array( 0 => __( 'Don&#8217;t show Avatars' ), 1 => __( 'Show Avatars' ) );
foreach ( $yesorno as $key => $value) { foreach ( $yesorno as $key => $value) {
$selected = (get_option('show_avatars') == $key) ? 'checked="checked"' : ''; $selected = (get_option('show_avatars') == $key) ? 'checked="checked"' : '';
echo "\n\t<label><input type='radio' name='show_avatars' value='" . esc_attr($key) . "' $selected/> $value</label><br />"; echo "\n\t<label><input type='radio' name='show_avatars' value='" . esc_attr($key) . "' $selected/> $value</label><br />";

2
wp-admin/options.php
View File

@ -132,7 +132,7 @@ if ( 'update' == $action ) {
if ( $options ) { if ( $options ) {
foreach ( $options as $option ) { foreach ( $options as $option ) {
if ( $unregistered ) if ( $unregistered )
_deprecated_argument( 'options.php', '2.7', sprintf( __( 'The "%1$s" setting is unregistered. Unregistered settings are deprecated. See http://codex.wordpress.org/Settings_API' ), $option, $option_page ) ); _deprecated_argument( 'options.php', '2.7', sprintf( __( 'The <code>%1$s</code> setting is unregistered. Unregistered settings are deprecated. See http://codex.wordpress.org/Settings_API' ), $option, $option_page ) );
$option = trim($option); $option = trim($option);
$value = null; $value = null;

6
wp-admin/update-core.php
View File

@ -131,7 +131,7 @@ function core_upgrade_preamble() {
echo '</h3>'; echo '</h3>';
} else { } else {
echo '<div class="updated"><p>'; echo '<div class="updated"><p>';
_e('<strong>Important:</strong> before updating, please <a href="http://codex.wordpress.org/WordPress_Backups">backup your database and files</a>. For help with updates, visit the <a href="http://codex.wordpress.org/Updating_WordPress">Updating WordPress Codex page</a>.'); _e('<strong>Important:</strong> before updating, please <a href="http://codex.wordpress.org/WordPress_Backups">backup your database and files</a>. For help with updates, visit the <a href="http://codex.wordpress.org/Updating_WordPress">Updating WordPress</a> Codex page.');
echo '</p></div>'; echo '</p></div>';
echo '<h3 class="response">'; echo '<h3 class="response">';
@ -175,7 +175,7 @@ function list_plugin_updates() {
$core_update_version = $core_updates[0]->current; $core_update_version = $core_updates[0]->current;
?> ?>
<h3><?php _e( 'Plugins' ); ?></h3> <h3><?php _e( 'Plugins' ); ?></h3>
<p><?php _e('The following plugins have new versions available. Check the ones you want to update and then click "Update Plugins".'); ?></p> <p><?php _e( 'The following plugins have new versions available. Check the ones you want to update and then click &#8220;Update Plugins&#8221;.' ); ?></p>
<form method="post" action="<?php echo $form_action; ?>" name="upgrade-plugins" class="upgrade"> <form method="post" action="<?php echo $form_action; ?>" name="upgrade-plugins" class="upgrade">
<?php wp_nonce_field('upgrade-core'); ?> <?php wp_nonce_field('upgrade-core'); ?>
<p><input id="upgrade-plugins" class="button" type="submit" value="<?php esc_attr_e('Update Plugins'); ?>" name="upgrade" /></p> <p><input id="upgrade-plugins" class="button" type="submit" value="<?php esc_attr_e('Update Plugins'); ?>" name="upgrade" /></p>
@ -244,7 +244,7 @@ function list_theme_updates() {
?> ?>
<h3><?php _e( 'Themes' ); ?></h3> <h3><?php _e( 'Themes' ); ?></h3>
<p><?php _e('The following themes have new versions available. Check the ones you want to update and then click "Update Themes".'); ?></p> <p><?php _e( 'The following themes have new versions available. Check the ones you want to update and then click &#8220;Update Themes&#8221.' ); ?></p>
<p><?php printf( __('<strong>Please Note:</strong> Any customizations you have made to the Themes files will be lost. Please consider using <a href="%s">child themes</a> for modifications.'), _x('http://codex.wordpress.org/Child_Themes', 'Link used in suggestion to use child themes in GUU') ); ?></p> <p><?php printf( __('<strong>Please Note:</strong> Any customizations you have made to the Themes files will be lost. Please consider using <a href="%s">child themes</a> for modifications.'), _x('http://codex.wordpress.org/Child_Themes', 'Link used in suggestion to use child themes in GUU') ); ?></p>
<form method="post" action="<?php echo $form_action; ?>" name="upgrade-themes" class="upgrade"> <form method="post" action="<?php echo $form_action; ?>" name="upgrade-themes" class="upgrade">
<?php wp_nonce_field('upgrade-core'); ?> <?php wp_nonce_field('upgrade-core'); ?>

2
wp-includes/author-template.php
View File

@ -52,7 +52,7 @@ function the_author( $deprecated = '', $deprecated_echo = true ) {
if ( !empty( $deprecated ) ) if ( !empty( $deprecated ) )
_deprecated_argument( __FUNCTION__, '2.1' ); _deprecated_argument( __FUNCTION__, '2.1' );
if ( $deprecated_echo !== true ) if ( $deprecated_echo !== true )
_deprecated_argument( __FUNCTION__, '1.5', __('Use get_the_author() instead if you do not want the value echoed.') ); _deprecated_argument( __FUNCTION__, '1.5', __('Use <code>get_the_author()</code> instead if you do not want the value echoed.') );
if ( $deprecated_echo ) if ( $deprecated_echo )
echo get_the_author(); echo get_the_author();
return get_the_author(); return get_the_author();

2
wp-includes/comment-template.php
View File

@ -728,7 +728,7 @@ function get_trackback_url() {
*/ */
function trackback_url( $deprecated_echo = true ) { function trackback_url( $deprecated_echo = true ) {
if ( $deprecated_echo !== true ) if ( $deprecated_echo !== true )
_deprecated_argument( __FUNCTION__, '2.5', __('Use get_trackback_url() instead if you do not want the value echoed.') ); _deprecated_argument( __FUNCTION__, '2.5', __('Use <code>get_trackback_url()</code> instead if you do not want the value echoed.') );
if ( $deprecated_echo ) if ( $deprecated_echo )
echo get_trackback_url(); echo get_trackback_url();
else else

2
wp-includes/formatting.php
View File

@ -2360,7 +2360,7 @@ function sanitize_option($option, $value) {
case 'admin_email': case 'admin_email':
$value = sanitize_email($value); $value = sanitize_email($value);
if ( !$value && function_exists('add_settings_error') ) if ( !$value && function_exists('add_settings_error') )
add_settings_error('admin_email', 'invalid_admin_email', __('The E-Mail Address submitted was not in the right format. Please enter a valid Email Address')); add_settings_error('admin_email', 'invalid_admin_email', __('The email address submitted was not in the right format. Please enter a valid email address.'));
break; break;
case 'thumbnail_size_w': case 'thumbnail_size_w':

2
wp-includes/general-template.php
View File

@ -395,7 +395,7 @@ function get_bloginfo( $show = '', $filter = 'raw' ) {
switch( $show ) { switch( $show ) {
case 'home' : // DEPRECATED case 'home' : // DEPRECATED
case 'siteurl' : // DEPRECATED case 'siteurl' : // DEPRECATED
_deprecated_argument( __FUNCTION__, '2.2', sprintf( __('The \'%1$s\' option is deprecated for the family of bloginfo() functions. Use the \'%2$s\' option instead.'), $show, 'url' ) ); _deprecated_argument( __FUNCTION__, '2.2', sprintf( __('The <code>%1$s</code> option is deprecated for the family of <code>bloginfo()</code> functions. Use the <code>%2$s</code> option instead.'), $show, 'url' ) );
case 'url' : case 'url' :
$output = home_url(); $output = home_url();
break; break;

12
wp-includes/ms-functions.php
View File

@ -322,14 +322,14 @@ function create_empty_blog( $domain, $path, $weblog_title, $site_id = 1 ) {
// Check if the domain has been used already. We should return an error message. // Check if the domain has been used already. We should return an error message.
if ( domain_exists($domain, $path, $site_id) ) if ( domain_exists($domain, $path, $site_id) )
return __('error: Blog URL already taken.'); return __( 'Error: Blog URL already taken.' );
// Need to backup wpdb table names, and create a new wp_blogs entry for new blog. // Need to backup wpdb table names, and create a new wp_blogs entry for new blog.
// Need to get blog_id from wp_blogs, and create new table names. // Need to get blog_id from wp_blogs, and create new table names.
// Must restore table names at the end of function. // Must restore table names at the end of function.
if ( ! $blog_id = insert_blog($domain, $path, $site_id) ) if ( ! $blog_id = insert_blog($domain, $path, $site_id) )
return __('error: problem creating blog entry'); return __( 'Error: problem creating blog entry.' );
switch_to_blog($blog_id); switch_to_blog($blog_id);
install_blog($blog_id); install_blog($blog_id);
@ -483,7 +483,7 @@ function wpmu_validate_user_signup($user_name, $user_email) {
$errors->add('user_name', __("Username must be at least 4 characters")); $errors->add('user_name', __("Username must be at least 4 characters"));
if ( strpos( " " . $user_name, "_" ) != false ) if ( strpos( " " . $user_name, "_" ) != false )
$errors->add('user_name', __("Sorry, usernames may not contain the character '_'!")); $errors->add( 'user_name', __( 'Sorry, usernames may not contain the character &#8220;_&#8221;!' ) );
// all numeric? // all numeric?
$match = array(); $match = array();
@ -568,11 +568,11 @@ function wpmu_validate_blog_signup($blogname, $blog_title, $user = '') {
$errors->add('blogname', __("Blog name must be at least 4 characters")); $errors->add('blogname', __("Blog name must be at least 4 characters"));
if ( strpos( " " . $blogname, "_" ) != false ) if ( strpos( " " . $blogname, "_" ) != false )
$errors->add('blogname', __("Sorry, blog names may not contain the character '_'!")); $errors->add( 'blogname', __( 'Sorry, blog names may not contain the character &#8220;_&#8221;!' ) );
// do not allow users to create a blog that conflicts with a page on the main blog. // do not allow users to create a blog that conflicts with a page on the main blog.
if ( !is_subdomain_install() && $wpdb->get_var( $wpdb->prepare( "SELECT post_name FROM " . $wpdb->get_blog_prefix( $current_site->blog_id ) . "posts WHERE post_type = 'page' AND post_name = %s", $blogname ) ) ) if ( !is_subdomain_install() && $wpdb->get_var( $wpdb->prepare( "SELECT post_name FROM " . $wpdb->get_blog_prefix( $current_site->blog_id ) . "posts WHERE post_type = 'page' AND post_name = %s", $blogname ) ) )
$errors->add( 'blogname', __( "Sorry, you may not use that blog name" ) ); $errors->add( 'blogname', __( 'Sorry, you may not use that blog name.' ) );
// all numeric? // all numeric?
$match = array(); $match = array();
@ -1153,7 +1153,7 @@ function upload_is_user_over_quota( $echo = true ) {
if ( ($spaceAllowed-$size) < 0 ) { if ( ($spaceAllowed-$size) < 0 ) {
if ( $echo ) if ( $echo )
_e( "Sorry, you have used your space allocation. Please delete some files to upload more files." ); //No space left _e( 'Sorry, you have used your space allocation. Please delete some files to upload more files.' ); // No space left
return true; return true;
} else { } else {
return false; return false;

4
wp-includes/ms-load.php
View File

@ -174,7 +174,7 @@ function wpmu_current_site() {
if ( 1 == count( $sites ) ) if ( 1 == count( $sites ) )
wp_die( sprintf( /*WP_I18N_BLOG_DOESNT_EXIST*/'That blog does not exist. Please try <a href="%s">%s</a>.'/*/WP_I18N_BLOG_DOESNT_EXIST*/, $sites[0]->domain . $sites[0]->path ) ); wp_die( sprintf( /*WP_I18N_BLOG_DOESNT_EXIST*/'That blog does not exist. Please try <a href="%s">%s</a>.'/*/WP_I18N_BLOG_DOESNT_EXIST*/, $sites[0]->domain . $sites[0]->path ) );
else else
wp_die( /*WP_I18N_NO_SITE_DEFINED*/'No site defined on this host. If you are the owner of this site, please check <a href="http://codex.wordpress.org/Debugging_WPMU">Debugging WPMU</a> for further assistance.'/*/WP_I18N_NO_SITE_DEFINED*/ ); wp_die( /*WP_I18N_NO_SITE_DEFINED*/'No site defined on this host. If you are the owner of this site, please check <a href="http://codex.wordpress.org/Debugging_WPMU">Debugging WPMU</a> for help.'/*/WP_I18N_NO_SITE_DEFINED*/ );
} }
/** /**
@ -200,7 +200,7 @@ function ms_not_installed() {
$msg .= '<h1>' . /*WP_I18N_WHAT_DO_I_DO*/'What do I do now?'/*WP_I18N_WHAT_DO_I_DO*/ . '</h1>'; $msg .= '<h1>' . /*WP_I18N_WHAT_DO_I_DO*/'What do I do now?'/*WP_I18N_WHAT_DO_I_DO*/ . '</h1>';
// @todo Update WPMU codex link. // @todo Update WPMU codex link.
$msg .= '<p>' . /*WP_I18N_RTFM*/'Read the <a target="_blank" href="http://codex.wordpress.org/Debugging_WPMU">bug report</a> page. Some of the guidelines there may help you figure out what went wrong.'/*/WP_I18N_RTFM*/ . '</p>'; $msg .= '<p>' . /*WP_I18N_RTFM*/'Read the <a target="_blank" href="http://codex.wordpress.org/Debugging_WPMU">bug report</a> page. Some of the guidelines there may help you figure out what went wrong.'/*/WP_I18N_RTFM*/ . '</p>';
$msg .= '<p>' . /*WP_I18N_STUCK*/"If you're still stuck with this message, then check that your database contains the following tables:"/*/WP_I18N_STUCK*/ . '</p><ul>'; $msg .= '<p>' . /*WP_I18N_STUCK*/'If you&#8217;re still stuck with this message, then check that your database contains the following tables:'/*/WP_I18N_STUCK*/ . '</p><ul>';
foreach ( $wpdb->global_tables as $table ) { foreach ( $wpdb->global_tables as $table ) {
$msg .= '<li>' . $wpdb->prefix . $table . '</li>'; $msg .= '<li>' . $wpdb->prefix . $table . '</li>';
} }

2
wp-includes/ms-settings.php
View File

@ -12,7 +12,7 @@
// $base sanity check. // $base sanity check.
if ( 'BASE' == $base ) if ( 'BASE' == $base )
die( /*WP_I18N_BASE_ERROR*/'Configuration error in <code>wp-config.php</code>. <code>$base</code> is set to "BASE" when it should be the path like "/" or "/blogs/".'/*/WP_I18N_BASE_ERROR*/ ); die( /*WP_I18N_BASE_ERROR*/'Configuration error in <code>wp-config.php</code>. <code>$base</code> is set to <code>BASE</code> when it should be like <code>/</code> or <code>/blogs/</code>.'/*/WP_I18N_BASE_ERROR*/ );
/** Include Multisite initialization functions */ /** Include Multisite initialization functions */
require( ABSPATH . WPINC . '/ms-load.php' ); require( ABSPATH . WPINC . '/ms-load.php' );

12
wp-includes/pluggable.php
View File

@ -1033,7 +1033,7 @@ function wp_notify_postauthor($comment_id, $comment_type='') {
if ( empty( $comment_type ) ) $comment_type = 'comment'; if ( empty( $comment_type ) ) $comment_type = 'comment';
if ('comment' == $comment_type) { if ('comment' == $comment_type) {
$notify_message = sprintf( __('New comment on your post "%s"'),$post->post_title ) . "\r\n"; $notify_message = sprintf( __( 'New comment on your post &#8220;%s&#8221;' ), $post->post_title ) . "\r\n";
/* translators: 1: comment author, 2: author IP, 3: author domain */ /* translators: 1: comment author, 2: author IP, 3: author domain */
$notify_message .= sprintf( __('Author : %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n"; $notify_message .= sprintf( __('Author : %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
$notify_message .= sprintf( __('E-mail : %s'), $comment->comment_author_email ) . "\r\n"; $notify_message .= sprintf( __('E-mail : %s'), $comment->comment_author_email ) . "\r\n";
@ -1044,7 +1044,7 @@ function wp_notify_postauthor($comment_id, $comment_type='') {
/* translators: 1: blog name, 2: post title */ /* translators: 1: blog name, 2: post title */
$subject = sprintf( __('[%1$s] Comment: "%2$s"'), $blogname, $post->post_title ); $subject = sprintf( __('[%1$s] Comment: "%2$s"'), $blogname, $post->post_title );
} elseif ('trackback' == $comment_type) { } elseif ('trackback' == $comment_type) {
$notify_message = sprintf( __('New trackback on your post "%s"'), $post->post_title ) . "\r\n"; $notify_message = sprintf( __( 'New trackback on your post &#8221;%s&#8221;' ), $post->post_title ) . "\r\n";
/* translators: 1: website name, 2: author IP, 3: author domain */ /* translators: 1: website name, 2: author IP, 3: author domain */
$notify_message .= sprintf( __('Website: %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n"; $notify_message .= sprintf( __('Website: %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
$notify_message .= sprintf( __('URL : %s'), $comment->comment_author_url ) . "\r\n"; $notify_message .= sprintf( __('URL : %s'), $comment->comment_author_url ) . "\r\n";
@ -1053,7 +1053,7 @@ function wp_notify_postauthor($comment_id, $comment_type='') {
/* translators: 1: blog name, 2: post title */ /* translators: 1: blog name, 2: post title */
$subject = sprintf( __('[%1$s] Trackback: "%2$s"'), $blogname, $post->post_title ); $subject = sprintf( __('[%1$s] Trackback: "%2$s"'), $blogname, $post->post_title );
} elseif ('pingback' == $comment_type) { } elseif ('pingback' == $comment_type) {
$notify_message = sprintf( __('New pingback on your post "%s"'), $post->post_title ) . "\r\n"; $notify_message = sprintf( __( 'New pingback on your post &#8221;%s&#8221;' ), $post->post_title ) . "\r\n";
/* translators: 1: comment author, 2: author IP, 3: author domain */ /* translators: 1: comment author, 2: author IP, 3: author domain */
$notify_message .= sprintf( __('Website: %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n"; $notify_message .= sprintf( __('Website: %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
$notify_message .= sprintf( __('URL : %s'), $comment->comment_author_url ) . "\r\n"; $notify_message .= sprintf( __('URL : %s'), $comment->comment_author_url ) . "\r\n";
@ -1126,21 +1126,21 @@ function wp_notify_moderator($comment_id) {
switch ($comment->comment_type) switch ($comment->comment_type)
{ {
case 'trackback': case 'trackback':
$notify_message = sprintf( __('A new trackback on the post "%s" is waiting for your approval'), $post->post_title ) . "\r\n"; $notify_message = sprintf( __('A new trackback on the post &#8221;%s&#8221; is waiting for your approval'), $post->post_title ) . "\r\n";
$notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n"; $notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n";
$notify_message .= sprintf( __('Website : %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n"; $notify_message .= sprintf( __('Website : %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
$notify_message .= sprintf( __('URL : %s'), $comment->comment_author_url ) . "\r\n"; $notify_message .= sprintf( __('URL : %s'), $comment->comment_author_url ) . "\r\n";
$notify_message .= __('Trackback excerpt: ') . "\r\n" . $comment->comment_content . "\r\n\r\n"; $notify_message .= __('Trackback excerpt: ') . "\r\n" . $comment->comment_content . "\r\n\r\n";
break; break;
case 'pingback': case 'pingback':
$notify_message = sprintf( __('A new pingback on the post "%s" is waiting for your approval'), $post->post_title ) . "\r\n"; $notify_message = sprintf( __('A new pingback on the post &#8221;%s&#8221; is waiting for your approval'), $post->post_title ) . "\r\n";
$notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n"; $notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n";
$notify_message .= sprintf( __('Website : %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n"; $notify_message .= sprintf( __('Website : %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
$notify_message .= sprintf( __('URL : %s'), $comment->comment_author_url ) . "\r\n"; $notify_message .= sprintf( __('URL : %s'), $comment->comment_author_url ) . "\r\n";
$notify_message .= __('Pingback excerpt: ') . "\r\n" . $comment->comment_content . "\r\n\r\n"; $notify_message .= __('Pingback excerpt: ') . "\r\n" . $comment->comment_content . "\r\n\r\n";
break; break;
default: //Comments default: //Comments
$notify_message = sprintf( __('A new comment on the post "%s" is waiting for your approval'), $post->post_title ) . "\r\n"; $notify_message = sprintf( __('A new comment on the post &#8221;%s&#8221; is waiting for your approval'), $post->post_title ) . "\r\n";
$notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n"; $notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n";
$notify_message .= sprintf( __('Author : %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n"; $notify_message .= sprintf( __('Author : %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
$notify_message .= sprintf( __('E-mail : %s'), $comment->comment_author_email ) . "\r\n"; $notify_message .= sprintf( __('E-mail : %s'), $comment->comment_author_email ) . "\r\n";

2
wp-mail.php
View File

@ -11,7 +11,7 @@
require(dirname(__FILE__) . '/wp-load.php'); require(dirname(__FILE__) . '/wp-load.php');
if ( ! apply_filters( 'enable_post_by_email_configuration', true ) ) if ( ! apply_filters( 'enable_post_by_email_configuration', true ) )
wp_die( __( 'This action has been disabled by the administrator' ) ); wp_die( __( 'This action has been disabled by the administrator.' ) );
/** Allow a plugin to do a complete takeover of Post by Email **/ /** Allow a plugin to do a complete takeover of Post by Email **/
do_action('wp-mail.php'); do_action('wp-mail.php');

36
wp-signup.php
View File

@ -83,7 +83,7 @@ function show_blog_form($blogname = '', $blog_title = '', $errors = '') {
print $current_site->domain . $current_site->path . __( 'sitename' ); print $current_site->domain . $current_site->path . __( 'sitename' );
else else
print __( 'domain.' ) . $current_site->domain . $current_site->path; print __( 'domain.' ) . $current_site->domain . $current_site->path;
echo '.</strong> ' . __( 'Must be at least 4 characters, letters and numbers only. It cannot be changed so choose carefully!)' ) . '</p>'; echo '.</strong> ' . __( 'Must be at least 4 characters, letters and numbers only. It cannot be changed, so choose carefully!' ) . '</p>';
} }
// Blog Title // Blog Title
@ -165,10 +165,10 @@ function signup_another_blog($blogname = '', $blog_title = '', $errors = '') {
echo '<h2>' . sprintf( __( 'Get <em>another</em> %s site in seconds' ), $current_site->site_name ) . '</h2>'; echo '<h2>' . sprintf( __( 'Get <em>another</em> %s site in seconds' ), $current_site->site_name ) . '</h2>';
if ( $errors->get_error_code() ) { if ( $errors->get_error_code() ) {
echo "<p>" . __('There was a problem, please correct the form below and try again.') . "</p>"; echo '<p>' . __( 'There was a problem, please correct the form below and try again.' ) . '</p>';
} }
?> ?>
<p><?php printf(__("Welcome back, %s. By filling out the form below, you can <strong>add another site to your account</strong>. There is no limit to the number of sites you can have, so create to your heart's content, but write responsibly."), $current_user->display_name) ?></p> <p><?php printf( __( 'Welcome back, %s. By filling out the form below, you can <strong>add another site to your account</strong>. There is no limit to the number of sites you can have, so create to your heart&#8217;s content, but write responsibly!' ), $current_user->display_name ) ?></p>
<?php <?php
$blogs = get_blogs_of_user($current_user->ID); $blogs = get_blogs_of_user($current_user->ID);
@ -183,7 +183,7 @@ function signup_another_blog($blogname = '', $blog_title = '', $errors = '') {
</p> </p>
<?php } ?> <?php } ?>
<p><?php _e("If you&#8217;re not going to use a great site domain, leave it for a new user. Now have at it!") ?></p> <p><?php _e( 'If you&#8217;re not going to use a great site domain, leave it for a new user. Now have at it!' ) ?></p>
<form id="setupform" method="post" action="wp-signup.php"> <form id="setupform" method="post" action="wp-signup.php">
<input type="hidden" name="stage" value="gimmeanotherblog" /> <input type="hidden" name="stage" value="gimmeanotherblog" />
<?php do_action( "signup_hidden_fields" ); ?> <?php do_action( "signup_hidden_fields" ); ?>
@ -209,7 +209,7 @@ function validate_another_blog_signup() {
$public = (int) $_POST['blog_public']; $public = (int) $_POST['blog_public'];
$meta = apply_filters( 'signup_create_blog_meta', array( 'lang_id' => 1, 'public' => $public ) ); // deprecated $meta = apply_filters( 'signup_create_blog_meta', array( 'lang_id' => 1, 'public' => $public ) ); // deprecated
$meta = apply_filters( "add_signup_meta", $meta ); $meta = apply_filters( 'add_signup_meta', $meta );
wpmu_create_blog( $domain, $path, $blog_title, $current_user->id, $meta, $wpdb->siteid ); wpmu_create_blog( $domain, $path, $blog_title, $current_user->id, $meta, $wpdb->siteid );
confirm_another_blog_signup($domain, $path, $blog_title, $current_user->user_login, $current_user->user_email, $meta); confirm_another_blog_signup($domain, $path, $blog_title, $current_user->user_login, $current_user->user_email, $meta);
@ -220,7 +220,7 @@ function confirm_another_blog_signup($domain, $path, $blog_title, $user_name, $u
?> ?>
<h2><?php printf( __( 'The site %s is yours.' ), "<a href='http://{$domain}{$path}'>{$blog_title}</a>" ) ?></h2> <h2><?php printf( __( 'The site %s is yours.' ), "<a href='http://{$domain}{$path}'>{$blog_title}</a>" ) ?></h2>
<p> <p>
<?php printf(__('<a href="http://%1$s">http://%2$s</a> is your new site. <a href="%3$s">Login</a> as "%4$s" using your existing password.'), $domain.$path, $domain.$path, "http://" . $domain.$path . "wp-login.php", $user_name) ?> <?php printf( __( '<a href="http://%1$s">http://%2$s</a> is your new site. <a href="%3$s">Log in</a> as &#8220;%4$s&#8221; using your existing password.' ), $domain.$path, $domain.$path, "http://" . $domain.$path . "wp-login.php", $user_name ) ?>
</p> </p>
<?php <?php
do_action( 'signup_finished' ); do_action( 'signup_finished' );
@ -364,11 +364,11 @@ function confirm_blog_signup($domain, $path, $blog_title, $user_name = '', $user
<p><?php _e( 'If you do not activate your site within two days, you will have to sign up again.' ); ?></p> <p><?php _e( 'If you do not activate your site within two days, you will have to sign up again.' ); ?></p>
<h2><?php _e( 'Still waiting for your email?' ); ?></h2> <h2><?php _e( 'Still waiting for your email?' ); ?></h2>
<p> <p>
<?php _e("If you haven't received your email yet, there are a number of things you can do:") ?> <?php _e( 'If you haven&#8217;t received your email yet, there are a number of things you can do:' ) ?>
<ul id="noemail-tips"> <ul id="noemail-tips">
<li><p><strong><?php _e( 'Wait a little longer. Sometimes delivery of email can be delayed by processes outside of our control.' ) ?></strong></p></li> <li><p><strong><?php _e( 'Wait a little longer. Sometimes delivery of email can be delayed by processes outside of our control.' ) ?></strong></p></li>
<li><p><?php _e('Check the junk email or spam folder of your email client. Sometime emails wind up there by mistake.') ?></p></li> <li><p><?php _e( 'Check the junk or spam folder of your email client. Sometime emails wind up there by mistake.' ) ?></p></li>
<li><?php printf(__("Have you entered your email correctly? We think it's %s but if you've entered it incorrectly, you won't receive it."), $user_email) ?></li> <li><?php printf( __( 'Have you entered your email correctly? We think it&#8217;s %s but if you have entered it incorrectly, you will not receive it.' ), $user_email ) ?></li>
</ul> </ul>
</p> </p>
<?php <?php
@ -383,20 +383,20 @@ if ( !$active_signup )
$active_signup = apply_filters( 'wpmu_active_signup', $active_signup ); // return "all", "none", "blog" or "user" $active_signup = apply_filters( 'wpmu_active_signup', $active_signup ); // return "all", "none", "blog" or "user"
if ( is_super_admin() ) if ( is_super_admin() )
echo '<div class="mu_alert">' . sprintf( __( "Greetings Site Administrator! You are currently allowing '%s' registrations. To change or disable registration go to your <a href='wp-admin/ms-options.php'>Options page</a>." ), $active_signup ) . '</div>'; echo '<div class="mu_alert">' . sprintf( __( 'Greetings Site Administrator! You are currently allowing &#8220;%s&#8221; registrations. To change or disable registration go to your <a href="wp-admin/ms-options.php">Options page</a>.' ), $active_signup ) . '</div>';
$newblogname = isset($_GET['new']) ? strtolower(preg_replace('/^-|-$|[^-a-zA-Z0-9]/', '', $_GET['new'])) : null; $newblogname = isset($_GET['new']) ? strtolower(preg_replace('/^-|-$|[^-a-zA-Z0-9]/', '', $_GET['new'])) : null;
$current_user = wp_get_current_user(); $current_user = wp_get_current_user();
if ( $active_signup == "none" ) { if ( $active_signup == "none" ) {
_e( "Registration has been disabled." ); _e( 'Registration has been disabled.' );
} elseif ( $active_signup == 'blog' && !is_user_logged_in() ) { } elseif ( $active_signup == 'blog' && !is_user_logged_in() ) {
if ( is_ssl() ) if ( is_ssl() )
$proto = 'https://'; $proto = 'https://';
else else
$proto = 'http://'; $proto = 'http://';
$login_url = site_url( 'wp-login.php?redirect_to=' . urlencode($proto . $_SERVER['HTTP_HOST'] . '/wp-signup.php' )); $login_url = site_url( 'wp-login.php?redirect_to=' . urlencode($proto . $_SERVER['HTTP_HOST'] . '/wp-signup.php' ));
echo sprintf( __( "You must first <a href=\"%s\">login</a>, and then you can create a new site."), $login_url ); echo sprintf( __( 'You must first <a href="%s">log in</a>, and then you can create a new site.' ), $login_url );
} else { } else {
$stage = isset( $_POST['stage'] ) ? $_POST['stage'] : 'default'; $stage = isset( $_POST['stage'] ) ? $_POST['stage'] : 'default';
switch ( $stage ) { switch ( $stage ) {
@ -404,13 +404,13 @@ if ( $active_signup == "none" ) {
if ( $active_signup == 'all' || $_POST[ 'signup_for' ] == 'blog' && $active_signup == 'blog' || $_POST[ 'signup_for' ] == 'user' && $active_signup == 'user' ) if ( $active_signup == 'all' || $_POST[ 'signup_for' ] == 'blog' && $active_signup == 'blog' || $_POST[ 'signup_for' ] == 'user' && $active_signup == 'user' )
validate_user_signup(); validate_user_signup();
else else
_e( "User registration has been disabled." ); _e( 'User registration has been disabled.' );
break; break;
case 'validate-blog-signup': case 'validate-blog-signup':
if ( $active_signup == 'all' || $active_signup == 'blog' ) if ( $active_signup == 'all' || $active_signup == 'blog' )
validate_blog_signup(); validate_blog_signup();
else else
_e( "Site registration has been disabled." ); _e( 'Site registration has been disabled.' );
break; break;
case 'gimmeanotherblog': case 'gimmeanotherblog':
validate_another_blog_signup(); validate_another_blog_signup();
@ -424,9 +424,9 @@ if ( $active_signup == "none" ) {
elseif ( is_user_logged_in() == false && ( $active_signup == 'all' || $active_signup == 'user' ) ) elseif ( is_user_logged_in() == false && ( $active_signup == 'all' || $active_signup == 'user' ) )
signup_user( $newblogname, $user_email ); signup_user( $newblogname, $user_email );
elseif ( is_user_logged_in() == false && ( $active_signup == 'blog' ) ) elseif ( is_user_logged_in() == false && ( $active_signup == 'blog' ) )
_e( "I'm sorry. We're not accepting new registrations at this time." ); _e( 'We are sorry. We are not accepting new registrations at this time.' );
else else
_e( "You're logged in already. No need to register again!" ); _e( 'You are logged in already. No need to register again!' );
if ($newblogname) { if ($newblogname) {
if ( !is_subdomain_install() ) if ( !is_subdomain_install() )
@ -434,9 +434,9 @@ if ( $active_signup == "none" ) {
else else
$newblog = 'http://' . $newblogname . '.' . $current_site->domain . $current_site->path; $newblog = 'http://' . $newblogname . '.' . $current_site->domain . $current_site->path;
if ( $active_signup == 'blog' || $active_signup == 'all' ) if ( $active_signup == 'blog' || $active_signup == 'all' )
printf(__("<p><em>The site you were looking for, <strong>%s</strong> doesn't exist but you can create it now!</em></p>"), $newblog ); printf( __( '<p><em>The site you were looking for, <strong>%s</strong> does not exist, but you can create it now!</em></p>' ), $newblog );
else else
printf(__("<p><em>The site you were looking for, <strong>%s</strong> doesn't exist.</em></p>"), $newblog ); printf( __( '<p><em>The site you were looking for, <strong>%s</strong>, does not exist.</em></p>' ), $newblog );
} }
break; break;
} }