-
Notifications
You must be signed in to change notification settings - Fork 19
PRO-1039: Replace remaining 'Ignore' terminology with 'Dismiss' #1782
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from 1 commit
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -837,7 +837,7 @@ function ( $value ) { | |
| $valid_table = edac_get_valid_table_name( $table_name ); | ||
|
|
||
| if ( ! $first_id || ! $valid_table ) { | ||
| wp_send_json_error( new \WP_Error( '-2', __( 'No ignore data to return', 'accessibility-checker' ) ) ); | ||
| wp_send_json_error( new \WP_Error( '-2', __( 'No dismiss data to return', 'accessibility-checker' ) ) ); | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The phrase 'No dismiss data to return' is grammatically incorrect. Using the noun form 'dismissal' (i.e., 'No dismissal data to return') is grammatically correct and matches standard English usage. wp_send_json_error( new \WP_Error( '-2', __( 'No dismissal data to return', 'accessibility-checker' ) ) ); |
||
| } | ||
|
|
||
| if ( isset( $_REQUEST['largeBatch'] ) && 'true' === $_REQUEST['largeBatch'] ) { | ||
|
|
@@ -846,7 +846,7 @@ function ( $value ) { | |
| // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching -- Permission check requires direct lookup. | ||
| $batch_object = $wpdb->get_var( $wpdb->prepare( 'SELECT object FROM %i WHERE id = %d', $valid_table, $first_id ) ); | ||
| if ( ! $batch_object ) { | ||
| wp_send_json_error( new \WP_Error( '-2', __( 'No ignore data to return', 'accessibility-checker' ) ) ); | ||
| wp_send_json_error( new \WP_Error( '-2', __( 'No dismiss data to return', 'accessibility-checker' ) ) ); | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The phrase 'No dismiss data to return' is grammatically incorrect. Using the noun form 'dismissal' (i.e., 'No dismissal data to return') is grammatically correct and matches standard English usage. wp_send_json_error( new \WP_Error( '-2', __( 'No dismissal data to return', 'accessibility-checker' ) ) ); |
||
| } | ||
| // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching -- Permission check requires direct lookup. | ||
| $affected_post_ids = $wpdb->get_col( $wpdb->prepare( 'SELECT DISTINCT postid FROM %i WHERE siteid = %d AND object = %s', $valid_table, $siteid, $batch_object ) ); | ||
|
|
@@ -858,7 +858,7 @@ function ( $value ) { | |
| } | ||
|
|
||
| if ( empty( $affected_post_ids ) ) { | ||
| wp_send_json_error( new \WP_Error( '-2', __( 'No ignore data to return', 'accessibility-checker' ) ) ); | ||
| wp_send_json_error( new \WP_Error( '-2', __( 'No dismiss data to return', 'accessibility-checker' ) ) ); | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The phrase 'No dismiss data to return' is grammatically incorrect. Using the noun form 'dismissal' (i.e., 'No dismissal data to return') is grammatically correct and matches standard English usage. wp_send_json_error( new \WP_Error( '-2', __( 'No dismissal data to return', 'accessibility-checker' ) ) ); |
||
| } | ||
|
|
||
| foreach ( $affected_post_ids as $affected_post_id ) { | ||
|
|
@@ -902,7 +902,7 @@ function ( $value ) { | |
| ]; | ||
|
|
||
| if ( ! $data ) { | ||
| wp_send_json_error( new \WP_Error( '-2', __( 'No ignore data to return', 'accessibility-checker' ) ) ); | ||
| wp_send_json_error( new \WP_Error( '-2', __( 'No dismiss data to return', 'accessibility-checker' ) ) ); | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The phrase 'No dismiss data to return' is grammatically incorrect. Using the noun form 'dismissal' (i.e., 'No dismissal data to return') is grammatically correct and matches standard English usage. wp_send_json_error( new \WP_Error( '-2', __( 'No dismissal data to return', 'accessibility-checker' ) ) ); |
||
| } | ||
| wp_send_json_success( wp_json_encode( $data ) ); | ||
| } | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -71,11 +71,11 @@ function ( $fix ) { | |
| 'value' => esc_html( get_option( 'edacp_simplified_summary_heading' ) ), | ||
| ], | ||
| 'ignore_permissions' => [ | ||
| 'label' => __( 'Ignore Permissions', 'accessibility-checker' ), | ||
| 'label' => __( 'Dismiss Permissions', 'accessibility-checker' ), | ||
| 'value' => esc_html( get_option( 'edacp_ignore_user_roles' ) ? implode( ', ', get_option( 'edacp_ignore_user_roles' ) ) : __( 'None', 'accessibility-checker' ) ), | ||
| ], | ||
| 'ignores_db_table_count' => [ | ||
| 'label' => __( 'Ignores DB Table Count', 'accessibility-checker' ), | ||
| 'label' => __( 'Dismisses DB Table Count', 'accessibility-checker' ), | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The phrase 'Dismisses DB Table Count' is grammatically incorrect because 'Dismisses' is a verb form. The plural noun form 'Dismissals' (i.e., 'Dismissals DB Table Count') should be used instead to match the original 'Ignores DB Table Count'. 'label' => __( 'Dismissals DB Table Count', 'accessibility-checker' ), |
||
| 'value' => absint( edac_database_table_count( 'accessibility_checker_global_ignores' ) ), | ||
| ], | ||
| 'fixes' => [ | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -191,7 +191,7 @@ function edac_register_setting() { | |
|
|
||
| add_settings_field( | ||
| 'edacp_ignore_user_roles', | ||
| __( 'Ignore Permissions', 'accessibility-checker' ), | ||
| __( 'Dismiss Permissions', 'accessibility-checker' ), | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
When a bundled non-English locale is active, this renamed msgid (and the other renamed strings in this commit) is no longer translatable because the checked-in catalogs were not regenerated: Useful? React with 👍 / 👎. |
||
| 'edac_ignore_user_roles_cb', | ||
| 'edac_settings', | ||
| 'edac_permissions', | ||
|
|
@@ -682,7 +682,7 @@ function edac_post_types_cb() { | |
| <?php } else { ?> | ||
| <p class="edac-description"> | ||
| <?php | ||
| esc_html_e( 'Choose which post types should be checked during a scan. Please note, removing a previously selected post type will remove its scanned information and any custom ignored warnings that have been setup.', 'accessibility-checker' ); | ||
| esc_html_e( 'Choose which post types should be checked during a scan. Please note, removing a previously selected post type will remove its scanned information and any custom dismissed warnings that have been setup.', 'accessibility-checker' ); | ||
| ?> | ||
| </p> | ||
| <?php | ||
|
|
@@ -1000,7 +1000,7 @@ function edac_ignore_user_roles_cb() { | |
| <?php endif; ?> | ||
| </fieldset> | ||
| <p class="edac-description"> | ||
| <?php esc_html_e( 'Choose which user roles have permission to ignore issues.', 'accessibility-checker' ); ?> | ||
| <?php esc_html_e( 'Choose which user roles have permission to dismiss issues.', 'accessibility-checker' ); ?> | ||
| </p> | ||
| <?php | ||
| } | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The phrase 'dismiss logs' is grammatically awkward. Since 'dismiss' is a verb, using the noun form 'dismissal' (i.e., 'dismissal logs') is more grammatically correct and natural in English.