-
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index dedf053d63..192c48aa83 100644
a
|
b
|
|
314 | 314 | <exclude-pattern>/tests/phpunit/tests/*</exclude-pattern> |
315 | 315 | </rule> |
316 | 316 | |
317 | | <!-- Exclude some old classes that can't be renamed, as it would break back compat. --> |
| 317 | <!-- Exclude some old classes that can not be renamed, as it would break back compat. --> |
318 | 318 | <rule ref="PEAR.NamingConventions.ValidClassName.Invalid"> |
319 | 319 | <exclude-pattern>/src/wp-admin/includes/class-wp-filesystem-ftpsockets\.php</exclude-pattern> |
320 | 320 | <exclude-pattern>/src/wp-includes/class-wp-oembed\.php</exclude-pattern> |
-
diff --git a/src/readme.html b/src/readme.html
index e246fb641e..06c54919c7 100644
a
|
b
|
|
13 | 13 | <p style="text-align: center">Semantic Personal Publishing Platform</p> |
14 | 14 | |
15 | 15 | <h2>First Things First</h2> |
16 | | <p>Welcome. WordPress is a very special project to me. Every developer and contributor adds something unique to the mix, and together we create something beautiful that I’m proud to be a part of. Thousands of hours have gone into WordPress, and we’re dedicated to making it better every day. Thank you for making it part of your world.</p> |
| 16 | <p>Welcome. WordPress is a very special project to me. Every developer and contributor adds something unique to the mix, and together we create something beautiful that I am proud to be a part of. Thousands of hours have gone into WordPress, and we are dedicated to making it better every day. Thank you for making it part of your world.</p> |
17 | 17 | <p style="text-align: right">— Matt Mullenweg</p> |
18 | 18 | |
19 | 19 | <h2>Installation: Famous 5-minute install</h2> |
… |
… |
|
21 | 21 | <li>Unzip the package in an empty directory and upload everything.</li> |
22 | 22 | <li>Open <span class="file"><a href="wp-admin/install.php">wp-admin/install.php</a></span> in your browser. It will take you through the process to set up a <code>wp-config.php</code> file with your database connection details. |
23 | 23 | <ol> |
24 | | <li>If for some reason this doesn’t work, don’t worry. It doesn’t work on all web hosts. Open up <code>wp-config-sample.php</code> with a text editor like WordPad or similar and fill in your database connection details.</li> |
| 24 | <li>If for some reason this does not work, do not worry. It does not work on all web hosts. Open up <code>wp-config-sample.php</code> with a text editor like WordPad or similar and fill in your database connection details.</li> |
25 | 25 | <li>Save the file as <code>wp-config.php</code> and upload it.</li> |
26 | 26 | <li>Open <span class="file"><a href="wp-admin/install.php">wp-admin/install.php</a></span> in your browser.</li> |
27 | 27 | </ol> |
… |
… |
|
65 | 65 | </ul> |
66 | 66 | |
67 | 67 | <h2>Online Resources</h2> |
68 | | <p>If you have any questions that aren’t addressed in this document, please take advantage of WordPress’ numerous online resources:</p> |
| 68 | <p>If you have any questions that are not addressed in this document, please take advantage of WordPress’ numerous online resources:</p> |
69 | 69 | <dl> |
70 | 70 | <dt><a href="https://codex.wordpress.org/">The WordPress Codex</a></dt> |
71 | 71 | <dd>The Codex is the encyclopedia of all things WordPress. It is the most comprehensive source of information for WordPress available.</dd> |
… |
… |
|
74 | 74 | <dt><a href="https://planet.wordpress.org/">WordPress Planet</a></dt> |
75 | 75 | <dd>The WordPress Planet is a news aggregator that brings together posts from WordPress blogs around the web.</dd> |
76 | 76 | <dt><a href="https://wordpress.org/support/forums/">WordPress Support Forums</a></dt> |
77 | | <dd>If you’ve looked everywhere and still can’t find an answer, the support forums are very active and have a large community ready to help. To help them help you be sure to use a descriptive thread title and describe your question in as much detail as possible.</dd> |
| 77 | <dd>If you’ve looked everywhere and still can not find an answer, the support forums are very active and have a large community ready to help. To help them help you be sure to use a descriptive thread title and describe your question in as much detail as possible.</dd> |
78 | 78 | <dt><a href="https://make.wordpress.org/support/handbook/appendix/other-support-locations/introduction-to-irc/">WordPress <abbr>IRC</abbr> (Internet Relay Chat) Channel</a></dt> |
79 | 79 | <dd>There is an online chat channel that is used for discussion among people who use WordPress and occasionally support topics. The above wiki page should point you in the right direction. (<a href="https://web.libera.chat/#wordpress">irc.libera.chat #wordpress</a>)</dd> |
80 | 80 | </dl> |
-
diff --git a/src/wp-admin/comment.php b/src/wp-admin/comment.php
index 4c09a6085e..7eb0699596 100644
a
|
b
|
if ( isset( $_REQUEST['c'] ) ) { |
43 | 43 | // Prevent actions on a comment associated with a trashed post. |
44 | 44 | if ( $comment && 'trash' === get_post_status( $comment->comment_post_ID ) ) { |
45 | 45 | wp_die( |
46 | | __( 'You can’t edit this comment because the associated post is in the Trash. Please restore the post first, then try again.' ) |
| 46 | __( 'You can not edit this comment because the associated post is in the Trash. Please restore the post first, then try again.' ) |
47 | 47 | ); |
48 | 48 | } |
49 | 49 | } else { |
-
diff --git a/src/wp-admin/edit-form-advanced.php b/src/wp-admin/edit-form-advanced.php
index 6a57dda7f9..42f0d49cc4 100644
a
|
b
|
if ( 'post' === $post_type ) { |
297 | 297 | $title_and_editor .= '<p>' . __( 'You can enable distraction-free writing mode using the icon to the right. This feature is not available for old browsers or devices with small screens, and requires that the full-height editor be enabled in Screen Options.' ) . '</p>'; |
298 | 298 | $title_and_editor .= '<p>' . sprintf( |
299 | 299 | /* translators: %s: Alt + F10 */ |
300 | | __( 'Keyboard users: When you’re working in the visual editor, you can use %s to access the toolbar.' ), |
| 300 | __( 'Keyboard users: When you are working in the visual editor, you can use %s to access the toolbar.' ), |
301 | 301 | '<kbd>Alt + F10</kbd>' |
302 | 302 | ) . '</p>'; |
303 | 303 | |
… |
… |
if ( isset( $post_new_file ) && current_user_can( $post_type_object->cap->create |
447 | 447 | <div id="message" class="updated notice notice-success is-dismissible"><p><?php echo $message; ?></p></div> |
448 | 448 | <?php endif; ?> |
449 | 449 | <div id="lost-connection-notice" class="error hidden"> |
450 | | <p><span class="spinner"></span> <?php _e( '<strong>Connection lost.</strong> Saving has been disabled until you’re reconnected.' ); ?> |
451 | | <span class="hide-if-no-sessionstorage"><?php _e( 'We’re backing up this post in your browser, just in case.' ); ?></span> |
| 450 | <p><span class="spinner"></span> <?php _e( '<strong>Connection lost.</strong> Saving has been disabled until you are reconnected.' ); ?> |
| 451 | <span class="hide-if-no-sessionstorage"><?php _e( 'We are backing up this post in your browser, just in case.' ); ?></span> |
452 | 452 | </p> |
453 | 453 | </div> |
454 | 454 | <form name="post" action="post.php" method="post" id="post" |
-
diff --git a/src/wp-admin/edit-link-form.php b/src/wp-admin/edit-link-form.php
index 93a872aa61..d99eda00e4 100644
a
|
b
|
get_current_screen()->add_help_tab( |
66 | 66 | 'title' => __( 'Overview' ), |
67 | 67 | 'content' => |
68 | 68 | '<p>' . __( 'You can add or edit links on this screen by entering information in each of the boxes. Only the link’s web address and name (the text you want to display on your site as the link) are required fields.' ) . '</p>' . |
69 | | '<p>' . __( 'The boxes for link name, web address, and description have fixed positions, while the others may be repositioned using drag and drop. You can also hide boxes you don’t use in the Screen Options tab, or minimize boxes by clicking on the title bar of the box.' ) . '</p>' . |
| 69 | '<p>' . __( 'The boxes for link name, web address, and description have fixed positions, while the others may be repositioned using drag and drop. You can also hide boxes you do not use in the Screen Options tab, or minimize boxes by clicking on the title bar of the box.' ) . '</p>' . |
70 | 70 | '<p>' . __( 'XFN stands for <a href="https://gmpg.org/xfn/">XHTML Friends Network</a>, which is optional. WordPress allows the generation of XFN attributes to show how you are related to the authors/owners of the site to which you are linking.' ) . '</p>', |
71 | 71 | ) |
72 | 72 | ); |
… |
… |
wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false ); |
122 | 122 | <h2 class="postbox-header"><label for="link_url"><?php _e( 'Web Address' ); ?></label></h2> |
123 | 123 | <div class="inside"> |
124 | 124 | <input type="text" name="link_url" size="30" maxlength="255" class="code" value="<?php echo esc_attr( $link->link_url ); ?>" id="link_url" /> |
125 | | <p><?php _e( 'Example: <code>https://wordpress.org/</code> — don’t forget the <code>https://</code>' ); ?></p> |
| 125 | <p><?php _e( 'Example: <code>https://wordpress.org/</code> — do not forget the <code>https://</code>' ); ?></p> |
126 | 126 | </div> |
127 | 127 | </div> |
128 | 128 | |
-
diff --git a/src/wp-admin/edit-tags.php b/src/wp-admin/edit-tags.php
index f95eba68c5..8e169f5155 100644
a
|
b
|
switch ( $wp_list_table->current_action() ) { |
157 | 157 | $term = get_term( $term_id ); |
158 | 158 | |
159 | 159 | if ( ! $term instanceof WP_Term ) { |
160 | | wp_die( __( 'You attempted to edit an item that doesn’t exist. Perhaps it was deleted?' ) ); |
| 160 | wp_die( __( 'You attempted to edit an item that does not exist. Perhaps it was deleted?' ) ); |
161 | 161 | } |
162 | 162 | |
163 | 163 | wp_redirect( esc_url_raw( get_edit_term_link( $term_id, $taxonomy, $post_type ) ) ); |
… |
… |
switch ( $wp_list_table->current_action() ) { |
177 | 177 | |
178 | 178 | $tag = get_term( $tag_ID, $taxonomy ); |
179 | 179 | if ( ! $tag ) { |
180 | | wp_die( __( 'You attempted to edit an item that doesn’t exist. Perhaps it was deleted?' ) ); |
| 180 | wp_die( __( 'You attempted to edit an item that does not exist. Perhaps it was deleted?' ) ); |
181 | 181 | } |
182 | 182 | |
183 | 183 | $ret = wp_update_term( $tag_ID, $taxonomy, $_POST ); |
… |
… |
if ( 'category' === $taxonomy || 'link_category' === $taxonomy || 'post_tag' === |
253 | 253 | } elseif ( 'link_category' === $taxonomy ) { |
254 | 254 | $help = '<p>' . __( 'You can create groups of links by using Link Categories. Link Category names must be unique and Link Categories are separate from the categories you use for posts.' ) . '</p>'; |
255 | 255 | } else { |
256 | | $help = '<p>' . __( 'You can assign keywords to your posts using <strong>tags</strong>. Unlike categories, tags have no hierarchy, meaning there’s no relationship from one tag to another.' ) . '</p>'; |
| 256 | $help = '<p>' . __( 'You can assign keywords to your posts using <strong>tags</strong>. Unlike categories, tags have no hierarchy, meaning there is no relationship from one tag to another.' ) . '</p>'; |
257 | 257 | } |
258 | 258 | |
259 | 259 | if ( 'link_category' === $taxonomy ) { |
-
diff --git a/src/wp-admin/freedoms.php b/src/wp-admin/freedoms.php
index 0a2d6ca241..815a9894cc 100644
a
|
b
|
require_once ABSPATH . 'wp-admin/admin-header.php'; |
84 | 84 | <?php |
85 | 85 | printf( |
86 | 86 | /* translators: %s: https://wordpressfoundation.org/trademark-policy/ */ |
87 | | __( 'WordPress grows when people like you tell their friends about it, and the thousands of businesses and services that are built on and around WordPress share that fact with their users. We’re flattered every time someone spreads the good word, just make sure to <a href="%s">check out our trademark guidelines</a> first.' ), |
| 87 | __( 'WordPress grows when people like you tell their friends about it, and the thousands of businesses and services that are built on and around WordPress share that fact with their users. We are flattered every time someone spreads the good word, just make sure to <a href="%s">check out our trademark guidelines</a> first.' ), |
88 | 88 | 'https://wordpressfoundation.org/trademark-policy/' |
89 | 89 | ); |
90 | 90 | ?> |
… |
… |
require_once ABSPATH . 'wp-admin/admin-header.php'; |
96 | 96 | $themes_url = current_user_can( 'switch_themes' ) ? admin_url( 'themes.php' ) : __( 'https://wordpress.org/themes/' ); |
97 | 97 | printf( |
98 | 98 | /* translators: 1: URL to Plugins screen, 2: URL to Themes screen, 3: https://wordpress.org/about/license/ */ |
99 | | __( 'Every plugin and theme in WordPress.org’s directory is 100%% GPL or a similarly free and compatible license, so you can feel safe finding <a href="%1$s">plugins</a> and <a href="%2$s">themes</a> there. If you get a plugin or theme from another source, make sure to <a href="%3$s">ask them if it’s GPL</a> first. If they don’t respect the WordPress license, we don’t recommend them.' ), |
| 99 | __( 'Every plugin and theme in WordPress.org’s directory is 100%% GPL or a similarly free and compatible license, so you can feel safe finding <a href="%1$s">plugins</a> and <a href="%2$s">themes</a> there. If you get a plugin or theme from another source, make sure to <a href="%3$s">ask them if it’s GPL</a> first. If they do not respect the WordPress license, we do not recommend them.' ), |
100 | 100 | $plugins_url, |
101 | 101 | $themes_url, |
102 | 102 | __( 'https://wordpress.org/about/license/' ) |
… |
… |
require_once ABSPATH . 'wp-admin/admin-header.php'; |
104 | 104 | ?> |
105 | 105 | </p> |
106 | 106 | |
107 | | <p><?php _e( 'Don’t you wish all software came with these freedoms? So do we! For more information, check out the <a href="https://www.fsf.org/">Free Software Foundation</a>.' ); ?></p> |
| 107 | <p><?php _e( 'Do you wish all software came with these freedoms? We do! For more information, check out the <a href="https://www.fsf.org/">Free Software Foundation</a>.' ); ?></p> |
108 | 108 | </div> |
109 | 109 | </div> |
110 | 110 | |
-
diff --git a/src/wp-admin/includes/ajax-actions.php b/src/wp-admin/includes/ajax-actions.php
index 1ba480f2f1..ddc5284f9c 100644
a
|
b
|
function wp_ajax_replyto_comment( $action ) { |
1271 | 1271 | if ( empty( $post->post_status ) ) { |
1272 | 1272 | wp_die( 1 ); |
1273 | 1273 | } elseif ( in_array( $post->post_status, array( 'draft', 'pending', 'trash' ), true ) ) { |
1274 | | wp_die( __( 'Error: You can’t reply to a comment on a draft post.' ) ); |
| 1274 | wp_die( __( 'Error: You can not reply to a comment on a draft post.' ) ); |
1275 | 1275 | } |
1276 | 1276 | |
1277 | 1277 | $user = wp_get_current_user(); |
-
diff --git a/src/wp-admin/includes/class-custom-background.php b/src/wp-admin/includes/class-custom-background.php
index a4ca32f4df..641d89eb9e 100644
a
|
b
|
class Custom_Background { |
90 | 90 | '<p>' . __( 'You can customize the look of your site without touching any of your theme’s code by using a custom background. Your background can be an image or a color.' ) . '</p>' . |
91 | 91 | '<p>' . __( 'To use a background image, simply upload it or choose an image that has already been uploaded to your Media Library by clicking the “Choose Image” button. You can display a single instance of your image, or tile it to fill the screen. You can have your background fixed in place, so your site content moves on top of it, or you can have it scroll with your site.' ) . '</p>' . |
92 | 92 | '<p>' . __( 'You can also choose a background color by clicking the Select Color button and either typing in a legitimate HTML hex value, e.g. “#ff0000” for red, or by choosing a color using the color picker.' ) . '</p>' . |
93 | | '<p>' . __( 'Don’t forget to click on the Save Changes button when you are finished.' ) . '</p>', |
| 93 | '<p>' . __( 'Do not forget to click on the Save Changes button when you are finished.' ) . '</p>', |
94 | 94 | ) |
95 | 95 | ); |
96 | 96 | |
-
diff --git a/src/wp-admin/includes/class-custom-image-header.php b/src/wp-admin/includes/class-custom-image-header.php
index 68fc78797d..14862a0286 100644
a
|
b
|
class Custom_Image_Header { |
109 | 109 | 'title' => __( 'Header Image' ), |
110 | 110 | 'content' => |
111 | 111 | '<p>' . __( 'You can set a custom image header for your site. Simply upload the image and crop it, and the new header will go live immediately. Alternatively, you can use an image that has already been uploaded to your Media Library by clicking the “Choose Image” button.' ) . '</p>' . |
112 | | '<p>' . __( 'Some themes come with additional header images bundled. If you see multiple images displayed, select the one you’d like and click the “Save Changes” button.' ) . '</p>' . |
| 112 | '<p>' . __( 'Some themes come with additional header images bundled. If you see multiple images displayed, select the one you would like and click the “Save Changes” button.' ) . '</p>' . |
113 | 113 | '<p>' . __( 'If your theme has more than one default header image, or you have uploaded more than one custom header image, you have the option of having WordPress display a randomly different image on each page of your site. Click the “Random” radio button next to the Uploaded Images or Default Images section to enable this feature.' ) . '</p>' . |
114 | | '<p>' . __( 'If you don’t want a header image to be displayed on your site at all, click the “Remove Header Image” button at the bottom of the Header Image section of this page. If you want to re-enable the header image later, you just have to select one of the other image options and click “Save Changes”.' ) . '</p>', |
| 114 | '<p>' . __( 'If you do not want a header image to be displayed on your site at all, click the “Remove Header Image” button at the bottom of the Header Image section of this page. If you want to re-enable the header image later, you just have to select one of the other image options and click “Save Changes”.' ) . '</p>', |
115 | 115 | ) |
116 | 116 | ); |
117 | 117 | |
… |
… |
class Custom_Image_Header { |
127 | 127 | ) . |
128 | 128 | '</p>' . |
129 | 129 | '<p>' . __( 'In the Header Text section of this page, you can choose whether to display this text or hide it. You can also choose a color for the text by clicking the Select Color button and either typing in a legitimate HTML hex value, e.g. “#ff0000” for red, or by choosing a color using the color picker.' ) . '</p>' . |
130 | | '<p>' . __( 'Don’t forget to click “Save Changes” when you’re done!' ) . '</p>', |
| 130 | '<p>' . __( 'Do not forget to click “Save Changes” when you are done!' ) . '</p>', |
131 | 131 | ) |
132 | 132 | ); |
133 | 133 | |
-
diff --git a/src/wp-admin/includes/class-ftp-sockets.php b/src/wp-admin/includes/class-ftp-sockets.php
index 6d802f5f8d..741fae4e88 100644
a
|
b
|
class ftp_sockets extends ftp_base { |
139 | 139 | else $this->_ftp_temp_sock=$this->_ftp_data_sock; |
140 | 140 | } else { |
141 | 141 | if(!@socket_getsockname($this->_ftp_control_sock, $addr, $port)) { |
142 | | $this->PushError("_data_prepare","can't get control socket information", socket_strerror(socket_last_error($this->_ftp_control_sock))); |
| 142 | $this->PushError("_data_prepare","can not get control socket information", socket_strerror(socket_last_error($this->_ftp_control_sock))); |
143 | 143 | $this->_data_close(); |
144 | 144 | return FALSE; |
145 | 145 | } |
146 | 146 | if(!@socket_bind($this->_ftp_data_sock,$addr)){ |
147 | | $this->PushError("_data_prepare","can't bind data socket", socket_strerror(socket_last_error($this->_ftp_data_sock))); |
| 147 | $this->PushError("_data_prepare","can not bind data socket", socket_strerror(socket_last_error($this->_ftp_data_sock))); |
148 | 148 | $this->_data_close(); |
149 | 149 | return FALSE; |
150 | 150 | } |
151 | 151 | if(!@socket_listen($this->_ftp_data_sock)) { |
152 | | $this->PushError("_data_prepare","can't listen data socket", socket_strerror(socket_last_error($this->_ftp_data_sock))); |
| 152 | $this->PushError("_data_prepare","can not listen data socket", socket_strerror(socket_last_error($this->_ftp_data_sock))); |
153 | 153 | $this->_data_close(); |
154 | 154 | return FALSE; |
155 | 155 | } |
156 | 156 | if(!@socket_getsockname($this->_ftp_data_sock, $this->_datahost, $this->_dataport)) { |
157 | | $this->PushError("_data_prepare","can't get data socket information", socket_strerror(socket_last_error($this->_ftp_data_sock))); |
| 157 | $this->PushError("_data_prepare","can not get data socket information", socket_strerror(socket_last_error($this->_ftp_data_sock))); |
158 | 158 | $this->_data_close(); |
159 | 159 | return FALSE; |
160 | 160 | } |
-
diff --git a/src/wp-admin/includes/class-ftp.php b/src/wp-admin/includes/class-ftp.php
index cb8a033631..a468c6a09e 100644
a
|
b
|
class ftp_base { |
334 | 334 | } while($this->_code<200); |
335 | 335 | $this->_ready=true; |
336 | 336 | $syst=$this->systype(); |
337 | | if(!$syst) $this->SendMSG("Can't detect remote OS"); |
| 337 | if(!$syst) $this->SendMSG("Can not detect remote OS"); |
338 | 338 | else { |
339 | 339 | if(preg_match("/win|dos|novell/i", $syst[0])) $this->OS_remote=FTP_OS_Windows; |
340 | 340 | elseif(preg_match("/os/i", $syst[0])) $this->OS_remote=FTP_OS_Mac; |
… |
… |
class ftp_base { |
342 | 342 | else $this->OS_remote=FTP_OS_Mac; |
343 | 343 | $this->SendMSG("Remote OS: ".$this->OS_FullName[$this->OS_remote]); |
344 | 344 | } |
345 | | if(!$this->features()) $this->SendMSG("Can't get features list. All supported - disabled"); |
| 345 | if(!$this->features()) $this->SendMSG("Can not get features list. All supported - disabled"); |
346 | 346 | else $this->SendMSG("Supported features: ".implode(", ", array_keys($this->_features))); |
347 | 347 | return TRUE; |
348 | 348 | } |
… |
… |
class ftp_base { |
371 | 371 | } |
372 | 372 | $this->SendMSG("Authentication succeeded"); |
373 | 373 | if(empty($this->_features)) { |
374 | | if(!$this->features()) $this->SendMSG("Can't get features list. All supported - disabled"); |
| 374 | if(!$this->features()) $this->SendMSG("Can not get features list. All supported - disabled"); |
375 | 375 | else $this->SendMSG("Supported features: ".implode(", ", array_keys($this->_features))); |
376 | 376 | } |
377 | 377 | return TRUE; |
… |
… |
class ftp_base { |
480 | 480 | return FALSE; |
481 | 481 | } |
482 | 482 | if($this->_curtype!=FTP_BINARY) { |
483 | | $this->PushError("restore", "can't restore in ASCII mode"); |
| 483 | $this->PushError("restore", "can not restore in ASCII mode"); |
484 | 484 | return FALSE; |
485 | 485 | } |
486 | 486 | if(!$this->_exec("REST ".$from, "resore")) return FALSE; |
… |
… |
class ftp_base { |
553 | 553 | if (@file_exists($localfile)) $this->SendMSG("Warning : local file will be overwritten"); |
554 | 554 | $fp = @fopen($localfile, "w"); |
555 | 555 | if (!$fp) { |
556 | | $this->PushError("get","can't open local file", "Cannot create \"".$localfile."\""); |
| 556 | $this->PushError("get","can not open local file", "Cannot create \"".$localfile."\""); |
557 | 557 | return FALSE; |
558 | 558 | } |
559 | 559 | if($this->_can_restore and $rest!=0) fseek($fp, $rest); |
… |
… |
class ftp_base { |
610 | 610 | function put($localfile, $remotefile=NULL, $rest=0) { |
611 | 611 | if(is_null($remotefile)) $remotefile=$localfile; |
612 | 612 | if (!file_exists($localfile)) { |
613 | | $this->PushError("put","can't open local file", "No such file or directory \"".$localfile."\""); |
| 613 | $this->PushError("put","can not open local file", "No such file or directory \"".$localfile."\""); |
614 | 614 | return FALSE; |
615 | 615 | } |
616 | 616 | $fp = @fopen($localfile, "r"); |
617 | 617 | |
618 | 618 | if (!$fp) { |
619 | | $this->PushError("put","can't open local file", "Cannot read file \"".$localfile."\""); |
| 619 | $this->PushError("put","can not open local file", "Cannot read file \"".$localfile."\""); |
620 | 620 | return FALSE; |
621 | 621 | } |
622 | 622 | if($this->_can_restore and $rest!=0) fseek($fp, $rest); |
… |
… |
class ftp_base { |
649 | 649 | function mput($local=".", $remote=NULL, $continious=false) { |
650 | 650 | $local=realpath($local); |
651 | 651 | if(!@file_exists($local)) { |
652 | | $this->PushError("mput","can't open local folder", "Cannot stat folder \"".$local."\""); |
| 652 | $this->PushError("mput","can not open local folder", "Cannot stat folder \"".$local."\""); |
653 | 653 | return FALSE; |
654 | 654 | } |
655 | 655 | if(!is_dir($local)) return $this->put($local, $remote); |
… |
… |
class ftp_base { |
662 | 662 | } |
663 | 663 | closedir($handle); |
664 | 664 | } else { |
665 | | $this->PushError("mput","can't open local folder", "Cannot read folder \"".$local."\""); |
| 665 | $this->PushError("mput","can not open local folder", "Cannot read folder \"".$local."\""); |
666 | 666 | return FALSE; |
667 | 667 | } |
668 | 668 | if(empty($list)) return TRUE; |
… |
… |
class ftp_base { |
682 | 682 | function mget($remote, $local=".", $continious=false) { |
683 | 683 | $list=$this->rawlist($remote, "-lA"); |
684 | 684 | if($list===false) { |
685 | | $this->PushError("mget","can't read remote folder list", "Can't read remote folder \"".$remote."\" contents"); |
| 685 | $this->PushError("mget","can not read remote folder list", "Can not read remote folder \"".$remote."\" contents"); |
686 | 686 | return FALSE; |
687 | 687 | } |
688 | 688 | if(empty($list)) return true; |
689 | 689 | if(!@file_exists($local)) { |
690 | 690 | if(!@mkdir($local)) { |
691 | | $this->PushError("mget","can't create local folder", "Cannot create folder \"".$local."\""); |
| 691 | $this->PushError("mget","can not create local folder", "Cannot create folder \"".$local."\""); |
692 | 692 | return FALSE; |
693 | 693 | } |
694 | 694 | } |
… |
… |
class ftp_base { |
700 | 700 | foreach($list as $el) { |
701 | 701 | if($el["type"]=="d") { |
702 | 702 | if(!$this->mget($remote."/".$el["name"], $local."/".$el["name"], $continious)) { |
703 | | $this->PushError("mget", "can't copy folder", "Can't copy remote folder \"".$remote."/".$el["name"]."\" to local \"".$local."/".$el["name"]."\""); |
| 703 | $this->PushError("mget", "can not copy folder", "Can not copy remote folder \"".$remote."/".$el["name"]."\" to local \"".$local."/".$el["name"]."\""); |
704 | 704 | $ret=false; |
705 | 705 | if(!$continious) break; |
706 | 706 | } |
707 | 707 | } else { |
708 | 708 | if(!$this->get($remote."/".$el["name"], $local."/".$el["name"])) { |
709 | | $this->PushError("mget", "can't copy file", "Can't copy remote file \"".$remote."/".$el["name"]."\" to local \"".$local."/".$el["name"]."\""); |
| 709 | $this->PushError("mget", "can not copy file", "Can not copy remote file \"".$remote."/".$el["name"]."\" to local \"".$local."/".$el["name"]."\""); |
710 | 710 | $ret=false; |
711 | 711 | if(!$continious) break; |
712 | 712 | } |
… |
… |
class ftp_base { |
721 | 721 | function mdel($remote, $continious=false) { |
722 | 722 | $list=$this->rawlist($remote, "-la"); |
723 | 723 | if($list===false) { |
724 | | $this->PushError("mdel","can't read remote folder list", "Can't read remote folder \"".$remote."\" contents"); |
| 724 | $this->PushError("mdel","can not read remote folder list", "Can not read remote folder \"".$remote."\" contents"); |
725 | 725 | return false; |
726 | 726 | } |
727 | 727 | |
… |
… |
class ftp_base { |
742 | 742 | } |
743 | 743 | } else { |
744 | 744 | if (!$this->delete($remote."/".$el["name"])) { |
745 | | $this->PushError("mdel", "can't delete file", "Can't delete remote file \"".$remote."/".$el["name"]."\""); |
| 745 | $this->PushError("mdel", "can not delete file", "Can not delete remote file \"".$remote."/".$el["name"]."\""); |
746 | 746 | $ret=false; |
747 | 747 | if(!$continious) break; |
748 | 748 | } |
… |
… |
class ftp_base { |
750 | 750 | } |
751 | 751 | |
752 | 752 | if(!$this->rmdir($remote)) { |
753 | | $this->PushError("mdel", "can't delete folder", "Can't delete remote folder \"".$remote."/".$el["name"]."\""); |
| 753 | $this->PushError("mdel", "can not delete folder", "Can not delete remote folder \"".$remote."/".$el["name"]."\""); |
754 | 754 | $ret=false; |
755 | 755 | } |
756 | 756 | return $ret; |
… |
… |
class ftp_base { |
826 | 826 | function dirlist($remote) { |
827 | 827 | $list=$this->rawlist($remote, "-la"); |
828 | 828 | if($list===false) { |
829 | | $this->PushError("dirlist","can't read remote folder list", "Can't read remote folder \"".$remote."\" contents"); |
| 829 | $this->PushError("dirlist","can not read remote folder list", "Can not read remote folder \"".$remote."\" contents"); |
830 | 830 | return false; |
831 | 831 | } |
832 | 832 | |
-
diff --git a/src/wp-admin/includes/class-theme-upgrader.php b/src/wp-admin/includes/class-theme-upgrader.php
index 3a7beaf1fd..1086dda611 100644
a
|
b
|
class Theme_Upgrader extends WP_Upgrader { |
570 | 570 | $this->strings['incompatible_archive'], |
571 | 571 | sprintf( |
572 | 572 | /* translators: %s: style.css */ |
573 | | __( 'The %s stylesheet doesn’t contain a valid theme header.' ), |
| 573 | __( 'The %s stylesheet does not contain a valid theme header.' ), |
574 | 574 | '<code>style.css</code>' |
575 | 575 | ) |
576 | 576 | ); |
-
diff --git a/src/wp-admin/includes/class-wp-plugin-install-list-table.php b/src/wp-admin/includes/class-wp-plugin-install-list-table.php
index c214cd333b..bf1ebb9be5 100644
a
|
b
|
class WP_Plugin_Install_List_Table extends WP_List_Table { |
671 | 671 | if ( ! $compatible_php || ! $compatible_wp ) { |
672 | 672 | echo '<div class="notice inline notice-error notice-alt"><p>'; |
673 | 673 | if ( ! $compatible_php && ! $compatible_wp ) { |
674 | | _e( 'This plugin doesn’t work with your versions of WordPress and PHP.' ); |
| 674 | _e( 'This plugin does not work with your versions of WordPress and PHP.' ); |
675 | 675 | if ( current_user_can( 'update_core' ) && current_user_can( 'update_php' ) ) { |
676 | 676 | printf( |
677 | 677 | /* translators: 1: URL to WordPress Updates screen, 2: URL to Update PHP page. */ |
… |
… |
class WP_Plugin_Install_List_Table extends WP_List_Table { |
695 | 695 | wp_update_php_annotation( '</p><p><em>', '</em>' ); |
696 | 696 | } |
697 | 697 | } elseif ( ! $compatible_wp ) { |
698 | | _e( 'This plugin doesn’t work with your version of WordPress.' ); |
| 698 | _e( 'This plugin does not work with your version of WordPress.' ); |
699 | 699 | if ( current_user_can( 'update_core' ) ) { |
700 | 700 | printf( |
701 | 701 | /* translators: %s: URL to WordPress Updates screen. */ |
… |
… |
class WP_Plugin_Install_List_Table extends WP_List_Table { |
704 | 704 | ); |
705 | 705 | } |
706 | 706 | } elseif ( ! $compatible_php ) { |
707 | | _e( 'This plugin doesn’t work with your version of PHP.' ); |
| 707 | _e( 'This plugin does not work with your version of PHP.' ); |
708 | 708 | if ( current_user_can( 'update_php' ) ) { |
709 | 709 | printf( |
710 | 710 | /* translators: %s: URL to Update PHP page. */ |
-
diff --git a/src/wp-admin/includes/class-wp-site-health-auto-updates.php b/src/wp-admin/includes/class-wp-site-health-auto-updates.php
index ebc3547165..65d82501b7 100644
a
|
b
|
class WP_Site_Health_Auto_Updates { |
292 | 292 | } |
293 | 293 | |
294 | 294 | return array( |
295 | | 'description' => __( "Your installation of WordPress doesn't require FTP credentials to perform updates." ), |
| 295 | 'description' => __( "Your installation of WordPress does not require FTP credentials to perform updates." ), |
296 | 296 | 'severity' => 'pass', |
297 | 297 | ); |
298 | 298 | } |
-
diff --git a/src/wp-admin/includes/class-wp-site-health.php b/src/wp-admin/includes/class-wp-site-health.php
index 20b2f0e469..79e250f263 100644
a
|
b
|
class WP_Site_Health { |
467 | 467 | ), |
468 | 468 | $unused_plugins |
469 | 469 | ), |
470 | | __( 'Inactive plugins are tempting targets for attackers. If you’re not going to use a plugin, you should consider removing it.' ) |
| 470 | __( 'Inactive plugins are tempting targets for attackers. If you are not going to use a plugin, you should consider removing it.' ) |
471 | 471 | ); |
472 | 472 | |
473 | 473 | $result['actions'] .= sprintf( |
… |
… |
class WP_Site_Health { |
634 | 634 | ), |
635 | 635 | sprintf( |
636 | 636 | /* translators: 1: The currently active theme. 2: The active theme's parent theme. */ |
637 | | __( 'To enhance your site’s security, you should consider removing any themes you’re not using. You should keep your current theme, %1$s, and %2$s, its parent theme.' ), |
| 637 | __( 'To enhance your site’s security, you should consider removing any themes you are not using. You should keep your current theme, %1$s, and %2$s, its parent theme.' ), |
638 | 638 | $active_theme->name, |
639 | 639 | $active_theme->parent()->name |
640 | 640 | ) |
… |
… |
class WP_Site_Health { |
653 | 653 | ), |
654 | 654 | sprintf( |
655 | 655 | /* translators: 1: The default theme for WordPress. 2: The currently active theme. 3: The active theme's parent theme. */ |
656 | | __( 'To enhance your site’s security, you should consider removing any themes you’re not using. You should keep %1$s, the default WordPress theme, %2$s, your current theme, and %3$s, its parent theme.' ), |
| 656 | __( 'To enhance your site’s security, you should consider removing any themes you are not using. You should keep %1$s, the default WordPress theme, %2$s, your current theme, and %3$s, its parent theme.' ), |
657 | 657 | $default_theme ? $default_theme->name : WP_DEFAULT_THEME, |
658 | 658 | $active_theme->name, |
659 | 659 | $active_theme->parent()->name |
-
diff --git a/src/wp-admin/includes/dashboard.php b/src/wp-admin/includes/dashboard.php
index 1b70f65879..74f87da717 100644
a
|
b
|
function wp_print_community_events_templates() { |
1414 | 1414 | * that they match the expected location before including them. |
1415 | 1415 | * Use endonyms (native locale names) whenever possible. |
1416 | 1416 | */ |
1417 | | __( 'We couldn’t locate %s. Please try another nearby city. For example: Kansas City; Springfield; Portland.' ), |
| 1417 | __( 'We could not locate %s. Please try another nearby city. For example: Kansas City; Springfield; Portland.' ), |
1418 | 1418 | '<em>{{data.unknownCity}}</em>' |
1419 | 1419 | ); |
1420 | 1420 | ?> |
… |
… |
function wp_print_community_events_templates() { |
1462 | 1462 | <?php |
1463 | 1463 | printf( |
1464 | 1464 | /* translators: 1: The city the user searched for, 2: Meetup organization documentation URL. */ |
1465 | | __( 'There aren’t any events scheduled near %1$s at the moment. Would you like to <a href="%2$s">organize a WordPress event</a>?' ), |
| 1465 | __( 'There are not any events scheduled near %1$s at the moment. Would you like to <a href="%2$s">organize a WordPress event</a>?' ), |
1466 | 1466 | '{{ data.location.description }}', |
1467 | 1467 | __( 'https://make.wordpress.org/community/handbook/meetup-organizer/welcome/' ) |
1468 | 1468 | ); |
… |
… |
function wp_print_community_events_templates() { |
1472 | 1472 | <?php |
1473 | 1473 | printf( |
1474 | 1474 | /* translators: %s: Meetup organization documentation URL. */ |
1475 | | __( 'There aren’t any events scheduled near you at the moment. Would you like to <a href="%s">organize a WordPress event</a>?' ), |
| 1475 | __( 'There are not any events scheduled near you at the moment. Would you like to <a href="%s">organize a WordPress event</a>?' ), |
1476 | 1476 | __( 'https://make.wordpress.org/community/handbook/meetup-organizer/welcome/' ) |
1477 | 1477 | ); |
1478 | 1478 | ?> |
-
diff --git a/src/wp-admin/includes/file.php b/src/wp-admin/includes/file.php
index 8a28c63adc..1b5fb9a9c9 100644
a
|
b
|
function validate_file_to_edit( $file, $allowed_files = array() ) { |
715 | 715 | wp_die( __( 'Sorry, that file cannot be edited.' ) ); |
716 | 716 | |
717 | 717 | // case 2 : |
718 | | // wp_die( __('Sorry, can’t call files with their real path.' )); |
| 718 | // wp_die( __('Sorry, can not call files with their real path.' )); |
719 | 719 | |
720 | 720 | case 3: |
721 | 721 | wp_die( __( 'Sorry, that file cannot be edited.' ) ); |
-
diff --git a/src/wp-admin/includes/meta-boxes.php b/src/wp-admin/includes/meta-boxes.php
index c14ae52ddc..80f24aba21 100644
a
|
b
|
function post_submit_meta_box( $post, $args = array() ) { |
287 | 287 | <?php |
288 | 288 | printf( |
289 | 289 | /* translators: %s: URL to the Customizer. */ |
290 | | __( 'This draft comes from your <a href="%s">unpublished customization changes</a>. You can edit, but there’s no need to publish now. It will be published automatically with those changes.' ), |
| 290 | __( 'This draft comes from your <a href="%s">unpublished customization changes</a>. You can edit, but there is no need to publish now. It will be published automatically with those changes.' ), |
291 | 291 | esc_url( |
292 | 292 | add_query_arg( |
293 | 293 | 'changeset_uuid', |
-
diff --git a/src/wp-admin/includes/template.php b/src/wp-admin/includes/template.php
index 4228d931ba..9056faf457 100644
a
|
b
|
function wp_terms_checklist( $post_id = 0, $args = array() ) { |
195 | 195 | * |
196 | 196 | * If the $echo argument is true then the elements for a list of checkbox |
197 | 197 | * `<input>` elements labelled with the names of the selected terms is output. |
198 | | * If the $post_ID global isn't empty then the terms associated with that |
| 198 | * If the $post_ID global is not empty then the terms associated with that |
199 | 199 | * post will be marked as checked. |
200 | 200 | * |
201 | 201 | * @since 2.5.0 |
… |
… |
function do_block_editor_incompatible_meta_box( $object, $box ) { |
1140 | 1140 | echo '<p>'; |
1141 | 1141 | if ( $plugin ) { |
1142 | 1142 | /* translators: %s: The name of the plugin that generated this meta box. */ |
1143 | | printf( __( "This meta box, from the %s plugin, isn't compatible with the block editor." ), "<strong>{$plugin['Name']}</strong>" ); |
| 1143 | printf( __( "This meta box, from the %s plugin, is not compatible with the block editor." ), "<strong>{$plugin['Name']}</strong>" ); |
1144 | 1144 | } else { |
1145 | | _e( "This meta box isn't compatible with the block editor." ); |
| 1145 | _e( "This meta box is not compatible with the block editor." ); |
1146 | 1146 | } |
1147 | 1147 | echo '</p>'; |
1148 | 1148 | |
… |
… |
function do_meta_boxes( $screen, $context, $object ) { |
1384 | 1384 | <p> |
1385 | 1385 | <?php |
1386 | 1386 | /* translators: %s: The name of the plugin that generated this meta box. */ |
1387 | | printf( __( "This meta box, from the %s plugin, isn't compatible with the block editor." ), "<strong>{$plugin['Name']}</strong>" ); |
| 1387 | printf( __( "This meta box, from the %s plugin, is not compatible with the block editor." ), "<strong>{$plugin['Name']}</strong>" ); |
1388 | 1388 | ?> |
1389 | 1389 | </p> |
1390 | 1390 | </div> |
-
diff --git a/src/wp-admin/includes/theme.php b/src/wp-admin/includes/theme.php
index 153c319656..e2dbac5882 100644
a
|
b
|
function customize_themes_print_templates() { |
869 | 869 | <?php |
870 | 870 | printf( |
871 | 871 | /* translators: %s: Theme name. */ |
872 | | __( 'There is a new version of %s available, but it doesn’t work with your versions of WordPress and PHP.' ), |
| 872 | __( 'There is a new version of %s available, but it does not work with your versions of WordPress and PHP.' ), |
873 | 873 | '{{{ data.name }}}' |
874 | 874 | ); |
875 | 875 | if ( current_user_can( 'update_core' ) && current_user_can( 'update_php' ) ) { |
… |
… |
function customize_themes_print_templates() { |
899 | 899 | <?php |
900 | 900 | printf( |
901 | 901 | /* translators: %s: Theme name. */ |
902 | | __( 'There is a new version of %s available, but it doesn’t work with your version of WordPress.' ), |
| 902 | __( 'There is a new version of %s available, but it does not work with your version of WordPress.' ), |
903 | 903 | '{{{ data.name }}}' |
904 | 904 | ); |
905 | 905 | if ( current_user_can( 'update_core' ) ) { |
… |
… |
function customize_themes_print_templates() { |
914 | 914 | <?php |
915 | 915 | printf( |
916 | 916 | /* translators: %s: Theme name. */ |
917 | | __( 'There is a new version of %s available, but it doesn’t work with your version of PHP.' ), |
| 917 | __( 'There is a new version of %s available, but it does not work with your version of PHP.' ), |
918 | 918 | '{{{ data.name }}}' |
919 | 919 | ); |
920 | 920 | if ( current_user_can( 'update_php' ) ) { |
… |
… |
function customize_themes_print_templates() { |
948 | 948 | <div class="notice notice-error notice-alt notice-large"><p> |
949 | 949 | <# if ( ! data.compatibleWP && ! data.compatiblePHP ) { #> |
950 | 950 | <?php |
951 | | _e( 'This theme doesn’t work with your versions of WordPress and PHP.' ); |
| 951 | _e( 'This theme does not work with your versions of WordPress and PHP.' ); |
952 | 952 | if ( current_user_can( 'update_core' ) && current_user_can( 'update_php' ) ) { |
953 | 953 | printf( |
954 | 954 | /* translators: 1: URL to WordPress Updates screen, 2: URL to Update PHP page. */ |
… |
… |
function customize_themes_print_templates() { |
974 | 974 | ?> |
975 | 975 | <# } else if ( ! data.compatibleWP ) { #> |
976 | 976 | <?php |
977 | | _e( 'This theme doesn’t work with your version of WordPress.' ); |
| 977 | _e( 'This theme does not work with your version of WordPress.' ); |
978 | 978 | if ( current_user_can( 'update_core' ) ) { |
979 | 979 | printf( |
980 | 980 | /* translators: %s: URL to WordPress Updates screen. */ |
… |
… |
function customize_themes_print_templates() { |
985 | 985 | ?> |
986 | 986 | <# } else if ( ! data.compatiblePHP ) { #> |
987 | 987 | <?php |
988 | | _e( 'This theme doesn’t work with your version of PHP.' ); |
| 988 | _e( 'This theme does not work with your version of PHP.' ); |
989 | 989 | if ( current_user_can( 'update_php' ) ) { |
990 | 990 | printf( |
991 | 991 | /* translators: %s: URL to Update PHP page. */ |
-
diff --git a/src/wp-admin/includes/update.php b/src/wp-admin/includes/update.php
index 03cd1f2bcd..c12d2ae15d 100644
a
|
b
|
function wp_plugin_update_row( $file, $plugin_data ) { |
534 | 534 | } else { |
535 | 535 | printf( |
536 | 536 | /* translators: 1: Plugin name, 2: Details URL, 3: Additional link attributes, 4: Version number 5: URL to Update PHP page. */ |
537 | | __( 'There is a new version of %1$s available, but it doesn’t work with your version of PHP. <a href="%2$s" %3$s>View version %4$s details</a> or <a href="%5$s">learn more about updating PHP</a>.' ), |
| 537 | __( 'There is a new version of %1$s available, but it does not work with your version of PHP. <a href="%2$s" %3$s>View version %4$s details</a> or <a href="%5$s">learn more about updating PHP</a>.' ), |
538 | 538 | $plugin_name, |
539 | 539 | esc_url( $details_url ), |
540 | 540 | sprintf( |
… |
… |
function wp_theme_update_row( $theme_key, $theme ) { |
728 | 728 | if ( ! $compatible_wp && ! $compatible_php ) { |
729 | 729 | printf( |
730 | 730 | /* translators: %s: Theme name. */ |
731 | | __( 'There is a new version of %s available, but it doesn’t work with your versions of WordPress and PHP.' ), |
| 731 | __( 'There is a new version of %s available, but it does not work with your versions of WordPress and PHP.' ), |
732 | 732 | $theme['Name'] |
733 | 733 | ); |
734 | 734 | if ( current_user_can( 'update_core' ) && current_user_can( 'update_php' ) ) { |
… |
… |
function wp_theme_update_row( $theme_key, $theme ) { |
756 | 756 | } elseif ( ! $compatible_wp ) { |
757 | 757 | printf( |
758 | 758 | /* translators: %s: Theme name. */ |
759 | | __( 'There is a new version of %s available, but it doesn’t work with your version of WordPress.' ), |
| 759 | __( 'There is a new version of %s available, but it does not work with your version of WordPress.' ), |
760 | 760 | $theme['Name'] |
761 | 761 | ); |
762 | 762 | if ( current_user_can( 'update_core' ) ) { |
… |
… |
function wp_theme_update_row( $theme_key, $theme ) { |
769 | 769 | } elseif ( ! $compatible_php ) { |
770 | 770 | printf( |
771 | 771 | /* translators: %s: Theme name. */ |
772 | | __( 'There is a new version of %s available, but it doesn’t work with your version of PHP.' ), |
| 772 | __( 'There is a new version of %s available, but it does not work with your version of PHP.' ), |
773 | 773 | $theme['Name'] |
774 | 774 | ); |
775 | 775 | if ( current_user_can( 'update_php' ) ) { |
-
diff --git a/src/wp-admin/includes/user.php b/src/wp-admin/includes/user.php
index ab63f9e302..a948813a5e 100644
a
|
b
|
function edit_user( $user_id = 0 ) { |
174 | 174 | |
175 | 175 | // Checking the password has been typed twice the same. |
176 | 176 | if ( ( $update || ! empty( $pass1 ) ) && $pass1 != $pass2 ) { |
177 | | $errors->add( 'pass', __( '<strong>Error</strong>: Passwords don’t match. Please enter the same password in both password fields.' ), array( 'form-field' => 'pass1' ) ); |
| 177 | $errors->add( 'pass', __( '<strong>Error</strong>: Passwords do not match. Please enter the same password in both password fields.' ), array( 'form-field' => 'pass1' ) ); |
178 | 178 | } |
179 | 179 | |
180 | 180 | if ( ! empty( $pass1 ) ) { |
… |
… |
function edit_user( $user_id = 0 ) { |
200 | 200 | if ( empty( $user->user_email ) ) { |
201 | 201 | $errors->add( 'empty_email', __( '<strong>Error</strong>: Please enter an email address.' ), array( 'form-field' => 'email' ) ); |
202 | 202 | } elseif ( ! is_email( $user->user_email ) ) { |
203 | | $errors->add( 'invalid_email', __( '<strong>Error</strong>: The email address isn’t correct.' ), array( 'form-field' => 'email' ) ); |
| 203 | $errors->add( 'invalid_email', __( '<strong>Error</strong>: The email address is not correct.' ), array( 'form-field' => 'email' ) ); |
204 | 204 | } else { |
205 | 205 | $owner_id = email_exists( $user->user_email ); |
206 | 206 | if ( $owner_id && ( ! $update || ( $owner_id != $user->ID ) ) ) { |
-
diff --git a/src/wp-admin/install.php b/src/wp-admin/install.php
index 5910287139..3751b1916f 100644
a
|
b
|
switch ( $step ) { |
358 | 358 | <p><?php _e( 'Welcome to the famous five-minute WordPress installation process! Just fill in the information below and you’ll be on your way to using the most extendable and powerful personal publishing platform in the world.' ); ?></p> |
359 | 359 | |
360 | 360 | <h2><?php _e( 'Information needed' ); ?></h2> |
361 | | <p><?php _e( 'Please provide the following information. Don’t worry, you can always change these settings later.' ); ?></p> |
| 361 | <p><?php _e( 'Please provide the following information. Do not worry, you can always change these settings later.' ); ?></p> |
362 | 362 | |
363 | 363 | <?php |
364 | 364 | display_setup_form(); |
… |
… |
switch ( $step ) { |
405 | 405 | $error = true; |
406 | 406 | } elseif ( ! is_email( $admin_email ) ) { |
407 | 407 | // TODO: Poka-yoke. |
408 | | display_setup_form( __( 'Sorry, that isn’t a valid email address. Email addresses look like <code>username@example.com</code>.' ) ); |
| 408 | display_setup_form( __( 'Sorry, that is not a valid email address. Email addresses look like <code>username@example.com</code>.' ) ); |
409 | 409 | $error = true; |
410 | 410 | } |
411 | 411 | |
-
diff --git a/src/wp-admin/media.php b/src/wp-admin/media.php
index fe2e9a8617..71c6796562 100644
a
|
b
|
switch ( $action ) { |
65 | 65 | $att = get_post( $att_id ); |
66 | 66 | |
67 | 67 | if ( empty( $att->ID ) ) { |
68 | | wp_die( __( 'You attempted to edit an attachment that doesn’t exist. Perhaps it was deleted?' ) ); |
| 68 | wp_die( __( 'You attempted to edit an attachment that does not exist. Perhaps it was deleted?' ) ); |
69 | 69 | } |
70 | 70 | if ( 'attachment' !== $att->post_type ) { |
71 | | wp_die( __( 'You attempted to edit an item that isn’t an attachment. Please go back and try again.' ) ); |
| 71 | wp_die( __( 'You attempted to edit an item that is not an attachment. Please go back and try again.' ) ); |
72 | 72 | } |
73 | 73 | if ( 'trash' === $att->post_status ) { |
74 | | wp_die( __( 'You can’t edit this attachment because it is in the Trash. Please move it out of the Trash and try again.' ) ); |
| 74 | wp_die( __( 'You can not edit this attachment because it is in the Trash. Please move it out of the Trash and try again.' ) ); |
75 | 75 | } |
76 | 76 | |
77 | 77 | add_filter( 'attachment_fields_to_edit', 'media_single_attachment_fields_to_edit', 10, 2 ); |
-
diff --git a/src/wp-admin/nav-menus.php b/src/wp-admin/nav-menus.php
index d340fb6b67..4ba4432f76 100644
a
|
b
|
if ( ! $locations_screen ) : // Main tab. |
618 | 618 | |
619 | 619 | $menu_management = '<p>' . __( 'The menu management box at the top of the screen is used to control which menu is opened in the editor below.' ) . '</p>'; |
620 | 620 | $menu_management .= '<ul><li>' . __( 'To edit an existing menu, <strong>choose a menu from the drop down and click Select</strong>' ) . '</li>'; |
621 | | $menu_management .= '<li>' . __( 'If you haven’t yet created any menus, <strong>click the ’create a new menu’ link</strong> to get started' ) . '</li></ul>'; |
| 621 | $menu_management .= '<li>' . __( 'If you have not yet created any menus, <strong>click the ’create a new menu’ link</strong> to get started' ) . '</li></ul>'; |
622 | 622 | $menu_management .= '<p>' . __( 'You can assign theme locations to individual menus by <strong>selecting the desired settings</strong> at the bottom of the menu editor. To assign menus to all theme locations at once, <strong>visit the Manage Locations tab</strong> at the top of the screen.' ) . '</p>'; |
623 | 623 | |
624 | 624 | get_current_screen()->add_help_tab( |
… |
… |
if ( ! $locations_screen ) : // Main tab. |
645 | 645 | ); |
646 | 646 | else : // Locations tab. |
647 | 647 | $locations_overview = '<p>' . __( 'This screen is used for globally assigning menus to locations defined by your theme.' ) . '</p>'; |
648 | | $locations_overview .= '<ul><li>' . __( 'To assign menus to one or more theme locations, <strong>select a menu from each location’s drop down.</strong> When you’re finished, <strong>click Save Changes</strong>' ) . '</li>'; |
| 648 | $locations_overview .= '<ul><li>' . __( 'To assign menus to one or more theme locations, <strong>select a menu from each location’s drop down.</strong> When you are finished, <strong>click Save Changes</strong>' ) . '</li>'; |
649 | 649 | $locations_overview .= '<li>' . __( 'To edit a menu currently assigned to a theme location, <strong>click the adjacent ’Edit’ link</strong>' ) . '</li>'; |
650 | 650 | $locations_overview .= '<li>' . __( 'To add a new menu instead of assigning an existing one, <strong>click the ’Use new menu’ link</strong>. Your new menu will be automatically assigned to that theme location' ) . '</li></ul>'; |
651 | 651 | |
… |
… |
require_once ABSPATH . 'wp-admin/admin-header.php'; |
835 | 835 | <?php |
836 | 836 | printf( |
837 | 837 | /* translators: %s: URL to create a new menu. */ |
838 | | __( 'Edit your menu below, or <a href="%s">create a new menu</a>. Don’t forget to save your changes!' ), |
| 838 | __( 'Edit your menu below, or <a href="%s">create a new menu</a>. Do not forget to save your changes!' ), |
839 | 839 | esc_url( |
840 | 840 | add_query_arg( |
841 | 841 | array( |
… |
… |
require_once ABSPATH . 'wp-admin/admin-header.php'; |
900 | 900 | <?php |
901 | 901 | printf( |
902 | 902 | /* translators: %s: URL to create a new menu. */ |
903 | | __( 'or <a href="%s">create a new menu</a>. Don’t forget to save your changes!' ), |
| 903 | __( 'or <a href="%s">create a new menu</a>. Do not forget to save your changes!' ), |
904 | 904 | esc_url( |
905 | 905 | add_query_arg( |
906 | 906 | array( |
-
diff --git a/src/wp-admin/network/site-new.php b/src/wp-admin/network/site-new.php
index ac466db9a9..93b2a19768 100644
a
|
b
|
if ( isset( $_REQUEST['action'] ) && 'add-site' === $_REQUEST['action'] ) { |
37 | 37 | check_admin_referer( 'add-blog', '_wpnonce_add-blog' ); |
38 | 38 | |
39 | 39 | if ( ! is_array( $_POST['blog'] ) ) { |
40 | | wp_die( __( 'Can’t create an empty site.' ) ); |
| 40 | wp_die( __( 'Can not create an empty site.' ) ); |
41 | 41 | } |
42 | 42 | |
43 | 43 | $blog = $_POST['blog']; |
-
diff --git a/src/wp-admin/network/upgrade.php b/src/wp-admin/network/upgrade.php
index 12b88fbe92..9e27b598f1 100644
a
|
b
|
get_current_screen()->add_help_tab( |
22 | 22 | 'title' => __( 'Overview' ), |
23 | 23 | 'content' => |
24 | 24 | '<p>' . __( 'Only use this screen once you have updated to a new version of WordPress through Updates/Available Updates (via the Network Administration navigation menu or the Toolbar). Clicking the Upgrade Network button will step through each site in the network, five at a time, and make sure any database updates are applied.' ) . '</p>' . |
25 | | '<p>' . __( 'If a version update to core has not happened, clicking this button won’t affect anything.' ) . '</p>' . |
| 25 | '<p>' . __( 'If a version update to core has not happened, clicking this button will not affect anything.' ) . '</p>' . |
26 | 26 | '<p>' . __( 'If this process fails for any reason, users logging in to their sites will force the same update.' ) . '</p>', |
27 | 27 | ) |
28 | 28 | ); |
… |
… |
switch ( $action ) { |
122 | 122 | do_action( 'wpmu_upgrade_site', $site_id ); |
123 | 123 | } |
124 | 124 | echo '</ul>'; |
125 | | ?><p><?php _e( 'If your browser doesn’t start loading the next page automatically, click this link:' ); ?> <a class="button" href="upgrade.php?action=upgrade&n=<?php echo ( $n + 5 ); ?>"><?php _e( 'Next Sites' ); ?></a></p> |
| 125 | ?><p><?php _e( 'If your browser does not start loading the next page automatically, click this link:' ); ?> <a class="button" href="upgrade.php?action=upgrade&n=<?php echo ( $n + 5 ); ?>"><?php _e( 'Next Sites' ); ?></a></p> |
126 | 126 | <script type="text/javascript"> |
127 | 127 | <!-- |
128 | 128 | function nextpage() { |
-
diff --git a/src/wp-admin/options-discussion.php b/src/wp-admin/options-discussion.php
index 64eb4d33eb..7f1cd64cd9 100644
a
|
b
|
get_current_screen()->add_help_tab( |
22 | 22 | array( |
23 | 23 | 'id' => 'overview', |
24 | 24 | 'title' => __( 'Overview' ), |
25 | | 'content' => '<p>' . __( 'This screen provides many options for controlling the management and display of comments and links to your posts/pages. So many, in fact, they won’t all fit here! :) Use the documentation links to get information on what each discussion setting does.' ) . '</p>' . |
| 25 | 'content' => '<p>' . __( 'This screen provides many options for controlling the management and display of comments and links to your posts/pages. So many, in fact, they will not all fit here! :) Use the documentation links to get information on what each discussion setting does.' ) . '</p>' . |
26 | 26 | '<p>' . __( 'You must click the Save Changes button at the bottom of the screen for new settings to take effect.' ) . '</p>', |
27 | 27 | ) |
28 | 28 | ); |
-
diff --git a/src/wp-admin/options-permalink.php b/src/wp-admin/options-permalink.php
index 17a9083cb6..46ddd111b4 100644
a
|
b
|
printf( __( 'If you like, you may enter custom structures for your category and |
368 | 368 | <?php |
369 | 369 | printf( |
370 | 370 | /* translators: 1: web.config, 2: Documentation URL, 3: CTRL + a, 4: Element code. */ |
371 | | __( 'If your %1$s file was <a href="%2$s">writable</a>, we could do this automatically, but it isn’t so this is the url rewrite rule you should have in your %1$s file. Click in the field and press %3$s to select all. Then insert this rule inside of the %4$s element in %1$s file.' ), |
| 371 | __( 'If your %1$s file was <a href="%2$s">writable</a>, we could do this automatically, but it is not so this is the url rewrite rule you should have in your %1$s file. Click in the field and press %3$s to select all. Then insert this rule inside of the %4$s element in %1$s file.' ), |
372 | 372 | '<code>web.config</code>', |
373 | 373 | __( 'https://wordpress.org/support/article/changing-file-permissions/' ), |
374 | 374 | '<kbd>CTRL + a</kbd>', |
… |
… |
printf( __( 'If you like, you may enter custom structures for your category and |
394 | 394 | <?php |
395 | 395 | printf( |
396 | 396 | /* translators: 1: Documentation URL, 2: web.config, 3: CTRL + a */ |
397 | | __( 'If the root directory of your site was <a href="%1$s">writable</a>, we could do this automatically, but it isn’t so this is the url rewrite rule you should have in your %2$s file. Create a new file, called %2$s in the root directory of your site. Click in the field and press %3$s to select all. Then insert this code into the %2$s file.' ), |
| 397 | __( 'If the root directory of your site was <a href="%1$s">writable</a>, we could do this automatically, but it is not so this is the url rewrite rule you should have in your %2$s file. Create a new file, called %2$s in the root directory of your site. Click in the field and press %3$s to select all. Then insert this code into the %2$s file.' ), |
398 | 398 | __( 'https://wordpress.org/support/article/changing-file-permissions/' ), |
399 | 399 | '<code>web.config</code>', |
400 | 400 | '<kbd>CTRL + a</kbd>' |
… |
… |
else : |
424 | 424 | <?php |
425 | 425 | printf( |
426 | 426 | /* translators: 1: .htaccess, 2: Documentation URL, 3: CTRL + a */ |
427 | | __( 'If your %1$s file was <a href="%2$s">writable</a>, we could do this automatically, but it isn’t so these are the mod_rewrite rules you should have in your %1$s file. Click in the field and press %3$s to select all.' ), |
| 427 | __( 'If your %1$s file was <a href="%2$s">writable</a>, we could do this automatically, but it is not so these are the mod_rewrite rules you should have in your %1$s file. Click in the field and press %3$s to select all.' ), |
428 | 428 | '<code>.htaccess</code>', |
429 | 429 | __( 'https://wordpress.org/support/article/changing-file-permissions/' ), |
430 | 430 | '<kbd>CTRL + a</kbd>' |
-
diff --git a/src/wp-admin/plugin-editor.php b/src/wp-admin/plugin-editor.php
index 82d9cc5aff..129a64cd42 100644
a
|
b
|
get_current_screen()->add_help_tab( |
125 | 125 | 'title' => __( 'Overview' ), |
126 | 126 | 'content' => |
127 | 127 | '<p>' . __( 'You can use the plugin editor to make changes to any of your plugins’ individual PHP files. Be aware that if you make changes, plugins updates will overwrite your customizations.' ) . '</p>' . |
128 | | '<p>' . __( 'Choose a plugin to edit from the dropdown menu and click the Select button. Click once on any file name to load it in the editor, and make your changes. Don’t forget to save your changes (Update File) when you’re finished.' ) . '</p>' . |
| 128 | '<p>' . __( 'Choose a plugin to edit from the dropdown menu and click the Select button. Click once on any file name to load it in the editor, and make your changes. Do not forget to save your changes (Update File) when you are finished.' ) . '</p>' . |
129 | 129 | '<p>' . __( 'The Documentation menu below the editor lists the PHP functions recognized in the plugin file. Clicking Look Up takes you to a web page about that particular function.' ) . '</p>' . |
130 | 130 | '<p id="editor-keyboard-trap-help-1">' . __( 'When using a keyboard to navigate:' ) . '</p>' . |
131 | 131 | '<ul>' . |
… |
… |
get_current_screen()->add_help_tab( |
133 | 133 | '<li id="editor-keyboard-trap-help-3">' . __( 'To move away from this area, press the Esc key followed by the Tab key.' ) . '</li>' . |
134 | 134 | '<li id="editor-keyboard-trap-help-4">' . __( 'Screen reader users: when in forms mode, you may need to press the Esc key twice.' ) . '</li>' . |
135 | 135 | '</ul>' . |
136 | | '<p>' . __( 'If you want to make changes but don’t want them to be overwritten when the plugin is updated, you may be ready to think about writing your own plugin. For information on how to edit plugins, write your own from scratch, or just better understand their anatomy, check out the links below.' ) . '</p>' . |
| 136 | '<p>' . __( 'If you want to make changes but do not want them to be overwritten when the plugin is updated, you may be ready to think about writing your own plugin. For information on how to edit plugins, write your own from scratch, or just better understand their anatomy, check out the links below.' ) . '</p>' . |
137 | 137 | ( is_network_admin() ? '<p>' . __( 'Any edits to files from this screen will be reflected on all sites in the network.' ) . '</p>' : '' ), |
138 | 138 | ) |
139 | 139 | ); |
-
diff --git a/src/wp-admin/plugin-install.php b/src/wp-admin/plugin-install.php
index a8b4e333ab..f70f8f9a83 100644
a
|
b
|
get_current_screen()->add_help_tab( |
109 | 109 | 'id' => 'adding-plugins', |
110 | 110 | 'title' => __( 'Adding Plugins' ), |
111 | 111 | 'content' => |
112 | | '<p>' . __( 'If you know what you’re looking for, Search is your best bet. The Search screen has options to search the WordPress Plugin Directory for a particular Term, Author, or Tag. You can also search the directory by selecting popular tags. Tags in larger type mean more plugins have been labeled with that tag.' ) . '</p>' . |
| 112 | '<p>' . __( 'If you know what you are looking for, Search is your best bet. The Search screen has options to search the WordPress Plugin Directory for a particular Term, Author, or Tag. You can also search the directory by selecting popular tags. Tags in larger type mean more plugins have been labeled with that tag.' ) . '</p>' . |
113 | 113 | '<p>' . __( 'If you just want to get an idea of what’s available, you can browse Featured and Popular plugins by using the links above the plugins list. These sections rotate regularly.' ) . '</p>' . |
114 | 114 | '<p>' . __( 'You can also browse a user’s favorite plugins, by using the Favorites link above the plugins list and entering their WordPress.org username.' ) . '</p>' . |
115 | 115 | '<p>' . __( 'If you want to install a plugin that you’ve downloaded elsewhere, click the Upload Plugin button above the plugins list. You will be prompted to upload the .zip package, and once uploaded, you can activate the new plugin.' ) . '</p>', |
-
diff --git a/src/wp-admin/plugins.php b/src/wp-admin/plugins.php
index 373e1f8ad7..11aea0e1d5 100644
a
|
b
|
get_current_screen()->add_help_tab( |
560 | 560 | '<p>' . __( 'Most of the time, plugins play nicely with the core of WordPress and with other plugins. Sometimes, though, a plugin’s code will get in the way of another plugin, causing compatibility issues. If your site starts doing strange things, this may be the problem. Try deactivating all your plugins and re-activating them in various combinations until you isolate which one(s) caused the issue.' ) . '</p>' . |
561 | 561 | '<p>' . sprintf( |
562 | 562 | /* translators: %s: WP_PLUGIN_DIR constant value. */ |
563 | | __( 'If something goes wrong with a plugin and you can’t use WordPress, delete or rename that file in the %s directory and it will be automatically deactivated.' ), |
| 563 | __( 'If something goes wrong with a plugin and you can not use WordPress, delete or rename that file in the %s directory and it will be automatically deactivated.' ), |
564 | 564 | '<code>' . WP_PLUGIN_DIR . '</code>' |
565 | 565 | ) . '</p>', |
566 | 566 | ) |
-
diff --git a/src/wp-admin/post.php b/src/wp-admin/post.php
index a1113ed35f..56f23d74cf 100644
a
|
b
|
switch ( $action ) { |
124 | 124 | } |
125 | 125 | |
126 | 126 | if ( ! $post ) { |
127 | | wp_die( __( 'You attempted to edit an item that doesn’t exist. Perhaps it was deleted?' ) ); |
| 127 | wp_die( __( 'You attempted to edit an item that does not exist. Perhaps it was deleted?' ) ); |
128 | 128 | } |
129 | 129 | |
130 | 130 | if ( ! $post_type_object ) { |
… |
… |
switch ( $action ) { |
140 | 140 | } |
141 | 141 | |
142 | 142 | if ( 'trash' === $post->post_status ) { |
143 | | wp_die( __( 'You can’t edit this item because it is in the Trash. Please restore it and try again.' ) ); |
| 143 | wp_die( __( 'You can not edit this item because it is in the Trash. Please restore it and try again.' ) ); |
144 | 144 | } |
145 | 145 | |
146 | 146 | if ( ! empty( $_GET['get-post-lock'] ) ) { |
-
diff --git a/src/wp-admin/setup-config.php b/src/wp-admin/setup-config.php
index 881398ff57..979f6e546e 100644
a
|
b
|
switch ( $step ) { |
170 | 170 | <?php |
171 | 171 | printf( |
172 | 172 | /* translators: %s: wp-config.php */ |
173 | | __( 'We’re going to use this information to create a %s file.' ), |
| 173 | __( 'We are going to use this information to create a %s file.' ), |
174 | 174 | '<code>wp-config.php</code>' |
175 | 175 | ); |
176 | 176 | ?> |
… |
… |
switch ( $step ) { |
178 | 178 | <?php |
179 | 179 | printf( |
180 | 180 | /* translators: 1: wp-config-sample.php, 2: wp-config.php */ |
181 | | __( 'If for any reason this automatic file creation doesn’t work, don’t worry. All this does is fill in the database information to a configuration file. You may also simply open %1$s in a text editor, fill in your information, and save it as %2$s.' ), |
| 181 | __( 'If for any reason this automatic file creation does not work, do not worry. All this does is fill in the database information to a configuration file. You may also simply open %1$s in a text editor, fill in your information, and save it as %2$s.' ), |
182 | 182 | '<code>wp-config-sample.php</code>', |
183 | 183 | '<code>wp-config.php</code>' |
184 | 184 | ); |
… |
… |
switch ( $step ) { |
192 | 192 | ); |
193 | 193 | ?> |
194 | 194 | </p> |
195 | | <p><?php _e( 'In all likelihood, these items were supplied to you by your web host. If you don’t have this information, then you will need to contact them before you can continue. If you’re all ready…' ); ?></p> |
| 195 | <p><?php _e( 'In all likelihood, these items were supplied to you by your web host. If you do not have this information, then you will need to contact them before you can continue. If you are ready…' ); ?></p> |
196 | 196 | |
197 | 197 | <p class="step"><a href="<?php echo $step_1; ?>" class="button button-large"><?php _e( 'Let’s go!' ); ?></a></p> |
198 | 198 | <?php |
… |
… |
switch ( $step ) { |
208 | 208 | ?> |
209 | 209 | <h1 class="screen-reader-text"><?php _e( 'Set up your database connection' ); ?></h1> |
210 | 210 | <form method="post" action="setup-config.php?step=2"> |
211 | | <p><?php _e( 'Below you should enter your database connection details. If you’re not sure about these, contact your host.' ); ?></p> |
| 211 | <p><?php _e( 'Below you should enter your database connection details. If you are not sure about these, contact your host.' ); ?></p> |
212 | 212 | <table class="form-table" role="presentation"> |
213 | 213 | <tr> |
214 | 214 | <th scope="row"><label for="dbname"><?php _e( 'Database Name' ); ?></label></th> |
… |
… |
switch ( $step ) { |
231 | 231 | <td id="dbhost-desc"> |
232 | 232 | <?php |
233 | 233 | /* translators: %s: localhost */ |
234 | | printf( __( 'You should be able to get this info from your web host, if %s doesn’t work.' ), '<code>localhost</code>' ); |
| 234 | printf( __( 'You should be able to get this info from your web host, if %s does not work.' ), '<code>localhost</code>' ); |
235 | 235 | ?> |
236 | 236 | </td> |
237 | 237 | </tr> |
-
diff --git a/src/wp-admin/term.php b/src/wp-admin/term.php
index d691cca00d..55d1a7eb94 100644
a
|
b
|
$tag_ID = absint( $_REQUEST['tag_ID'] ); |
28 | 28 | $tag = get_term( $tag_ID, $taxnow, OBJECT, 'edit' ); |
29 | 29 | |
30 | 30 | if ( ! $tag instanceof WP_Term ) { |
31 | | wp_die( __( 'You attempted to edit an item that doesn’t exist. Perhaps it was deleted?' ) ); |
| 31 | wp_die( __( 'You attempted to edit an item that does not exist. Perhaps it was deleted?' ) ); |
32 | 32 | } |
33 | 33 | |
34 | 34 | $tax = get_taxonomy( $tag->taxonomy ); |
-
diff --git a/src/wp-admin/theme-editor.php b/src/wp-admin/theme-editor.php
index 68228edc40..8a4e05d03c 100644
a
|
b
|
if ( $file_description !== $file_show ) { |
203 | 203 | <?php |
204 | 204 | printf( |
205 | 205 | /* translators: %s: Link to Custom CSS section in the Customizer. */ |
206 | | __( 'There’s no need to change your CSS here — you can edit and live preview CSS changes in the <a href="%s">built-in CSS editor</a>.' ), |
| 206 | __( 'There is no need to change your CSS here — you can edit and live preview CSS changes in the <a href="%s">built-in CSS editor</a>.' ), |
207 | 207 | esc_url( add_query_arg( 'autofocus[section]', 'custom_css', admin_url( 'customize.php' ) ) ) |
208 | 208 | ); |
209 | 209 | ?> |
-
diff --git a/src/wp-admin/theme-install.php b/src/wp-admin/theme-install.php
index cd3a607ea9..e7db07911c 100644
a
|
b
|
get_current_screen()->add_help_tab( |
124 | 124 | ); |
125 | 125 | |
126 | 126 | $help_installing = |
127 | | '<p>' . __( 'Once you have generated a list of themes, you can preview and install any of them. Click on the thumbnail of the theme you’re interested in previewing. It will open up in a full-screen Preview page to give you a better idea of how that theme will look.' ) . '</p>' . |
| 127 | '<p>' . __( 'Once you have generated a list of themes, you can preview and install any of them. Click on the thumbnail of the theme you are interested in previewing. It will open up in a full-screen Preview page to give you a better idea of how that theme will look.' ) . '</p>' . |
128 | 128 | '<p>' . __( 'To install the theme so you can preview it with your site’s content and customize its theme options, click the "Install" button at the top of the left-hand pane. The theme files will be downloaded to your website automatically. When this is complete, the theme is now available for activation, which you can do by clicking the "Activate" link, or by navigating to your Manage Themes screen and clicking the "Live Preview" link under any installed theme’s thumbnail image.' ) . '</p>'; |
129 | 129 | |
130 | 130 | get_current_screen()->add_help_tab( |
… |
… |
if ( $tab ) { |
295 | 295 | <div class="notice notice-error notice-alt"><p> |
296 | 296 | <# if ( ! data.compatible_wp && ! data.compatible_php ) { #> |
297 | 297 | <?php |
298 | | _e( 'This theme doesn’t work with your versions of WordPress and PHP.' ); |
| 298 | _e( 'This theme does not work with your versions of WordPress and PHP.' ); |
299 | 299 | if ( current_user_can( 'update_core' ) && current_user_can( 'update_php' ) ) { |
300 | 300 | printf( |
301 | 301 | /* translators: 1: URL to WordPress Updates screen, 2: URL to Update PHP page. */ |
… |
… |
if ( $tab ) { |
321 | 321 | ?> |
322 | 322 | <# } else if ( ! data.compatible_wp ) { #> |
323 | 323 | <?php |
324 | | _e( 'This theme doesn’t work with your version of WordPress.' ); |
| 324 | _e( 'This theme does not work with your version of WordPress.' ); |
325 | 325 | if ( current_user_can( 'update_core' ) ) { |
326 | 326 | printf( |
327 | 327 | /* translators: %s: URL to WordPress Updates screen. */ |
… |
… |
if ( $tab ) { |
332 | 332 | ?> |
333 | 333 | <# } else if ( ! data.compatible_php ) { #> |
334 | 334 | <?php |
335 | | _e( 'This theme doesn’t work with your version of PHP.' ); |
| 335 | _e( 'This theme does not work with your version of PHP.' ); |
336 | 336 | if ( current_user_can( 'update_php' ) ) { |
337 | 337 | printf( |
338 | 338 | /* translators: %s: URL to Update PHP page. */ |
… |
… |
if ( $tab ) { |
481 | 481 | <div class="notice notice-error notice-alt notice-large"><p> |
482 | 482 | <# if ( ! data.compatible_wp && ! data.compatible_php ) { #> |
483 | 483 | <?php |
484 | | _e( 'This theme doesn’t work with your versions of WordPress and PHP.' ); |
| 484 | _e( 'This theme does not work with your versions of WordPress and PHP.' ); |
485 | 485 | if ( current_user_can( 'update_core' ) && current_user_can( 'update_php' ) ) { |
486 | 486 | printf( |
487 | 487 | /* translators: 1: URL to WordPress Updates screen, 2: URL to Update PHP page. */ |
… |
… |
if ( $tab ) { |
507 | 507 | ?> |
508 | 508 | <# } else if ( ! data.compatible_wp ) { #> |
509 | 509 | <?php |
510 | | _e( 'This theme doesn’t work with your version of WordPress.' ); |
| 510 | _e( 'This theme does not work with your version of WordPress.' ); |
511 | 511 | if ( current_user_can( 'update_core' ) ) { |
512 | 512 | printf( |
513 | 513 | /* translators: %s: URL to WordPress Updates screen. */ |
… |
… |
if ( $tab ) { |
518 | 518 | ?> |
519 | 519 | <# } else if ( ! data.compatible_php ) { #> |
520 | 520 | <?php |
521 | | _e( 'This theme doesn’t work with your version of PHP.' ); |
| 521 | _e( 'This theme does not work with your version of PHP.' ); |
522 | 522 | if ( current_user_can( 'update_php' ) ) { |
523 | 523 | printf( |
524 | 524 | /* translators: %s: URL to Update PHP page. */ |
-
diff --git a/src/wp-admin/themes.php b/src/wp-admin/themes.php
index 9863aa68ae..3c984589db 100644
a
|
b
|
foreach ( $themes as $theme ) : |
395 | 395 | if ( ! $theme['updateResponse']['compatibleWP'] && ! $theme['updateResponse']['compatiblePHP'] ) { |
396 | 396 | printf( |
397 | 397 | /* translators: %s: Theme name. */ |
398 | | __( 'There is a new version of %s available, but it doesn’t work with your versions of WordPress and PHP.' ), |
| 398 | __( 'There is a new version of %s available, but it does not work with your versions of WordPress and PHP.' ), |
399 | 399 | $theme['name'] |
400 | 400 | ); |
401 | 401 | if ( current_user_can( 'update_core' ) && current_user_can( 'update_php' ) ) { |
… |
… |
foreach ( $themes as $theme ) : |
423 | 423 | } elseif ( ! $theme['updateResponse']['compatibleWP'] ) { |
424 | 424 | printf( |
425 | 425 | /* translators: %s: Theme name. */ |
426 | | __( 'There is a new version of %s available, but it doesn’t work with your version of WordPress.' ), |
| 426 | __( 'There is a new version of %s available, but it does not work with your version of WordPress.' ), |
427 | 427 | $theme['name'] |
428 | 428 | ); |
429 | 429 | if ( current_user_can( 'update_core' ) ) { |
… |
… |
foreach ( $themes as $theme ) : |
436 | 436 | } elseif ( ! $theme['updateResponse']['compatiblePHP'] ) { |
437 | 437 | printf( |
438 | 438 | /* translators: %s: Theme name. */ |
439 | | __( 'There is a new version of %s available, but it doesn’t work with your version of PHP.' ), |
| 439 | __( 'There is a new version of %s available, but it does not work with your version of PHP.' ), |
440 | 440 | $theme['name'] |
441 | 441 | ); |
442 | 442 | if ( current_user_can( 'update_php' ) ) { |
… |
… |
foreach ( $themes as $theme ) : |
457 | 457 | if ( ! $theme['compatibleWP'] || ! $theme['compatiblePHP'] ) { |
458 | 458 | echo '<div class="notice inline notice-error notice-alt"><p>'; |
459 | 459 | if ( ! $theme['compatibleWP'] && ! $theme['compatiblePHP'] ) { |
460 | | _e( 'This theme doesn’t work with your versions of WordPress and PHP.' ); |
| 460 | _e( 'This theme does not work with your versions of WordPress and PHP.' ); |
461 | 461 | if ( current_user_can( 'update_core' ) && current_user_can( 'update_php' ) ) { |
462 | 462 | printf( |
463 | 463 | /* translators: 1: URL to WordPress Updates screen, 2: URL to Update PHP page. */ |
… |
… |
foreach ( $themes as $theme ) : |
481 | 481 | wp_update_php_annotation( '</p><p><em>', '</em>' ); |
482 | 482 | } |
483 | 483 | } elseif ( ! $theme['compatibleWP'] ) { |
484 | | _e( 'This theme doesn’t work with your version of WordPress.' ); |
| 484 | _e( 'This theme does not work with your version of WordPress.' ); |
485 | 485 | if ( current_user_can( 'update_core' ) ) { |
486 | 486 | printf( |
487 | 487 | /* translators: %s: URL to WordPress Updates screen. */ |
… |
… |
foreach ( $themes as $theme ) : |
490 | 490 | ); |
491 | 491 | } |
492 | 492 | } elseif ( ! $theme['compatiblePHP'] ) { |
493 | | _e( 'This theme doesn’t work with your version of PHP.' ); |
| 493 | _e( 'This theme does not work with your version of PHP.' ); |
494 | 494 | if ( current_user_can( 'update_php' ) ) { |
495 | 495 | printf( |
496 | 496 | /* translators: %s: URL to Update PHP page. */ |
… |
… |
function wp_theme_auto_update_setting_template() { |
746 | 746 | <?php |
747 | 747 | printf( |
748 | 748 | /* translators: %s: Theme name. */ |
749 | | __( 'There is a new version of %s available, but it doesn’t work with your versions of WordPress and PHP.' ), |
| 749 | __( 'There is a new version of %s available, but it does not work with your versions of WordPress and PHP.' ), |
750 | 750 | '{{{ data.name }}}' |
751 | 751 | ); |
752 | 752 | if ( current_user_can( 'update_core' ) && current_user_can( 'update_php' ) ) { |
… |
… |
function wp_theme_auto_update_setting_template() { |
776 | 776 | <?php |
777 | 777 | printf( |
778 | 778 | /* translators: %s: Theme name. */ |
779 | | __( 'There is a new version of %s available, but it doesn’t work with your version of WordPress.' ), |
| 779 | __( 'There is a new version of %s available, but it does not work with your version of WordPress.' ), |
780 | 780 | '{{{ data.name }}}' |
781 | 781 | ); |
782 | 782 | if ( current_user_can( 'update_core' ) ) { |
… |
… |
function wp_theme_auto_update_setting_template() { |
791 | 791 | <?php |
792 | 792 | printf( |
793 | 793 | /* translators: %s: Theme name. */ |
794 | | __( 'There is a new version of %s available, but it doesn’t work with your version of PHP.' ), |
| 794 | __( 'There is a new version of %s available, but it does not work with your version of PHP.' ), |
795 | 795 | '{{{ data.name }}}' |
796 | 796 | ); |
797 | 797 | if ( current_user_can( 'update_php' ) ) { |
… |
… |
function wp_theme_auto_update_setting_template() { |
812 | 812 | <div class="notice notice-error notice-alt"><p> |
813 | 813 | <# if ( ! data.compatibleWP && ! data.compatiblePHP ) { #> |
814 | 814 | <?php |
815 | | _e( 'This theme doesn’t work with your versions of WordPress and PHP.' ); |
| 815 | _e( 'This theme does not work with your versions of WordPress and PHP.' ); |
816 | 816 | if ( current_user_can( 'update_core' ) && current_user_can( 'update_php' ) ) { |
817 | 817 | printf( |
818 | 818 | /* translators: 1: URL to WordPress Updates screen, 2: URL to Update PHP page. */ |
… |
… |
function wp_theme_auto_update_setting_template() { |
838 | 838 | ?> |
839 | 839 | <# } else if ( ! data.compatibleWP ) { #> |
840 | 840 | <?php |
841 | | _e( 'This theme doesn’t work with your version of WordPress.' ); |
| 841 | _e( 'This theme does not work with your version of WordPress.' ); |
842 | 842 | if ( current_user_can( 'update_core' ) ) { |
843 | 843 | printf( |
844 | 844 | /* translators: %s: URL to WordPress Updates screen. */ |
… |
… |
function wp_theme_auto_update_setting_template() { |
849 | 849 | ?> |
850 | 850 | <# } else if ( ! data.compatiblePHP ) { #> |
851 | 851 | <?php |
852 | | _e( 'This theme doesn’t work with your version of PHP.' ); |
| 852 | _e( 'This theme does not work with your version of PHP.' ); |
853 | 853 | if ( current_user_can( 'update_php' ) ) { |
854 | 854 | printf( |
855 | 855 | /* translators: %s: URL to Update PHP page. */ |
… |
… |
function wp_theme_auto_update_setting_template() { |
956 | 956 | <div class="notice notice-error notice-alt notice-large"><p> |
957 | 957 | <# if ( ! data.compatibleWP && ! data.compatiblePHP ) { #> |
958 | 958 | <?php |
959 | | _e( 'This theme doesn’t work with your versions of WordPress and PHP.' ); |
| 959 | _e( 'This theme does not work with your versions of WordPress and PHP.' ); |
960 | 960 | if ( current_user_can( 'update_core' ) && current_user_can( 'update_php' ) ) { |
961 | 961 | printf( |
962 | 962 | /* translators: 1: URL to WordPress Updates screen, 2: URL to Update PHP page. */ |
… |
… |
function wp_theme_auto_update_setting_template() { |
982 | 982 | ?> |
983 | 983 | <# } else if ( ! data.compatibleWP ) { #> |
984 | 984 | <?php |
985 | | _e( 'This theme doesn’t work with your version of WordPress.' ); |
| 985 | _e( 'This theme does not work with your version of WordPress.' ); |
986 | 986 | if ( current_user_can( 'update_core' ) ) { |
987 | 987 | printf( |
988 | 988 | /* translators: %s: URL to WordPress Updates screen. */ |
… |
… |
function wp_theme_auto_update_setting_template() { |
993 | 993 | ?> |
994 | 994 | <# } else if ( ! data.compatiblePHP ) { #> |
995 | 995 | <?php |
996 | | _e( 'This theme doesn’t work with your version of PHP.' ); |
| 996 | _e( 'This theme does not work with your version of PHP.' ); |
997 | 997 | if ( current_user_can( 'update_php' ) ) { |
998 | 998 | printf( |
999 | 999 | /* translators: %s: URL to Update PHP page. */ |
… |
… |
function wp_theme_auto_update_setting_template() { |
1021 | 1021 | <?php |
1022 | 1022 | printf( |
1023 | 1023 | /* translators: %s: Theme name. */ |
1024 | | __( 'There is a new version of %s available, but it doesn’t work with your versions of WordPress and PHP.' ), |
| 1024 | __( 'There is a new version of %s available, but it does not work with your versions of WordPress and PHP.' ), |
1025 | 1025 | '{{{ data.name }}}' |
1026 | 1026 | ); |
1027 | 1027 | if ( current_user_can( 'update_core' ) && current_user_can( 'update_php' ) ) { |
… |
… |
function wp_theme_auto_update_setting_template() { |
1051 | 1051 | <?php |
1052 | 1052 | printf( |
1053 | 1053 | /* translators: %s: Theme name. */ |
1054 | | __( 'There is a new version of %s available, but it doesn’t work with your version of WordPress.' ), |
| 1054 | __( 'There is a new version of %s available, but it does not work with your version of WordPress.' ), |
1055 | 1055 | '{{{ data.name }}}' |
1056 | 1056 | ); |
1057 | 1057 | if ( current_user_can( 'update_core' ) ) { |
… |
… |
function wp_theme_auto_update_setting_template() { |
1066 | 1066 | <?php |
1067 | 1067 | printf( |
1068 | 1068 | /* translators: %s: Theme name. */ |
1069 | | __( 'There is a new version of %s available, but it doesn’t work with your version of PHP.' ), |
| 1069 | __( 'There is a new version of %s available, but it does not work with your version of PHP.' ), |
1070 | 1070 | '{{{ data.name }}}' |
1071 | 1071 | ); |
1072 | 1072 | if ( current_user_can( 'update_php' ) ) { |
-
diff --git a/src/wp-admin/update-core.php b/src/wp-admin/update-core.php
index a38e43c46f..f7a075ac44 100644
a
|
b
|
function list_plugin_updates() { |
525 | 525 | $compatible_php = is_php_version_compatible( $requires_php ); |
526 | 526 | |
527 | 527 | if ( ! $compatible_php && current_user_can( 'update_php' ) ) { |
528 | | $compat .= '<br>' . __( 'This update doesn’t work with your version of PHP.' ) . ' '; |
| 528 | $compat .= '<br>' . __( 'This update does not work with your version of PHP.' ) . ' '; |
529 | 529 | $compat .= sprintf( |
530 | 530 | /* translators: %s: URL to Update PHP page. */ |
531 | 531 | __( '<a href="%s">Learn more about updating PHP</a>.' ), |
… |
… |
function list_theme_updates() { |
671 | 671 | $compat = ''; |
672 | 672 | |
673 | 673 | if ( ! $compatible_wp && ! $compatible_php ) { |
674 | | $compat .= '<br>' . __( 'This update doesn’t work with your versions of WordPress and PHP.' ) . ' '; |
| 674 | $compat .= '<br>' . __( 'This update does not work with your versions of WordPress and PHP.' ) . ' '; |
675 | 675 | if ( current_user_can( 'update_core' ) && current_user_can( 'update_php' ) ) { |
676 | 676 | $compat .= sprintf( |
677 | 677 | /* translators: 1: URL to WordPress Updates screen, 2: URL to Update PHP page. */ |
… |
… |
function list_theme_updates() { |
705 | 705 | } |
706 | 706 | } |
707 | 707 | } elseif ( ! $compatible_wp ) { |
708 | | $compat .= '<br>' . __( 'This update doesn’t work with your version of WordPress.' ) . ' '; |
| 708 | $compat .= '<br>' . __( 'This update does not work with your version of WordPress.' ) . ' '; |
709 | 709 | if ( current_user_can( 'update_core' ) ) { |
710 | 710 | $compat .= sprintf( |
711 | 711 | /* translators: %s: URL to WordPress Updates screen. */ |
… |
… |
function list_theme_updates() { |
714 | 714 | ); |
715 | 715 | } |
716 | 716 | } elseif ( ! $compatible_php ) { |
717 | | $compat .= '<br>' . __( 'This update doesn’t work with your version of PHP.' ) . ' '; |
| 717 | $compat .= '<br>' . __( 'This update does not work with your version of PHP.' ) . ' '; |
718 | 718 | if ( current_user_can( 'update_php' ) ) { |
719 | 719 | $compat .= sprintf( |
720 | 720 | /* translators: %s: URL to Update PHP page. */ |
-
diff --git a/src/wp-admin/user-new.php b/src/wp-admin/user-new.php
index 26da6a0ec4..220e0c53eb 100644
a
|
b
|
$help = '<p>' . __( 'To add a new user to your site, fill in the form on this sc |
258 | 258 | |
259 | 259 | if ( is_multisite() ) { |
260 | 260 | $help .= '<p>' . __( 'Because this is a multisite installation, you may add accounts that already exist on the Network by specifying a username or email, and defining a role. For more options, such as specifying a password, you have to be a Network Administrator and use the hover link under an existing user’s name to Edit the user profile under Network Admin > All Users.' ) . '</p>' . |
261 | | '<p>' . __( 'New users will receive an email letting them know they’ve been added as a user for your site. This email will also contain their password. Check the box if you don’t want the user to receive a welcome email.' ) . '</p>'; |
| 261 | '<p>' . __( 'New users will receive an email letting them know they’ve been added as a user for your site. This email will also contain their password. Check the box if you do not want the user to receive a welcome email.' ) . '</p>'; |
262 | 262 | } else { |
263 | 263 | $help .= '<p>' . __( 'New users are automatically assigned a password, which they can change after logging in. You can view or edit the assigned password by clicking the Show Password button. The username cannot be changed once the user has been added.' ) . '</p>' . |
264 | 264 | |
265 | | '<p>' . __( 'By default, new users will receive an email letting them know they’ve been added as a user for your site. This email will also contain a password reset link. Uncheck the box if you don’t want to send the new user a welcome email.' ) . '</p>'; |
| 265 | '<p>' . __( 'By default, new users will receive an email letting them know they’ve been added as a user for your site. This email will also contain a password reset link. Uncheck the box if you do not want to send the new user a welcome email.' ) . '</p>'; |
266 | 266 | } |
267 | 267 | |
268 | 268 | $help .= '<p>' . __( 'Remember to click the Add New User button at the bottom of this screen when you are finished.' ) . '</p>'; |
-
diff --git a/src/wp-admin/users.php b/src/wp-admin/users.php
index c3450dfd4b..6679a36efc 100644
a
|
b
|
switch ( $wp_list_table->current_action() ) { |
402 | 402 | check_admin_referer( 'remove-users' ); |
403 | 403 | |
404 | 404 | if ( ! is_multisite() ) { |
405 | | wp_die( __( 'You can’t remove users.' ), 400 ); |
| 405 | wp_die( __( 'You can not remove users.' ), 400 ); |
406 | 406 | } |
407 | 407 | |
408 | 408 | if ( empty( $_REQUEST['users'] ) ) { |
… |
… |
switch ( $wp_list_table->current_action() ) { |
434 | 434 | check_admin_referer( 'bulk-users' ); |
435 | 435 | |
436 | 436 | if ( ! is_multisite() ) { |
437 | | wp_die( __( 'You can’t remove users.' ), 400 ); |
| 437 | wp_die( __( 'You can not remove users.' ), 400 ); |
438 | 438 | } |
439 | 439 | |
440 | 440 | if ( empty( $_REQUEST['users'] ) && empty( $_REQUEST['user'] ) ) { |
… |
… |
switch ( $wp_list_table->current_action() ) { |
575 | 575 | $messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __( 'Other user roles have been changed.' ) . '</p></div>'; |
576 | 576 | break; |
577 | 577 | case 'err_admin_del': |
578 | | $messages[] = '<div id="message" class="error notice is-dismissible"><p>' . __( 'You can’t delete the current user.' ) . '</p></div>'; |
| 578 | $messages[] = '<div id="message" class="error notice is-dismissible"><p>' . __( 'You can not delete the current user.' ) . '</p></div>'; |
579 | 579 | $messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __( 'Other users have been deleted.' ) . '</p></div>'; |
580 | 580 | break; |
581 | 581 | case 'remove': |
582 | 582 | $messages[] = '<div id="message" class="updated notice is-dismissible fade"><p>' . __( 'User removed from this site.' ) . '</p></div>'; |
583 | 583 | break; |
584 | 584 | case 'err_admin_remove': |
585 | | $messages[] = '<div id="message" class="error notice is-dismissible"><p>' . __( "You can't remove the current user." ) . '</p></div>'; |
| 585 | $messages[] = '<div id="message" class="error notice is-dismissible"><p>' . __( "You can not remove the current user." ) . '</p></div>'; |
586 | 586 | $messages[] = '<div id="message" class="updated notice is-dismissible fade"><p>' . __( 'Other users have been removed.' ) . '</p></div>'; |
587 | 587 | break; |
588 | 588 | } |
-
diff --git a/src/wp-includes/Text/Diff.php b/src/wp-includes/Text/Diff.php
index 61a9320a0e..6f76278c5a 100644
a
|
b
|
class Text_Diff { |
260 | 260 | function _check($from_lines, $to_lines) |
261 | 261 | { |
262 | 262 | if (serialize($from_lines) != serialize($this->getOriginal())) { |
263 | | trigger_error("Reconstructed original doesn't match", E_USER_ERROR); |
| 263 | trigger_error("Reconstructed original does not match", E_USER_ERROR); |
264 | 264 | } |
265 | 265 | if (serialize($to_lines) != serialize($this->getFinal())) { |
266 | | trigger_error("Reconstructed final doesn't match", E_USER_ERROR); |
| 266 | trigger_error("Reconstructed final does not match", E_USER_ERROR); |
267 | 267 | } |
268 | 268 | |
269 | 269 | $rev = $this->reverse(); |
270 | 270 | if (serialize($to_lines) != serialize($rev->getOriginal())) { |
271 | | trigger_error("Reversed original doesn't match", E_USER_ERROR); |
| 271 | trigger_error("Reversed original does not match", E_USER_ERROR); |
272 | 272 | } |
273 | 273 | if (serialize($from_lines) != serialize($rev->getFinal())) { |
274 | | trigger_error("Reversed final doesn't match", E_USER_ERROR); |
| 274 | trigger_error("Reversed final does not match", E_USER_ERROR); |
275 | 275 | } |
276 | 276 | |
277 | 277 | $prevtype = null; |
-
diff --git a/src/wp-includes/blocks/tag-cloud.php b/src/wp-includes/blocks/tag-cloud.php
index cdebc92271..4324134416 100644
a
|
b
|
function render_block_core_tag_cloud( $attributes ) { |
25 | 25 | $tag_cloud = esc_html( |
26 | 26 | sprintf( |
27 | 27 | /* translators: %s: taxonomy name */ |
28 | | __( 'Your site doesn’t have any %s, so there’s nothing to display here at the moment.' ), |
| 28 | __( 'Your site does not have any %s, so there is nothing to display here at the moment.' ), |
29 | 29 | strtolower( $labels->name ) |
30 | 30 | ) |
31 | 31 | ); |
-
diff --git a/src/wp-includes/class-wp-customize-nav-menus.php b/src/wp-includes/class-wp-customize-nav-menus.php
index f438e358fd..76dbf2b796 100644
a
|
b
|
final class WP_Customize_Nav_Menus { |
1119 | 1119 | |
1120 | 1120 | <script type="text/html" id="tmpl-nav-menu-create-menu-section-title"> |
1121 | 1121 | <p class="add-new-menu-notice"> |
1122 | | <?php _e( 'It doesn’t look like your site has any menus yet. Want to build one? Click the button to start.' ); ?> |
| 1122 | <?php _e( 'It does not look like your site has any menus yet. Want to build one? Click the button to start.' ); ?> |
1123 | 1123 | </p> |
1124 | 1124 | <p class="add-new-menu-notice"> |
1125 | 1125 | <?php _e( 'You’ll create a menu, assign it a location, and add menu items like links to pages and categories. If your theme has multiple menu areas, you might need to create more than one.' ); ?> |
-
diff --git a/src/wp-includes/class-wp-customize-widgets.php b/src/wp-includes/class-wp-customize-widgets.php
index c96773b139..b649d9c526 100644
a
|
b
|
final class WP_Customize_Widgets { |
746 | 746 | */ |
747 | 747 | $some_non_rendered_areas_messages = array(); |
748 | 748 | $some_non_rendered_areas_messages[1] = html_entity_decode( |
749 | | __( 'Your theme has 1 other widget area, but this particular page doesn’t display it.' ), |
| 749 | __( 'Your theme has 1 other widget area, but this particular page does not display it.' ), |
750 | 750 | ENT_QUOTES, |
751 | 751 | get_bloginfo( 'charset' ) |
752 | 752 | ); |
… |
… |
final class WP_Customize_Widgets { |
756 | 756 | sprintf( |
757 | 757 | /* translators: %s: The number of other widget areas registered but not rendered. */ |
758 | 758 | _n( |
759 | | 'Your theme has %s other widget area, but this particular page doesn’t display it.', |
760 | | 'Your theme has %s other widget areas, but this particular page doesn’t display them.', |
| 759 | 'Your theme has %s other widget area, but this particular page does not display it.', |
| 760 | 'Your theme has %s other widget areas, but this particular page does not display them.', |
761 | 761 | $non_rendered_count |
762 | 762 | ), |
763 | 763 | number_format_i18n( $non_rendered_count ) |
… |
… |
final class WP_Customize_Widgets { |
770 | 770 | if ( 1 === $registered_sidebar_count ) { |
771 | 771 | $no_areas_shown_message = html_entity_decode( |
772 | 772 | sprintf( |
773 | | __( 'Your theme has 1 widget area, but this particular page doesn’t display it.' ) |
| 773 | __( 'Your theme has 1 widget area, but this particular page does not display it.' ) |
774 | 774 | ), |
775 | 775 | ENT_QUOTES, |
776 | 776 | get_bloginfo( 'charset' ) |
… |
… |
final class WP_Customize_Widgets { |
780 | 780 | sprintf( |
781 | 781 | /* translators: %s: The total number of widget areas registered. */ |
782 | 782 | _n( |
783 | | 'Your theme has %s widget area, but this particular page doesn’t display it.', |
784 | | 'Your theme has %s widget areas, but this particular page doesn’t display them.', |
| 783 | 'Your theme has %s widget area, but this particular page does not display it.', |
| 784 | 'Your theme has %s widget areas, but this particular page does not display them.', |
785 | 785 | $registered_sidebar_count |
786 | 786 | ), |
787 | 787 | number_format_i18n( $registered_sidebar_count ) |
-
diff --git a/src/wp-includes/class-wp-editor.php b/src/wp-includes/class-wp-editor.php
index 61cda16585..f12004b3e9 100644
a
|
b
|
final class _WP_Editors { |
1355 | 1355 | 'Words: {0}' => sprintf( __( 'Words: %s' ), '{0}' ), |
1356 | 1356 | 'Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.' => |
1357 | 1357 | __( 'Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.' ) . "\n\n" . |
1358 | | __( 'If you’re looking to paste rich content from Microsoft Word, try turning this option off. The editor will clean up text pasted from Word automatically.' ), |
| 1358 | __( 'If you are looking to paste rich content from Microsoft Word, try turning this option off. The editor will clean up text pasted from Word automatically.' ), |
1359 | 1359 | 'Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help' => |
1360 | 1360 | __( 'Rich Text Area. Press Alt-Shift-H for help.' ), |
1361 | 1361 | 'Rich Text Area. Press Control-Option-H for help.' => __( 'Rich Text Area. Press Control-Option-H for help.' ), |
-
diff --git a/src/wp-includes/class-wp-image-editor-gd.php b/src/wp-includes/class-wp-image-editor-gd.php
index f175b90d20..da6a316fbe 100644
a
|
b
|
class WP_Image_Editor_GD extends WP_Image_Editor { |
89 | 89 | } |
90 | 90 | |
91 | 91 | if ( ! is_file( $this->file ) && ! preg_match( '|^https?://|', $this->file ) ) { |
92 | | return new WP_Error( 'error_loading_image', __( 'File doesn’t exist?' ), $this->file ); |
| 92 | return new WP_Error( 'error_loading_image', __( 'File does not exist?' ), $this->file ); |
93 | 93 | } |
94 | 94 | |
95 | 95 | // Set artificially high because GD uses uncompressed images in memory. |
… |
… |
class WP_Image_Editor_GD extends WP_Image_Editor { |
98 | 98 | $file_contents = @file_get_contents( $this->file ); |
99 | 99 | |
100 | 100 | if ( ! $file_contents ) { |
101 | | return new WP_Error( 'error_loading_image', __( 'File doesn’t exist?' ), $this->file ); |
| 101 | return new WP_Error( 'error_loading_image', __( 'File does not exist?' ), $this->file ); |
102 | 102 | } |
103 | 103 | |
104 | 104 | // WebP may not work with imagecreatefromstring(). |
-
diff --git a/src/wp-includes/class-wp-image-editor-imagick.php b/src/wp-includes/class-wp-image-editor-imagick.php
index b7336fe5ae..e6280fdb4c 100644
a
|
b
|
class WP_Image_Editor_Imagick extends WP_Image_Editor { |
129 | 129 | } |
130 | 130 | |
131 | 131 | if ( ! is_file( $this->file ) && ! wp_is_stream( $this->file ) ) { |
132 | | return new WP_Error( 'error_loading_image', __( 'File doesn’t exist?' ), $this->file ); |
| 132 | return new WP_Error( 'error_loading_image', __( 'File does not exist?' ), $this->file ); |
133 | 133 | } |
134 | 134 | |
135 | 135 | /* |
-
diff --git a/src/wp-includes/class-wp-theme.php b/src/wp-includes/class-wp-theme.php
index d0607528b5..63312b2e0d 100644
a
|
b
|
final class WP_Theme implements ArrayAccess { |
280 | 280 | ) |
281 | 281 | ); |
282 | 282 | if ( ! file_exists( $this->theme_root ) ) { // Don't cache this one. |
283 | | $this->errors->add( 'theme_root_missing', __( 'Error: The themes directory is either empty or doesn’t exist. Please check your installation.' ) ); |
| 283 | $this->errors->add( 'theme_root_missing', __( 'Error: The themes directory is either empty or does not exist. Please check your installation.' ) ); |
284 | 284 | } |
285 | 285 | return; |
286 | 286 | } elseif ( ! is_readable( $this->theme_root . '/' . $theme_file ) ) { |
-
diff --git a/src/wp-includes/class-wp-xmlrpc-server.php b/src/wp-includes/class-wp-xmlrpc-server.php
index 93809422d5..5f3ba74beb 100644
a
|
b
|
class wp_xmlrpc_server extends IXR_Server { |
6894 | 6894 | } |
6895 | 6895 | } else { |
6896 | 6896 | // TODO: Attempt to extract a post ID from the given URL. |
6897 | | return $this->pingback_error( 33, __( 'The specified target URL cannot be used as a target. It either doesn’t exist, or it is not a pingback-enabled resource.' ) ); |
| 6897 | return $this->pingback_error( 33, __( 'The specified target URL cannot be used as a target. It either does not exist, or it is not a pingback-enabled resource.' ) ); |
6898 | 6898 | } |
6899 | 6899 | $post_ID = (int) $post_ID; |
6900 | 6900 | |
6901 | 6901 | $post = get_post( $post_ID ); |
6902 | 6902 | |
6903 | 6903 | if ( ! $post ) { // Post not found. |
6904 | | return $this->pingback_error( 33, __( 'The specified target URL cannot be used as a target. It either doesn’t exist, or it is not a pingback-enabled resource.' ) ); |
| 6904 | return $this->pingback_error( 33, __( 'The specified target URL cannot be used as a target. It either does not exist, or it is not a pingback-enabled resource.' ) ); |
6905 | 6905 | } |
6906 | 6906 | |
6907 | 6907 | if ( url_to_postid( $pagelinkedfrom ) == $post_ID ) { |
… |
… |
class wp_xmlrpc_server extends IXR_Server { |
6910 | 6910 | |
6911 | 6911 | // Check if pings are on. |
6912 | 6912 | if ( ! pings_open( $post ) ) { |
6913 | | return $this->pingback_error( 33, __( 'The specified target URL cannot be used as a target. It either doesn’t exist, or it is not a pingback-enabled resource.' ) ); |
| 6913 | return $this->pingback_error( 33, __( 'The specified target URL cannot be used as a target. It either does not exist, or it is not a pingback-enabled resource.' ) ); |
6914 | 6914 | } |
6915 | 6915 | |
6916 | 6916 | // Let's check that the remote site didn't already pingback this entry. |
… |
… |
class wp_xmlrpc_server extends IXR_Server { |
7075 | 7075 | $post_ID = url_to_postid( $url ); |
7076 | 7076 | if ( ! $post_ID ) { |
7077 | 7077 | // We aren't sure that the resource is available and/or pingback enabled. |
7078 | | return $this->pingback_error( 33, __( 'The specified target URL cannot be used as a target. It either doesn’t exist, or it is not a pingback-enabled resource.' ) ); |
| 7078 | return $this->pingback_error( 33, __( 'The specified target URL cannot be used as a target. It either does not exist, or it is not a pingback-enabled resource.' ) ); |
7079 | 7079 | } |
7080 | 7080 | |
7081 | 7081 | $actual_post = get_post( $post_ID, ARRAY_A ); |
-
diff --git a/src/wp-includes/customize/class-wp-customize-nav-menu-control.php b/src/wp-includes/customize/class-wp-customize-nav-menu-control.php
index 4c34077e25..a1558cdf5d 100644
a
|
b
|
class WP_Customize_Nav_Menu_Control extends WP_Customize_Control { |
43 | 43 | <?php |
44 | 44 | printf( |
45 | 45 | /* translators: %s: "Add Items" button text. */ |
46 | | __( 'Time to add some links! Click “%s” to start putting pages, categories, and custom links in your menu. Add as many things as you’d like.' ), |
| 46 | __( 'Time to add some links! Click “%s” to start putting pages, categories, and custom links in your menu. Add as many things as you would like.' ), |
47 | 47 | $add_items |
48 | 48 | ); |
49 | 49 | ?> |
-
diff --git a/src/wp-includes/customize/class-wp-customize-nav-menu-locations-control.php b/src/wp-includes/customize/class-wp-customize-nav-menu-locations-control.php
index 92125618ea..9a34aa1c0e 100644
a
|
b
|
class WP_Customize_Nav_Menu_Locations_Control extends WP_Customize_Control { |
61 | 61 | ?> |
62 | 62 | </p> |
63 | 63 | <# } else { #> |
64 | | <p><?php echo _x( 'Here’s where this menu appears. If you’d like to change that, pick another location.', 'menu locations' ); ?></p> |
| 64 | <p><?php echo _x( 'Here’s where this menu appears. If you would like to change that, pick another location.', 'menu locations' ); ?></p> |
65 | 65 | <# } #> |
66 | 66 | </li> |
67 | 67 | |
-
diff --git a/src/wp-includes/customize/class-wp-customize-theme-control.php b/src/wp-includes/customize/class-wp-customize-theme-control.php
index a0a705d545..1b942c7f6c 100644
a
|
b
|
class WP_Customize_Theme_Control extends WP_Customize_Control { |
113 | 113 | <?php |
114 | 114 | printf( |
115 | 115 | /* translators: %s: Theme name. */ |
116 | | __( 'There is a new version of %s available, but it doesn’t work with your versions of WordPress and PHP.' ), |
| 116 | __( 'There is a new version of %s available, but it does not work with your versions of WordPress and PHP.' ), |
117 | 117 | '{{{ data.theme.name }}}' |
118 | 118 | ); |
119 | 119 | if ( current_user_can( 'update_core' ) && current_user_can( 'update_php' ) ) { |
… |
… |
class WP_Customize_Theme_Control extends WP_Customize_Control { |
143 | 143 | <?php |
144 | 144 | printf( |
145 | 145 | /* translators: %s: Theme name. */ |
146 | | __( 'There is a new version of %s available, but it doesn’t work with your version of WordPress.' ), |
| 146 | __( 'There is a new version of %s available, but it does not work with your version of WordPress.' ), |
147 | 147 | '{{{ data.theme.name }}}' |
148 | 148 | ); |
149 | 149 | if ( current_user_can( 'update_core' ) ) { |
… |
… |
class WP_Customize_Theme_Control extends WP_Customize_Control { |
158 | 158 | <?php |
159 | 159 | printf( |
160 | 160 | /* translators: %s: Theme name. */ |
161 | | __( 'There is a new version of %s available, but it doesn’t work with your version of PHP.' ), |
| 161 | __( 'There is a new version of %s available, but it does not work with your version of PHP.' ), |
162 | 162 | '{{{ data.theme.name }}}' |
163 | 163 | ); |
164 | 164 | if ( current_user_can( 'update_php' ) ) { |
… |
… |
class WP_Customize_Theme_Control extends WP_Customize_Control { |
180 | 180 | <div class="notice notice-error notice-alt"><p> |
181 | 181 | <# if ( ! data.theme.compatibleWP && ! data.theme.compatiblePHP ) { #> |
182 | 182 | <?php |
183 | | _e( 'This theme doesn’t work with your versions of WordPress and PHP.' ); |
| 183 | _e( 'This theme does not work with your versions of WordPress and PHP.' ); |
184 | 184 | if ( current_user_can( 'update_core' ) && current_user_can( 'update_php' ) ) { |
185 | 185 | printf( |
186 | 186 | /* translators: 1: URL to WordPress Updates screen, 2: URL to Update PHP page. */ |
… |
… |
class WP_Customize_Theme_Control extends WP_Customize_Control { |
206 | 206 | ?> |
207 | 207 | <# } else if ( ! data.theme.compatibleWP ) { #> |
208 | 208 | <?php |
209 | | _e( 'This theme doesn’t work with your version of WordPress.' ); |
| 209 | _e( 'This theme does not work with your version of WordPress.' ); |
210 | 210 | if ( current_user_can( 'update_core' ) ) { |
211 | 211 | printf( |
212 | 212 | /* translators: %s: URL to WordPress Updates screen. */ |
… |
… |
class WP_Customize_Theme_Control extends WP_Customize_Control { |
217 | 217 | ?> |
218 | 218 | <# } else if ( ! data.theme.compatiblePHP ) { #> |
219 | 219 | <?php |
220 | | _e( 'This theme doesn’t work with your version of PHP.' ); |
| 220 | _e( 'This theme does not work with your version of PHP.' ); |
221 | 221 | if ( current_user_can( 'update_php' ) ) { |
222 | 222 | printf( |
223 | 223 | /* translators: %s: URL to Update PHP page. */ |
-
diff --git a/src/wp-includes/deprecated.php b/src/wp-includes/deprecated.php
index dcce1c1cea..a5e63e02cb 100644
a
|
b
|
function wp_load_image( $file ) { |
3192 | 3192 | |
3193 | 3193 | if ( ! is_file( $file ) ) { |
3194 | 3194 | /* translators: %s: File name. */ |
3195 | | return sprintf( __( 'File “%s” doesn’t exist?' ), $file ); |
| 3195 | return sprintf( __( 'File “%s” does not exist?' ), $file ); |
3196 | 3196 | } |
3197 | 3197 | |
3198 | 3198 | if ( ! function_exists('imagecreatefromstring') ) |
-
diff --git a/src/wp-includes/ms-load.php b/src/wp-includes/ms-load.php
index d48df035d6..ac441085f0 100644
a
|
b
|
function ms_not_installed( $domain, $path ) { |
495 | 495 | __( 'Read the <a href="%s" target="_blank">Debugging a WordPress Network</a> article. Some of the suggestions there may help you figure out what went wrong.' ), |
496 | 496 | __( 'https://wordpress.org/support/article/debugging-a-wordpress-network/' ) |
497 | 497 | ); |
498 | | $msg .= ' ' . __( 'If you’re still stuck with this message, then check that your database contains the following tables:' ) . '</p><ul>'; |
| 498 | $msg .= ' ' . __( 'If you are still stuck with this message, then check that your database contains the following tables:' ) . '</p><ul>'; |
499 | 499 | foreach ( $wpdb->tables( 'global' ) as $t => $table ) { |
500 | 500 | if ( 'sitecategories' === $t ) { |
501 | 501 | continue; |
-
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php
index e3e5d935d7..a38760fed0 100644
a
|
b
|
class WP_REST_Users_Controller extends WP_REST_Controller { |
732 | 732 | if ( ! empty( $request['username'] ) && $request['username'] !== $user->user_login ) { |
733 | 733 | return new WP_Error( |
734 | 734 | 'rest_user_invalid_argument', |
735 | | __( "Username isn't editable." ), |
| 735 | __( "Username is not editable." ), |
736 | 736 | array( 'status' => 400 ) |
737 | 737 | ); |
738 | 738 | } |
-
diff --git a/src/wp-includes/rss.php b/src/wp-includes/rss.php
index 6bddad89d3..c55417728a 100644
a
|
b
|
class RSSCache { |
761 | 761 | |
762 | 762 | if ( ! $rss = get_transient( $cache_option ) ) { |
763 | 763 | $this->debug( |
764 | | "Cache doesn't contain: $url (cache option: $cache_option)" |
| 764 | "Cache does not contain: $url (cache option: $cache_option)" |
765 | 765 | ); |
766 | 766 | return 0; |
767 | 767 | } |
-
diff --git a/src/wp-includes/script-loader.php b/src/wp-includes/script-loader.php
index 5523ec76d2..d64d9d2180 100644
a
|
b
|
function wp_default_scripts( $scripts ) { |
1192 | 1192 | 'takenOverMessage' => __( '%s has taken over and is currently customizing.' ), |
1193 | 1193 | /* translators: %s: URL to the Customizer to load the autosaved version. */ |
1194 | 1194 | 'autosaveNotice' => __( 'There is a more recent autosave of your changes than the one you are previewing. <a href="%s">Restore the autosave</a>' ), |
1195 | | 'videoHeaderNotice' => __( 'This theme doesn’t support video headers on this page. Navigate to the front page or another page that supports video headers.' ), |
| 1195 | 'videoHeaderNotice' => __( 'This theme does not support video headers on this page. Navigate to the front page or another page that supports video headers.' ), |
1196 | 1196 | // Used for overriding the file types allowed in Plupload. |
1197 | 1197 | 'allowedFiles' => __( 'Allowed Files' ), |
1198 | 1198 | 'customCssError' => array( |
… |
… |
function wp_default_scripts( $scripts ) { |
1211 | 1211 | // @todo This is lacking, as some languages have a dedicated dual form. For proper handling of plurals in JS, see #20491. |
1212 | 1212 | ), |
1213 | 1213 | 'scheduleDescription' => __( 'Schedule your customization changes to publish ("go live") at a future date.' ), |
1214 | | 'themePreviewUnavailable' => __( 'Sorry, you can’t preview new themes when you have changes scheduled or saved as a draft. Please publish your changes, or wait until they publish to preview new themes.' ), |
| 1214 | 'themePreviewUnavailable' => __( 'Sorry, you can not preview new themes when you have changes scheduled or saved as a draft. Please publish your changes, or wait until they publish to preview new themes.' ), |
1215 | 1215 | 'themeInstallUnavailable' => sprintf( |
1216 | 1216 | /* translators: %s: URL to Add Themes admin screen. */ |
1217 | | __( 'You won’t be able to install new themes from here yet since your install requires SFTP credentials. For now, please <a href="%s">add themes in the admin</a>.' ), |
| 1217 | __( 'You will not be able to install new themes from here yet since your install requires SFTP credentials. For now, please <a href="%s">add themes in the admin</a>.' ), |
1218 | 1218 | esc_url( admin_url( 'theme-install.php' ) ) |
1219 | 1219 | ), |
1220 | 1220 | 'publishSettings' => __( 'Publish Settings' ), |
-
diff --git a/src/wp-includes/theme-compat/embed-404.php b/src/wp-includes/theme-compat/embed-404.php
index 29b2b1a1a8..6a4f3e8660 100644
a
|
b
|
|
11 | 11 | */ |
12 | 12 | ?> |
13 | 13 | <div class="wp-embed"> |
14 | | <p class="wp-embed-heading"><?php _e( 'Oops! That embed can’t be found.' ); ?></p> |
| 14 | <p class="wp-embed-heading"><?php _e( 'Oops! That embed can not be found.' ); ?></p> |
15 | 15 | |
16 | 16 | <div class="wp-embed-excerpt"> |
17 | 17 | <p> |
-
diff --git a/src/wp-includes/user.php b/src/wp-includes/user.php
index 018c960c03..470499c472 100644
a
|
b
|
function register_new_user( $user_login, $user_email ) { |
2987 | 2987 | if ( '' === $user_email ) { |
2988 | 2988 | $errors->add( 'empty_email', __( '<strong>Error</strong>: Please type your email address.' ) ); |
2989 | 2989 | } elseif ( ! is_email( $user_email ) ) { |
2990 | | $errors->add( 'invalid_email', __( '<strong>Error</strong>: The email address isn’t correct.' ) ); |
| 2990 | $errors->add( 'invalid_email', __( '<strong>Error</strong>: The email address is not correct.' ) ); |
2991 | 2991 | $user_email = ''; |
2992 | 2992 | } elseif ( email_exists( $user_email ) ) { |
2993 | 2993 | $errors->add( 'email_exists', __( '<strong>Error</strong>: This email is already registered. Please choose another one.' ) ); |
… |
… |
function register_new_user( $user_login, $user_email ) { |
3035 | 3035 | 'registerfail', |
3036 | 3036 | sprintf( |
3037 | 3037 | /* translators: %s: Admin email address. */ |
3038 | | __( '<strong>Error</strong>: Couldn’t register you… please contact the <a href="mailto:%s">site admin</a>!' ), |
| 3038 | __( '<strong>Error</strong>: Could not register you… please contact the <a href="mailto:%s">site admin</a>!' ), |
3039 | 3039 | get_option( 'admin_email' ) |
3040 | 3040 | ) |
3041 | 3041 | ); |
… |
… |
function send_confirmation_on_profile_email() { |
3271 | 3271 | if ( ! is_email( $_POST['email'] ) ) { |
3272 | 3272 | $errors->add( |
3273 | 3273 | 'user_email', |
3274 | | __( '<strong>Error</strong>: The email address isn’t correct.' ), |
| 3274 | __( '<strong>Error</strong>: The email address is not correct.' ), |
3275 | 3275 | array( |
3276 | 3276 | 'form-field' => 'email', |
3277 | 3277 | ) |
-
diff --git a/src/wp-includes/widgets/class-wp-widget-media-audio.php b/src/wp-includes/widgets/class-wp-widget-media-audio.php
index 5445746eec..d0e8f59fd2 100644
a
|
b
|
class WP_Widget_Media_Audio extends WP_Widget_Media { |
41 | 41 | 'edit_media' => _x( 'Edit Audio', 'label for button in the audio widget; should preferably not be longer than ~13 characters long' ), |
42 | 42 | 'missing_attachment' => sprintf( |
43 | 43 | /* translators: %s: URL to media library. */ |
44 | | __( 'We can’t find that audio file. Check your <a href="%s">media library</a> and make sure it wasn’t deleted.' ), |
| 44 | __( 'We can not find that audio file. Check your <a href="%s">media library</a> and make sure it was not deleted.' ), |
45 | 45 | esc_url( admin_url( 'upload.php' ) ) |
46 | 46 | ), |
47 | 47 | /* translators: %d: Widget count. */ |
48 | 48 | 'media_library_state_multi' => _n_noop( 'Audio Widget (%d)', 'Audio Widget (%d)' ), |
49 | 49 | 'media_library_state_single' => __( 'Audio Widget' ), |
50 | | 'unsupported_file_type' => __( 'Looks like this isn’t the correct kind of file. Please link to an audio file instead.' ), |
| 50 | 'unsupported_file_type' => __( 'Looks like this is not the correct kind of file. Please link to an audio file instead.' ), |
51 | 51 | ) |
52 | 52 | ); |
53 | 53 | } |
-
diff --git a/src/wp-includes/widgets/class-wp-widget-media-image.php b/src/wp-includes/widgets/class-wp-widget-media-image.php
index 5ce3c9019a..d1ae4ff3a3 100644
a
|
b
|
class WP_Widget_Media_Image extends WP_Widget_Media { |
41 | 41 | 'edit_media' => _x( 'Edit Image', 'label for button in the image widget; should preferably not be longer than ~13 characters long' ), |
42 | 42 | 'missing_attachment' => sprintf( |
43 | 43 | /* translators: %s: URL to media library. */ |
44 | | __( 'We can’t find that image. Check your <a href="%s">media library</a> and make sure it wasn’t deleted.' ), |
| 44 | __( 'We can not find that image. Check your <a href="%s">media library</a> and make sure it was not deleted.' ), |
45 | 45 | esc_url( admin_url( 'upload.php' ) ) |
46 | 46 | ), |
47 | 47 | /* translators: %d: Widget count. */ |
-
diff --git a/src/wp-includes/widgets/class-wp-widget-media-video.php b/src/wp-includes/widgets/class-wp-widget-media-video.php
index 993af35a65..7defb930eb 100644
a
|
b
|
class WP_Widget_Media_Video extends WP_Widget_Media { |
41 | 41 | 'edit_media' => _x( 'Edit Video', 'label for button in the video widget; should preferably not be longer than ~13 characters long' ), |
42 | 42 | 'missing_attachment' => sprintf( |
43 | 43 | /* translators: %s: URL to media library. */ |
44 | | __( 'We can’t find that video. Check your <a href="%s">media library</a> and make sure it wasn’t deleted.' ), |
| 44 | __( 'We can not find that video. Check your <a href="%s">media library</a> and make sure it was not deleted.' ), |
45 | 45 | esc_url( admin_url( 'upload.php' ) ) |
46 | 46 | ), |
47 | 47 | /* translators: %d: Widget count. */ |
48 | 48 | 'media_library_state_multi' => _n_noop( 'Video Widget (%d)', 'Video Widget (%d)' ), |
49 | 49 | 'media_library_state_single' => __( 'Video Widget' ), |
50 | 50 | /* translators: %s: A list of valid video file extensions. */ |
51 | | 'unsupported_file_type' => sprintf( __( 'Sorry, we can’t load the video at the supplied URL. Please check that the URL is for a supported video file (%s) or stream (e.g. YouTube and Vimeo).' ), '<code>.' . implode( '</code>, <code>.', wp_get_video_extensions() ) . '</code>' ), |
| 51 | 'unsupported_file_type' => sprintf( __( 'Sorry, we can not load the video at the supplied URL. Please check that the URL is for a supported video file (%s) or stream (e.g. YouTube and Vimeo).' ), '<code>.' . implode( '</code>, <code>.', wp_get_video_extensions() ) . '</code>' ), |
52 | 52 | ) |
53 | 53 | ); |
54 | 54 | } |
-
diff --git a/src/wp-includes/widgets/class-wp-widget-media.php b/src/wp-includes/widgets/class-wp-widget-media.php
index cd633e2908..200f83fd99 100644
a
|
b
|
abstract class WP_Widget_Media extends WP_Widget { |
74 | 74 | 'add_to_widget' => __( 'Add to Widget' ), |
75 | 75 | 'missing_attachment' => sprintf( |
76 | 76 | /* translators: %s: URL to media library. */ |
77 | | __( 'We can’t find that file. Check your <a href="%s">media library</a> and make sure it wasn’t deleted.' ), |
| 77 | __( 'We can not find that file. Check your <a href="%s">media library</a> and make sure it was not deleted.' ), |
78 | 78 | esc_url( admin_url( 'upload.php' ) ) |
79 | 79 | ), |
80 | 80 | /* translators: %d: Widget count. */ |
81 | 81 | 'media_library_state_multi' => _n_noop( 'Media Widget (%d)', 'Media Widget (%d)' ), |
82 | 82 | 'media_library_state_single' => __( 'Media Widget' ), |
83 | | 'unsupported_file_type' => __( 'Looks like this isn’t the correct kind of file. Please link to an appropriate file instead.' ), |
| 83 | 'unsupported_file_type' => __( 'Looks like this is not the correct kind of file. Please link to an appropriate file instead.' ), |
84 | 84 | ); |
85 | 85 | $this->l10n = array_merge( $l10n_defaults, array_filter( $this->l10n ) ); |
86 | 86 | |
-
diff --git a/src/wp-includes/widgets/class-wp-widget-text.php b/src/wp-includes/widgets/class-wp-widget-text.php
index f3e479819d..7f28205c45 100644
a
|
b
|
class WP_Widget_Text extends WP_Widget { |
496 | 496 | <?php if ( ! isset( $instance['visual'] ) ) : ?> |
497 | 497 | <p><?php _e( 'This widget may contain code that may work better in the “Custom HTML” widget. How about trying that widget instead?' ); ?></p> |
498 | 498 | <?php else : ?> |
499 | | <p><?php _e( 'This widget may have contained code that may work better in the “Custom HTML” widget. If you haven’t yet, how about trying that widget instead?' ); ?></p> |
| 499 | <p><?php _e( 'This widget may have contained code that may work better in the “Custom HTML” widget. If you have not yet, how about trying that widget instead?' ); ?></p> |
500 | 500 | <?php endif; ?> |
501 | 501 | </div> |
502 | 502 | <p> |
-
diff --git a/src/wp-includes/wp-db.php b/src/wp-includes/wp-db.php
index 53ba207203..bbe5213b34 100644
a
|
b
|
class wpdb { |
1166 | 1166 | if ( ! did_action( 'template_redirect' ) ) { |
1167 | 1167 | wp_load_translations_early(); |
1168 | 1168 | |
1169 | | $message = '<h1>' . __( 'Can’t select database' ) . "</h1>\n"; |
| 1169 | $message = '<h1>' . __( 'Can not select database' ) . "</h1>\n"; |
1170 | 1170 | |
1171 | 1171 | $message .= '<p>' . sprintf( |
1172 | 1172 | /* translators: %s: Database name. */ |
… |
… |
class wpdb { |
1194 | 1194 | |
1195 | 1195 | $message .= '<p>' . sprintf( |
1196 | 1196 | /* translators: %s: Support forums URL. */ |
1197 | | __( 'If you don’t know how to set up a database you should <strong>contact your host</strong>. If all else fails you may find help at the <a href="%s">WordPress Support Forums</a>.' ), |
| 1197 | __( 'If you do not know how to set up a database you should <strong>contact your host</strong>. If all else fails you may find help at the <a href="%s">WordPress Support Forums</a>.' ), |
1198 | 1198 | __( 'https://wordpress.org/support/forums/' ) |
1199 | 1199 | ) . "</p>\n"; |
1200 | 1200 | |
… |
… |
class wpdb { |
1785 | 1785 | |
1786 | 1786 | $message .= '<p>' . sprintf( |
1787 | 1787 | /* translators: 1: wp-config.php, 2: Database host. */ |
1788 | | __( 'This either means that the username and password information in your %1$s file is incorrect or we can’t contact the database server at %2$s. This could mean your host’s database server is down.' ), |
| 1788 | __( 'This either means that the username and password information in your %1$s file is incorrect or we can not contact the database server at %2$s. This could mean your host’s database server is down.' ), |
1789 | 1789 | '<code>wp-config.php</code>', |
1790 | 1790 | '<code>' . htmlspecialchars( $this->dbhost, ENT_QUOTES ) . '</code>' |
1791 | 1791 | ) . "</p>\n"; |
… |
… |
class wpdb { |
1798 | 1798 | |
1799 | 1799 | $message .= '<p>' . sprintf( |
1800 | 1800 | /* translators: %s: Support forums URL. */ |
1801 | | __( 'If you’re unsure what these terms mean you should probably contact your host. If you still need help you can always visit the <a href="%s">WordPress Support Forums</a>.' ), |
| 1801 | __( 'If you are unsure what these terms mean you should probably contact your host. If you still need help you can always visit the <a href="%s">WordPress Support Forums</a>.' ), |
1802 | 1802 | __( 'https://wordpress.org/support/forums/' ) |
1803 | 1803 | ) . "</p>\n"; |
1804 | 1804 | |
… |
… |
class wpdb { |
1955 | 1955 | |
1956 | 1956 | $message .= '<p>' . sprintf( |
1957 | 1957 | /* translators: %s: Support forums URL. */ |
1958 | | __( 'If you’re unsure what these terms mean you should probably contact your host. If you still need help you can always visit the <a href="%s">WordPress Support Forums</a>.' ), |
| 1958 | __( 'If you are unsure what these terms mean you should probably contact your host. If you still need help you can always visit the <a href="%s">WordPress Support Forums</a>.' ), |
1959 | 1959 | __( 'https://wordpress.org/support/forums/' ) |
1960 | 1960 | ) . "</p>\n"; |
1961 | 1961 | |
-
diff --git a/src/wp-mail.php b/src/wp-mail.php
index c3f921ad69..d3a86352f2 100644
a
|
b
|
if ( false === $count ) { |
62 | 62 | |
63 | 63 | if ( 0 === $count ) { |
64 | 64 | $pop3->quit(); |
65 | | wp_die( __( 'There doesn’t seem to be any new mail.' ) ); |
| 65 | wp_die( __( 'There does not seem to be any new mail.' ) ); |
66 | 66 | } |
67 | 67 | |
68 | 68 | for ( $i = 1; $i <= $count; $i++ ) { |
-
diff --git a/src/wp-signup.php b/src/wp-signup.php
index 375dad9517..b6fdb5013c 100644
a
|
b
|
function signup_another_blog( $blogname = '', $blog_title = '', $errors = '' ) { |
373 | 373 | </ul> |
374 | 374 | <?php } ?> |
375 | 375 | |
376 | | <p><?php _e( 'If you’re not going to use a great site domain, leave it for a new user. Now have at it!' ); ?></p> |
| 376 | <p><?php _e( 'If you are not going to use a great site domain, leave it for a new user. Now have at it!' ); ?></p> |
377 | 377 | <form id="setupform" method="post" action="wp-signup.php"> |
378 | 378 | <input type="hidden" name="stage" value="gimmeanotherblog" /> |
379 | 379 | <?php |
… |
… |
function confirm_blog_signup( $domain, $path, $blog_title, $user_name = '', $use |
842 | 842 | <p><?php _e( 'If you do not activate your site within two days, you will have to sign up again.' ); ?></p> |
843 | 843 | <h2><?php _e( 'Still waiting for your email?' ); ?></h2> |
844 | 844 | <p> |
845 | | <?php _e( 'If you haven’t received your email yet, there are a number of things you can do:' ); ?> |
| 845 | <?php _e( 'If you have not received your email yet, there are a number of things you can do:' ); ?> |
846 | 846 | <ul id="noemail-tips"> |
847 | 847 | <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> |
848 | 848 | <li><p><?php _e( 'Check the junk or spam folder of your email client. Sometime emails wind up there by mistake.' ); ?></p></li> |
-
diff --git a/tests/phpunit/data/feed/wordpress-org-news.xml b/tests/phpunit/data/feed/wordpress-org-news.xml
index f18fa21882..1173c71bd7 100644
a
|
b
|
|
365 | 365 | |
366 | 366 | |
367 | 367 | |
368 | | <p>A Question and Answer period with pre-recorded videos will follow State of the Word. To take part, record a video of you asking your question to Matt on your computer or phone (landscape format, please). Don’t forget to include your name and how you use WordPress! Try to keep your video to under a minute so Matt can answer as many questions as possible.</p> |
| 368 | <p>A Question and Answer period with pre-recorded videos will follow State of the Word. To take part, record a video of you asking your question to Matt on your computer or phone (landscape format, please). Do not forget to include your name and how you use WordPress! Try to keep your video to under a minute so Matt can answer as many questions as possible.</p> |
369 | 369 | |
370 | 370 | |
371 | 371 | |
… |
… |
|
528 | 528 | |
529 | 529 | |
530 | 530 | |
531 | | <p><em><strong>Think you found a bug?</strong> Post it to the <a href="https://wordpress.org/support/forum/alphabeta">Alpha/Beta area</a> in the support forums. We would love to hear from you! If you’re comfortable writing a reproducible bug report you can <a href="https://make.wordpress.org/core/reports/">file one on WordPress Trac</a>. Don’t forget to check <a href="https://core.trac.wordpress.org/tickets/major">the list of known bugs</a></em>!</p> |
| 531 | <p><em><strong>Think you found a bug?</strong> Post it to the <a href="https://wordpress.org/support/forum/alphabeta">Alpha/Beta area</a> in the support forums. We would love to hear from you! If you’re comfortable writing a reproducible bug report you can <a href="https://make.wordpress.org/core/reports/">file one on WordPress Trac</a>. Do not forget to check <a href="https://core.trac.wordpress.org/tickets/major">the list of known bugs</a></em>!</p> |
532 | 532 | ]]></content:encoded> |
533 | 533 | |
534 | 534 | |
-
diff --git a/tests/phpunit/tests/ajax/ReplytoComment.php b/tests/phpunit/tests/ajax/ReplytoComment.php
index 0d98a98a39..40426ba14a 100644
a
|
b
|
class Tests_Ajax_ReplytoComment extends WP_Ajax_UnitTestCase { |
186 | 186 | |
187 | 187 | // Make the request. |
188 | 188 | $this->expectException( 'WPAjaxDieStopException' ); |
189 | | $this->expectExceptionMessage( 'Error: You can’t reply to a comment on a draft post.' ); |
| 189 | $this->expectExceptionMessage( 'Error: You can not reply to a comment on a draft post.' ); |
190 | 190 | $this->_handleAjax( 'replyto-comment' ); |
191 | 191 | } |
192 | 192 | |
-
diff --git a/tests/phpunit/tests/formatting/wpTexturize.php b/tests/phpunit/tests/formatting/wpTexturize.php
index 8ac9bb3784..6dbfc8a641 100644
a
|
b
|
class Tests_Formatting_wpTexturize extends WP_UnitTestCase { |
76 | 76 | */ |
77 | 77 | public function test_full_sentences_with_unmatched_single_quotes() { |
78 | 78 | $this->assertSame( |
79 | | 'That means every moment you’re working on something without it being in the public it’s actually dying.', |
| 79 | 'That means every moment you are working on something without it being in the public it’s actually dying.', |
80 | 80 | wptexturize( "That means every moment you're working on something without it being in the public it's actually dying." ) |
81 | 81 | ); |
82 | 82 | } |
-
diff --git a/tests/phpunit/tests/oembed/template.php b/tests/phpunit/tests/oembed/template.php
index b330ae70cf..25648f4e30 100644
a
|
b
|
class Tests_Embed_Template extends WP_UnitTestCase { |
32 | 32 | |
33 | 33 | $doc = new DOMDocument(); |
34 | 34 | $this->assertTrue( $doc->loadHTML( $actual ) ); |
35 | | $this->assertStringNotContainsString( 'That embed can’t be found.', $actual ); |
| 35 | $this->assertStringNotContainsString( 'That embed can not be found.', $actual ); |
36 | 36 | $this->assertStringContainsString( 'Hello World', $actual ); |
37 | 37 | } |
38 | 38 | |
… |
… |
class Tests_Embed_Template extends WP_UnitTestCase { |
64 | 64 | |
65 | 65 | $doc = new DOMDocument(); |
66 | 66 | $this->assertTrue( $doc->loadHTML( $actual ) ); |
67 | | $this->assertStringNotContainsString( 'That embed can’t be found.', $actual ); |
| 67 | $this->assertStringNotContainsString( 'That embed can not be found.', $actual ); |
68 | 68 | $this->assertStringContainsString( 'Hello World', $actual ); |
69 | 69 | $this->assertStringContainsString( 'canola.jpg', $actual ); |
70 | 70 | } |
… |
… |
class Tests_Embed_Template extends WP_UnitTestCase { |
81 | 81 | |
82 | 82 | $doc = new DOMDocument(); |
83 | 83 | $this->assertTrue( $doc->loadHTML( $actual ) ); |
84 | | $this->assertStringContainsString( 'That embed can’t be found.', $actual ); |
| 84 | $this->assertStringContainsString( 'That embed can not be found.', $actual ); |
85 | 85 | } |
86 | 86 | |
87 | 87 | public function test_oembed_output_attachment() { |
… |
… |
class Tests_Embed_Template extends WP_UnitTestCase { |
108 | 108 | |
109 | 109 | $doc = new DOMDocument(); |
110 | 110 | $this->assertTrue( $doc->loadHTML( $actual ) ); |
111 | | $this->assertStringNotContainsString( 'That embed can’t be found.', $actual ); |
| 111 | $this->assertStringNotContainsString( 'That embed can not be found.', $actual ); |
112 | 112 | $this->assertStringContainsString( 'Hello World', $actual ); |
113 | 113 | $this->assertStringContainsString( 'canola.jpg', $actual ); |
114 | 114 | } |
… |
… |
class Tests_Embed_Template extends WP_UnitTestCase { |
133 | 133 | |
134 | 134 | $doc = new DOMDocument(); |
135 | 135 | $this->assertTrue( $doc->loadHTML( $actual ) ); |
136 | | $this->assertStringContainsString( 'That embed can’t be found.', $actual ); |
| 136 | $this->assertStringContainsString( 'That embed can not be found.', $actual ); |
137 | 137 | } |
138 | 138 | |
139 | 139 | public function test_oembed_output_scheduled_post() { |
… |
… |
class Tests_Embed_Template extends WP_UnitTestCase { |
157 | 157 | |
158 | 158 | $doc = new DOMDocument(); |
159 | 159 | $this->assertTrue( $doc->loadHTML( $actual ) ); |
160 | | $this->assertStringContainsString( 'That embed can’t be found.', $actual ); |
| 160 | $this->assertStringContainsString( 'That embed can not be found.', $actual ); |
161 | 161 | } |
162 | 162 | |
163 | 163 | public function test_oembed_output_private_post() { |
… |
… |
class Tests_Embed_Template extends WP_UnitTestCase { |
180 | 180 | |
181 | 181 | $doc = new DOMDocument(); |
182 | 182 | $this->assertTrue( $doc->loadHTML( $actual ) ); |
183 | | $this->assertStringContainsString( 'That embed can’t be found.', $actual ); |
| 183 | $this->assertStringContainsString( 'That embed can not be found.', $actual ); |
184 | 184 | } |
185 | 185 | |
186 | 186 | public function test_oembed_output_private_post_with_permissions() { |
… |
… |
class Tests_Embed_Template extends WP_UnitTestCase { |
207 | 207 | |
208 | 208 | $doc = new DOMDocument(); |
209 | 209 | $this->assertTrue( $doc->loadHTML( $actual ) ); |
210 | | $this->assertStringNotContainsString( 'That embed can’t be found.', $actual ); |
| 210 | $this->assertStringNotContainsString( 'That embed can not be found.', $actual ); |
211 | 211 | $this->assertStringContainsString( 'Hello World', $actual ); |
212 | 212 | } |
213 | 213 | |
-
diff --git a/tests/phpunit/tests/post/output.php b/tests/phpunit/tests/post/output.php
index 5af6e05837..9f08f12d1c 100644
a
|
b
|
EOF; |
112 | 112 | <p class='graf'>another graf with whitespace</p> |
113 | 113 | |
114 | 114 | <p>An <p class='graf'>inline graf</p> |
115 | | , this doesn’t make much sense.</p> |
| 115 | , this does not make much sense.</p> |
116 | 116 | <p>A graf with a single EOL first:<br /> |
117 | 117 | <p class='graf'>blah</p> |
118 | 118 | </p> |
-
diff --git a/tests/qunit/index.html b/tests/qunit/index.html
index dd3fb68224..52a65ccaae 100644
a
|
b
|
|
121 | 121 | wp.mediaWidgets.modelConstructors[ "media_image" ].prototype.schema = {"attachment_id":{"type":"integer","default":0,"minimum":0,"media_prop":"id"},"url":{"type":"string","default":"","format":"uri"},"title":{"type":"string","default":"","should_preview_update":false},"size":{"type":"string","default":"medium","enum":["thumbnail","medium","medium_large","large","twentyseventeen-featured-image","twentyseventeen-thumbnail-avatar","full","custom"]},"width":{"type":"integer","default":0,"minimum":0},"height":{"type":"integer","default":0,"minimum":0},"caption":{"type":"string","default":"","should_preview_update":false},"alt":{"type":"string","default":""},"link_type":{"type":"string","default":"none","enum":["none","file","post","custom"],"media_prop":"link","should_preview_update":false},"link_url":{"type":"string","default":"","format":"uri","media_prop":"linkUrl","should_preview_update":false},"image_classes":{"type":"string","default":"","media_prop":"extraClasses","should_preview_update":false},"link_classes":{"type":"string","default":"","media_prop":"linkClassName","should_preview_update":false},"link_rel":{"type":"string","default":"","media_prop":"linkRel","should_preview_update":false},"link_target_blank":{"type":"boolean","default":false,"media_prop":"linkTargetBlank","should_preview_update":false},"image_title":{"type":"string","default":"","media_prop":"title","should_preview_update":false}}; |
122 | 122 | |
123 | 123 | wp.mediaWidgets.controlConstructors[ "media_image" ].prototype.mime_type = "image"; |
124 | | _.extend( wp.mediaWidgets.controlConstructors[ "media_image" ].prototype.l10n, {"no_media_selected":"No image selected","select_media":"Select Image","change_media":"Change Image","edit_media":"Edit Image","add_to_widget":"Add to Widget","missing_attachment":"We can’t find that image. Check your <a href=\"http:\/\/src.wordpress-develop.dev\/wp-admin\/upload.php\">media library<\/a> and make sure it wasn’t deleted.","media_library_state_multi":{"0":"Image Widget (%d)","1":"Image Widget (%d)","singular":"Image Widget (%d)","plural":"Image Widget (%d)","context":null,"domain":null},"media_library_state_single":"Image Widget"} ); |
| 124 | _.extend( wp.mediaWidgets.controlConstructors[ "media_image" ].prototype.l10n, {"no_media_selected":"No image selected","select_media":"Select Image","change_media":"Change Image","edit_media":"Edit Image","add_to_widget":"Add to Widget","missing_attachment":"We can not find that image. Check your <a href=\"http:\/\/src.wordpress-develop.dev\/wp-admin\/upload.php\">media library<\/a> and make sure it was not deleted.","media_library_state_multi":{"0":"Image Widget (%d)","1":"Image Widget (%d)","singular":"Image Widget (%d)","plural":"Image Widget (%d)","context":null,"domain":null},"media_library_state_single":"Image Widget"} ); |
125 | 125 | </script> |
126 | 126 | <script src="../../build/wp-admin/js/widgets/media-video-widget.js"></script> |
127 | 127 | <script> |
128 | 128 | wp.mediaWidgets.modelConstructors[ "media_video" ].prototype.schema = {"attachment_id":{"type":"integer","default":0,"minimum":0,"media_prop":"id"},"url":{"type":"string","default":"","format":"uri"},"title":{"type":"string","default":""},"preload":{"type":"string","default":"metadata","enum":["none","auto","metadata"]},"loop":{"type":"boolean","default":false},"content":{"type":"string","default":""},"mp4":{"type":"string","default":"","format":"uri"},"m4v":{"type":"string","default":"","format":"uri"},"webm":{"type":"string","default":"","format":"uri"},"ogv":{"type":"string","default":"","format":"uri"},"wmv":{"type":"string","default":"","format":"uri"},"flv":{"type":"string","default":"","format":"uri"}}; |
129 | 129 | |
130 | 130 | wp.mediaWidgets.controlConstructors[ "media_video" ].prototype.mime_type = "video"; |
131 | | _.extend( wp.mediaWidgets.controlConstructors[ "media_video" ].prototype.l10n, {"no_media_selected":"No video selected","select_media":"Select Video","change_media":"Change Video","edit_media":"Edit Video","add_to_widget":"Add to Widget","missing_attachment":"We can’t find that video. Check your <a href=\"http:\/\/src.wordpress-develop.dev\/wp-admin\/upload.php\">media library<\/a> and make sure it wasn’t deleted.","media_library_state_multi":{"0":"Video Widget (%d)","1":"Video Widget (%d)","singular":"Video Widget (%d)","plural":"Video Widget (%d)","context":null,"domain":null},"media_library_state_single":"Video Widget"} ); |
| 131 | _.extend( wp.mediaWidgets.controlConstructors[ "media_video" ].prototype.l10n, {"no_media_selected":"No video selected","select_media":"Select Video","change_media":"Change Video","edit_media":"Edit Video","add_to_widget":"Add to Widget","missing_attachment":"We can not find that video. Check your <a href=\"http:\/\/src.wordpress-develop.dev\/wp-admin\/upload.php\">media library<\/a> and make sure it was not deleted.","media_library_state_multi":{"0":"Video Widget (%d)","1":"Video Widget (%d)","singular":"Video Widget (%d)","plural":"Video Widget (%d)","context":null,"domain":null},"media_library_state_single":"Video Widget"} ); |
132 | 132 | </script> |
133 | 133 | <script src="../../build/wp-admin/js/widgets/media-audio-widget.js"></script> |
134 | 134 | <script> |
135 | 135 | wp.mediaWidgets.modelConstructors[ "media_audio" ].prototype.schema = {"attachment_id":{"type":"integer","default":0,"minimum":0,"media_prop":"id"},"url":{"type":"string","default":"","format":"uri"},"title":{"type":"string","default":""},"preload":{"type":"string","default":"none","enum":["none","auto","metadata"]},"loop":{"type":"boolean","default":false},"mp3":{"type":"string","default":"","format":"uri"},"ogg":{"type":"string","default":"","format":"uri"},"wma":{"type":"string","default":"","format":"uri"},"m4a":{"type":"string","default":"","format":"uri"},"wav":{"type":"string","default":"","format":"uri"}}; |
136 | 136 | |
137 | 137 | wp.mediaWidgets.controlConstructors[ "media_audio" ].prototype.mime_type = "audio"; |
138 | | _.extend( wp.mediaWidgets.controlConstructors[ "media_audio" ].prototype.l10n, {"no_media_selected":"No audio selected","select_media":"Select File","change_media":"Change Audio","edit_media":"Edit Audio","add_to_widget":"Add to Widget","missing_attachment":"We can’t find that audio file. Check your <a href=\"http:\/\/src.wordpress-develop.dev\/wp-admin\/upload.php\">media library<\/a> and make sure it wasn’t deleted.","media_library_state_multi":{"0":"Audio Widget (%d)","1":"Audio Widget (%d)","singular":"Audio Widget (%d)","plural":"Audio Widget (%d)","context":null,"domain":null},"media_library_state_single":"Audio Widget"} ); |
| 138 | _.extend( wp.mediaWidgets.controlConstructors[ "media_audio" ].prototype.l10n, {"no_media_selected":"No audio selected","select_media":"Select File","change_media":"Change Audio","edit_media":"Edit Audio","add_to_widget":"Add to Widget","missing_attachment":"We can not find that audio file. Check your <a href=\"http:\/\/src.wordpress-develop.dev\/wp-admin\/upload.php\">media library<\/a> and make sure it was not deleted.","media_library_state_multi":{"0":"Audio Widget (%d)","1":"Audio Widget (%d)","singular":"Audio Widget (%d)","plural":"Audio Widget (%d)","context":null,"domain":null},"media_library_state_single":"Audio Widget"} ); |
139 | 139 | </script> |
140 | 140 | <script type='text/javascript' src='../../build/wp-admin/js/widgets/media-gallery-widget.js'></script> |
141 | 141 | <script type='text/javascript'> |
142 | 142 | wp.mediaWidgets.modelConstructors[ "media_gallery" ].prototype.schema = {"title":{"type":"string","default":"","should_preview_update":false},"ids":{"type":"string","default":""},"columns":{"type":"integer","default":3},"size":{"type":"string","default":"thumbnail","enum":["thumbnail","medium","medium_large","large","post-thumbnail","full","custom"]},"link_type":{"type":"string","default":"none","enum":["none","file","post"],"media_prop":"link","should_preview_update":false},"orderby_random":{"type":"boolean","default":false,"media_prop":"_orderbyRandom","should_preview_update":false},"attachments":{"type":"string","default":""}}; |
143 | 143 | wp.mediaWidgets.controlConstructors[ "media_gallery" ].prototype.mime_type = "image"; |
144 | 144 | |
145 | | _.extend( wp.mediaWidgets.controlConstructors[ "media_gallery" ].prototype.l10n, {"no_media_selected":"No images selected","add_media":"Add Media","replace_media":"Replace Media","edit_media":"Edit Gallery","add_to_widget":"Add to Widget","missing_attachment":"We can’t find that gallery. Check your <a href=\"http:\/\/src.wordpress-develop.dev\/wp-admin\/upload.php\">media library<\/a> and make sure it wasn’t deleted.","media_library_state_multi":"","media_library_state_single":"","unsupported_file_type":"Looks like this isn’t the correct kind of file. Please link to an appropriate file instead.","select_media":"Select Images","change_media":"Add Image"} ); |
| 145 | _.extend( wp.mediaWidgets.controlConstructors[ "media_gallery" ].prototype.l10n, {"no_media_selected":"No images selected","add_media":"Add Media","replace_media":"Replace Media","edit_media":"Edit Gallery","add_to_widget":"Add to Widget","missing_attachment":"We can not find that gallery. Check your <a href=\"http:\/\/src.wordpress-develop.dev\/wp-admin\/upload.php\">media library<\/a> and make sure it was not deleted.","media_library_state_multi":"","media_library_state_single":"","unsupported_file_type":"Looks like this is not the correct kind of file. Please link to an appropriate file instead.","select_media":"Select Images","change_media":"Add Image"} ); |
146 | 146 | </script> |
147 | 147 | |
148 | 148 | <!-- Unit tests --> |
… |
… |
|
635 | 635 | <script type="text/html" id="tmpl-wp-media-widget-image-preview"> |
636 | 636 | <# if ( data.error && 'missing_attachment' === data.error ) { #> |
637 | 637 | <div class="notice notice-error notice-alt notice-missing-attachment"> |
638 | | <p>We can’t find that image. Check your <a href="http://src.wordpress-develop.test/wp-admin/upload.php">media library</a> and make sure it wasn’t deleted.</p> |
| 638 | <p>We can not find that image. Check your <a href="http://src.wordpress-develop.test/wp-admin/upload.php">media library</a> and make sure it was not deleted.</p> |
639 | 639 | </div> |
640 | 640 | <# } else if ( data.error ) { #> |
641 | 641 | <div class="notice notice-error notice-alt"> |
… |
… |
|
676 | 676 | <script type="text/html" id="tmpl-wp-media-widget-video-preview"> |
677 | 677 | <# if ( data.error && 'missing_attachment' === data.error ) { #> |
678 | 678 | <div class="notice notice-error notice-alt notice-missing-attachment"> |
679 | | <p>We can’t find that video. Check your <a href="http://src.wordpress-develop.test/wp-admin/upload.php">media library</a> and make sure it wasn’t deleted.</p> |
| 679 | <p>We can not find that video. Check your <a href="http://src.wordpress-develop.test/wp-admin/upload.php">media library</a> and make sure it was not deleted.</p> |
680 | 680 | </div> |
681 | 681 | <# } else if ( data.error && 'unsupported_file_type' === data.error ) { #> |
682 | 682 | <div class="notice notice-error notice-alt notice-missing-attachment"> |
683 | | <p>Sorry, we can’t load the video at the supplied URL. Please check that the URL is for a supported video file (<code>.mp4</code>, <code>.m4v</code>, <code>.webm</code>, <code>.ogv</code>, <code>.flv</code>) or stream (e.g. YouTube and Vimeo).</p> |
| 683 | <p>Sorry, we can not load the video at the supplied URL. Please check that the URL is for a supported video file (<code>.mp4</code>, <code>.m4v</code>, <code>.webm</code>, <code>.ogv</code>, <code>.flv</code>) or stream (e.g. YouTube and Vimeo).</p> |
684 | 684 | </div> |
685 | 685 | <# } else if ( data.error ) { #> |
686 | 686 | <div class="notice notice-error notice-alt"> |
… |
… |
|
804 | 804 | <script type="text/html" id="tmpl-wp-media-widget-audio-preview"> |
805 | 805 | <# if ( data.error && 'missing_attachment' === data.error ) { #> |
806 | 806 | <div class="notice notice-error notice-alt notice-missing-attachment"> |
807 | | <p>We can’t find that audio file. Check your <a href="http://src.wordpress-develop.test/wp-admin/upload.php">media library</a> and make sure it wasn’t deleted.</p> |
| 807 | <p>We can not find that audio file. Check your <a href="http://src.wordpress-develop.test/wp-admin/upload.php">media library</a> and make sure it was not deleted.</p> |
808 | 808 | </div> |
809 | 809 | <# } else if ( data.error ) { #> |
810 | 810 | <div class="notice notice-error notice-alt"> |