Skip to content

Commit a8edf65

Browse files
committed
Administration: Move more table strings to sentence casing.
WordPress as a project has moved largely to sentence casing for UI elements in the admin. This commit moves several string$ * Move to trash * Mark as spam * Permanently delete comment * Approve comment * In response to * Bulk actions * Not spam * Sumitted on * Delete permanently * Add media * Upload files * Upload images * Add media * Bulk select * Restore from trash * Search media * Attachment details * Create gallery * Edit gallery * Cancel gallery * Add to gallery * Image details * Replace image * Cancel edit * Edit image * Choose image * Select and crop * Skip cropping * Crop image * Audio details * Replace audio * Add audio source * Video details * Replace video * Add video source * Select poster image * Add subtitles * Create audio playlist * Edit audio playlist. * Cancel audio playlist * Create video playlist * Edit video playlist * Add to video playlist * Filter media Fixes #40244. Props afercia, bhargavbhandari90, rcutmore, webzunft, manojlovic, jeremyfelt, desrosj, lschuyler, SergeyBiryukov, whyisjake. git-svn-id: https://develop.svn.wordpress.org/trunk@48352 602fd350-edb4-49c9-b593-d223f7449a82
1 parent aad7037 commit a8edf65

14 files changed

Lines changed: 174 additions & 182 deletions

package-lock.json

Lines changed: 95 additions & 103 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"grunt-jsdoc": "2.4.0",
5353
"grunt-jsvalidate": "~0.2.2",
5454
"grunt-legacy-util": "^1.1.1",
55-
"grunt-patch-wordpress": "~2.0.0",
55+
"grunt-patch-wordpress": "https://github.com/WordPress/grunt-patch-wordpress/archive/trunk.tar.gz",
5656
"grunt-postcss": "~0.9.0",
5757
"grunt-replace-lts": "~1.1.0",
5858
"grunt-rtlcss": "~2.0.1",

src/wp-admin/comment.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -125,19 +125,19 @@
125125
switch ( $action ) {
126126
case 'spam':
127127
$caution_msg = __( 'You are about to mark the following comment as spam:' );
128-
$button = _x( 'Mark as Spam', 'comment' );
128+
$button = _x( 'Mark as spam', 'comment' );
129129
break;
130130
case 'trash':
131131
$caution_msg = __( 'You are about to move the following comment to the Trash:' );
132-
$button = __( 'Move to Trash' );
132+
$button = __( 'Move to trash' );
133133
break;
134134
case 'delete':
135135
$caution_msg = __( 'You are about to delete the following comment:' );
136-
$button = __( 'Permanently Delete Comment' );
136+
$button = __( 'Permanently delete comment' );
137137
break;
138138
default:
139139
$caution_msg = __( 'You are about to approve the following comment:' );
140-
$button = __( 'Approve Comment' );
140+
$button = __( 'Approve comment' );
141141
break;
142142
}
143143

@@ -179,7 +179,7 @@
179179
</tr>
180180
<?php } ?>
181181
<tr>
182-
<th scope="row"><?php /* translators: Column name or table row header. */ _e( 'In Response To' ); ?></th>
182+
<th scope="row"><?php /* translators: Column name or table row header. */ _e( 'In response to' ); ?></th>
183183
<td>
184184
<?php
185185
$post_id = $comment->comment_post_ID;

src/wp-admin/edit-comments.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@
172172
'id' => 'overview',
173173
'title' => __( 'Overview' ),
174174
'content' =>
175-
'<p>' . __( 'You can manage comments made on your site similar to the way you manage posts and other content. This screen is customizable in the same ways as other management screens, and you can act on comments using the on-hover action links or the Bulk Actions.' ) . '</p>',
175+
'<p>' . __( 'You can manage comments made on your site similar to the way you manage posts and other content. This screen is customizable in the same ways as other management screens, and you can act on comments using the on-hover action links or the bulk actions.' ) . '</p>',
176176
)
177177
);
178178
get_current_screen()->add_help_tab(
@@ -183,8 +183,8 @@
183183
'<p>' . __( 'A red bar on the left means the comment is waiting for you to moderate it.' ) . '</p>' .
184184
'<p>' . __( 'In the <strong>Author</strong> column, in addition to the author&#8217;s name, email address, and blog URL, the commenter&#8217;s IP address is shown. Clicking on this link will show you all the comments made from this IP address.' ) . '</p>' .
185185
'<p>' . __( 'In the <strong>Comment</strong> column, hovering over any comment gives you options to approve, reply (and approve), quick edit, edit, spam mark, or trash that comment.' ) . '</p>' .
186-
'<p>' . __( 'In the <strong>In Response To</strong> column, there are three elements. The text is the name of the post that inspired the comment, and links to the post editor for that entry. The View Post link leads to that post on your live site. The small bubble with the number in it shows the number of approved comments that post has received. If there are pending comments, a red notification circle with the number of pending comments is displayed. Clicking the notification circle will filter the comments screen to show only pending comments on that post.' ) . '</p>' .
187-
'<p>' . __( 'In the <strong>Submitted On</strong> column, the date and time the comment was left on your site appears. Clicking on the date/time link will take you to that comment on your live site.' ) . '</p>' .
186+
'<p>' . __( 'In the <strong>In response to</strong> column, there are three elements. The text is the name of the post that inspired the comment, and links to the post editor for that entry. The View Post link leads to that post on your live site. The small bubble with the number in it shows the number of approved comments that post has received. If there are pending comments, a red notification circle with the number of pending comments is displayed. Clicking the notification circle will filter the comments screen to show only pending comments on that post.' ) . '</p>' .
187+
'<p>' . __( 'In the <strong>Submitted on</strong> column, the date and time the comment was left on your site appears. Clicking on the date/time link will take you to that comment on your live site.' ) . '</p>' .
188188
'<p>' . __( 'Many people take advantage of keyboard shortcuts to moderate their comments more quickly. Use the link to the side to learn more.' ) . '</p>',
189189
)
190190
);

src/wp-admin/edit-form-comment.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@
202202

203203
<div id="major-publishing-actions">
204204
<div id="delete-action">
205-
<?php echo "<a class='submitdelete deletion' href='" . wp_nonce_url( 'comment.php?action=' . ( ! EMPTY_TRASH_DAYS ? 'deletecomment' : 'trashcomment' ) . "&amp;c=$comment->comment_ID&amp;_wp_original_http_referer=" . urlencode( wp_get_referer() ), 'delete-comment_' . $comment->comment_ID ) . "'>" . ( ! EMPTY_TRASH_DAYS ? __( 'Delete Permanently' ) : __( 'Move to Trash' ) ) . "</a>\n"; ?>
205+
<?php echo "<a class='submitdelete deletion' href='" . wp_nonce_url( 'comment.php?action=' . ( ! EMPTY_TRASH_DAYS ? 'deletecomment' : 'trashcomment' ) . "&amp;c=$comment->comment_ID&amp;_wp_original_http_referer=" . urlencode( wp_get_referer() ), 'delete-comment_' . $comment->comment_ID ) . "'>" . ( ! EMPTY_TRASH_DAYS ? __( 'Delete Permanently' ) : __( 'Move to trash' ) ) . "</a>\n"; ?>
206206
</div>
207207
<div id="publishing-action">
208208
<?php submit_button( __( 'Update' ), 'primary large', 'save', false ); ?>

src/wp-admin/edit.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -264,9 +264,9 @@
264264
get_current_screen()->add_help_tab(
265265
array(
266266
'id' => 'bulk-actions',
267-
'title' => __( 'Bulk Actions' ),
267+
'title' => __( 'Bulk actions' ),
268268
'content' =>
269-
'<p>' . __( 'You can also edit or move multiple posts to the Trash at once. Select the posts you want to act on using the checkboxes, then select the action you want to take from the Bulk Actions menu and click Apply.' ) . '</p>' .
269+
'<p>' . __( 'You can also edit or move multiple posts to the Trash at once. Select the posts you want to act on using the checkboxes, then select the action you want to take from the Bulk actions menu and click Apply.' ) . '</p>' .
270270
'<p>' . __( 'When using Bulk Edit, you can change the metadata (categories, author, etc.) for all selected posts at once. To remove a post from the grouping, just click the x next to its name in the Bulk Edit area that appears.' ) . '</p>',
271271
)
272272
);
@@ -292,7 +292,7 @@
292292
'title' => __( 'Managing Pages' ),
293293
'content' =>
294294
'<p>' . __( 'Managing pages is very similar to managing posts, and the screens can be customized in the same way.' ) . '</p>' .
295-
'<p>' . __( 'You can also perform the same types of actions, including narrowing the list by using the filters, acting on a page using the action links that appear when you hover over a row, or using the Bulk Actions menu to edit the metadata for multiple pages at once.' ) . '</p>',
295+
'<p>' . __( 'You can also perform the same types of actions, including narrowing the list by using the filters, acting on a page using the action links that appear when you hover over a row, or using the Bulk actions menu to edit the metadata for multiple pages at once.' ) . '</p>',
296296
)
297297
);
298298

src/wp-admin/includes/class-wp-comments-list-table.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -351,19 +351,19 @@ protected function get_bulk_actions() {
351351
$actions['approve'] = __( 'Approve' );
352352
}
353353
if ( in_array( $comment_status, array( 'all', 'moderated', 'approved', 'trash' ), true ) ) {
354-
$actions['spam'] = _x( 'Mark as Spam', 'comment' );
354+
$actions['spam'] = _x( 'Mark as spam', 'comment' );
355355
}
356356

357357
if ( 'trash' === $comment_status ) {
358358
$actions['untrash'] = __( 'Restore' );
359359
} elseif ( 'spam' === $comment_status ) {
360-
$actions['unspam'] = _x( 'Not Spam', 'comment' );
360+
$actions['unspam'] = _x( 'Not spam', 'comment' );
361361
}
362362

363363
if ( in_array( $comment_status, array( 'trash', 'spam' ), true ) || ! EMPTY_TRASH_DAYS ) {
364-
$actions['delete'] = __( 'Delete Permanently' );
364+
$actions['delete'] = __( 'Delete permanently' );
365365
} else {
366-
$actions['trash'] = __( 'Move to Trash' );
366+
$actions['trash'] = __( 'Move to trash' );
367367
}
368368

369369
return $actions;
@@ -467,10 +467,10 @@ public function get_columns() {
467467

468468
if ( ! $post_id ) {
469469
/* translators: Column name or table row header. */
470-
$columns['response'] = __( 'In Response To' );
470+
$columns['response'] = __( 'In response to' );
471471
}
472472

473-
$columns['date'] = _x( 'Submitted On', 'column name' );
473+
$columns['date'] = _x( 'Submitted on', 'column name' );
474474

475475
return $columns;
476476
}

0 commit comments

Comments
 (0)