Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fix i18n violations #2271

Merged
merged 3 commits into from Oct 29, 2018
Merged

Fix i18n violations #2271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d859ddd
PHPCS: Use `value`, not `name` attribute, with `element`
GaryJones Oct 16, 2018
de80576
Composer: Use PHPCS 3.3.2 for XSD validation
GaryJones Oct 16, 2018
e7a4f9f
CS: Fix i18n violations
GaryJones Oct 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@
"dealerdirect/phpcodesniffer-composer-installer": "^0.4.4",
"phpcompatibility/phpcompatibility-wp": "^2",
"phpunit/phpunit": "^6.5",
"squizlabs/php_codesniffer": "^3.3",
"squizlabs/php_codesniffer": "^3.3.2",
"wp-coding-standards/wpcs": "^1.1.0"
},
"prefer-stable": true
Expand Down
2 changes: 1 addition & 1 deletion includes/admin/class-sensei-learner-management.php
View file
Open in desktop
Expand Up @@ -535,7 +535,7 @@ public function json_search_users() {
die();
}

$default = isset( $_GET['default'] ) ? $_GET['default'] : __( 'None', 'woocommerce' );
$default = isset( $_GET['default'] ) ? $_GET['default'] : __( 'None', 'woothemes-sensei' );

$found_users = array( '' => $default );

Expand Down
16 changes: 8 additions & 8 deletions includes/class-sensei-frontend.php
View file
Open in desktop
Expand Up @@ -1894,11 +1894,11 @@ public function sensei_process_registration() {
// Check the username.
$username_error_notice = '';
if ( $new_user_name == '' ) {
$username_error_notice = __( '<strong>ERROR</strong>: Please enter a username.' );
$username_error_notice = __( '<strong>ERROR</strong>: Please enter a username.', 'woothemes-sensei' );
} elseif ( ! validate_username( $new_user_name ) ) {
$username_error_notice = __( '<strong>ERROR</strong>: This username is invalid because it uses illegal characters. Please enter a valid username.' );
$username_error_notice = __( '<strong>ERROR</strong>: This username is invalid because it uses illegal characters. Please enter a valid username.', 'woothemes-sensei' );
} elseif ( username_exists( $new_user_name ) ) {
$username_error_notice = __( '<strong>ERROR</strong>: This username is already registered. Please choose another one.' );
$username_error_notice = __( '<strong>ERROR</strong>: This username is already registered. Please choose another one.', 'woothemes-sensei' );
}

// exit on username error.
Expand All @@ -1910,11 +1910,11 @@ public function sensei_process_registration() {
// Check the e-mail address.
$email_error_notice = '';
if ( $new_user_email == '' ) {
$email_error_notice = __( '<strong>ERROR</strong>: Please enter an email address.' );
$email_error_notice = __( '<strong>ERROR</strong>: Please enter an email address.', 'woothemes-sensei' );
} elseif ( ! is_email( $new_user_email ) ) {
$email_error_notice = __( '<strong>ERROR</strong>: The email address isn&#8217;t correct.' );
$email_error_notice = __( '<strong>ERROR</strong>: The email address isn&#8217;t correct.', 'woothemes-sensei' );
} elseif ( email_exists( $new_user_email ) ) {
$email_error_notice = __( '<strong>ERROR</strong>: This email is already registered, please choose another one.' );
$email_error_notice = __( '<strong>ERROR</strong>: This email is already registered, please choose another one.', 'woothemes-sensei' );
}

// exit on email address error.
Expand All @@ -1926,15 +1926,15 @@ public function sensei_process_registration() {
// check user password
// exit on email address error.
if ( empty( $new_user_password ) ) {
Sensei()->notices->add_notice( __( '<strong>ERROR</strong>: The password field is empty.' ), 'alert' );
Sensei()->notices->add_notice( __( '<strong>ERROR</strong>: The password field is empty.', 'woothemes-sensei' ), 'alert' );
return;
}

// register user.
$user_id = wp_create_user( $new_user_name, $new_user_password, $new_user_email );
if ( ! $user_id || is_wp_error( $user_id ) ) {
// translators: Placeholder is the admin email address.
Sensei()->notices->add_notice( sprintf( __( '<strong>ERROR</strong>: Couldn&#8217;t register you&hellip; please contact the <a href="mailto:%s">webmaster</a> !' ), get_option( 'admin_email' ) ), 'alert' );
Sensei()->notices->add_notice( sprintf( __( '<strong>ERROR</strong>: Couldn&#8217;t register you&hellip; please contact the <a href="mailto:%s">webmaster</a> !', 'woothemes-sensei' ), get_option( 'admin_email' ) ), 'alert' );
}

// Notify the Admin and not the user. See https://github.com/Automattic/sensei/issues/1761.
Expand Down
2 changes: 1 addition & 1 deletion includes/class-sensei-grading-user-quiz.php
View file
Open in desktop
Expand Up @@ -257,7 +257,7 @@ public function display() {
<span class="total_grade_total"><?php echo $user_quiz_grade_total; ?></span> / <span class="quiz_grade_total"><?php echo $quiz_grade_total; ?></span> (<span class="total_grade_percent"><?php echo $quiz_grade; ?></span>%)
</div>
<div class="buttons">
<input type="submit" value="<?php esc_attr_e( 'Save' ); ?>" class="grade-button button-primary" title="Saves grades as currently marked on this page" />
<input type="submit" value="<?php esc_attr_e( 'Save', 'woothemes-sensei' ); ?>" class="grade-button button-primary" title="Saves grades as currently marked on this page" />
<input type="button" value="<?php esc_attr_e( 'Auto grade', 'woothemes-sensei' ); ?>" class="autograde-button button-secondary" title="Where possible, automatically grades questions that have not yet been graded" />
<input type="reset" value="<?php esc_attr_e( 'Reset', 'woothemes-sensei' ); ?>" class="reset-button button-secondary" title="Resets all questions to ungraded and total grade to 0" />
</div>
Expand Down
2 changes: 1 addition & 1 deletion includes/class-sensei-learners-admin-bulk-actions-view.php
View file
Open in desktop
Expand Up @@ -108,7 +108,7 @@ private function get_learner_html( $learner ) {
$login = esc_html( $learner->user_login );
$title = esc_html( Sensei_Learner::get_full_name( $learner->user_id ) );
// translators: Placeholder %s is the learner's full name.
$a_title = sprintf( __( 'Edit &#8220;%s&#8221;' ), $title );
$a_title = sprintf( __( 'Edit &#8220;%s&#8221;', 'woothemes-sensei' ), $title );
$html = '<strong><a class="row-title" href="' . admin_url( 'user-edit.php?user_id=' . $learner->user_id ) . '" title="' . esc_attr( $a_title ) . '">' . esc_html( $login ) . '</a></strong>';
$html .= ' <span>(<em>' . $title . '</em>, ' . esc_html( $learner->user_email ) . ')</span>';
return $html;
Expand Down
6 changes: 3 additions & 3 deletions includes/class-sensei-learners-main.php
View file
Open in desktop
Expand Up @@ -265,7 +265,7 @@ protected function get_row_data( $item ) {

$title = Sensei_Learner::get_full_name( $user_activity->user_id );
// translators: Placeholder is the full name of the learner.
$a_title = sprintf( __( 'Edit &#8220;%s&#8221;' ), $title );
$a_title = sprintf( __( 'Edit &#8220;%s&#8221;', 'woothemes-sensei' ), $title );
$edit_start_date_form = $this->get_edit_start_date_form( $user_activity, $post_id, $post_type, $object_type );

/**
Expand Down Expand Up @@ -297,7 +297,7 @@ protected function get_row_data( $item ) {
$lesson_learners = Sensei_Utils::sensei_check_for_activity( apply_filters( 'sensei_learners_lesson_learners', array( 'post_id' => $item->ID, 'type' => 'sensei_lesson_status', 'status' => 'any' ) ) );
$title = get_the_title( $item );
// translators: Placeholder is the item title.
$a_title = sprintf( __( 'Edit &#8220;%s&#8221;' ), $title );
$a_title = sprintf( __( 'Edit &#8220;%s&#8221;', 'woothemes-sensei' ), $title );

$grading_action = '';
if ( Sensei_Lesson::lesson_quiz_has_questions( $item->ID ) ) {
Expand All @@ -317,7 +317,7 @@ protected function get_row_data( $item ) {
$course_learners = Sensei_Utils::sensei_check_for_activity( apply_filters( 'sensei_learners_course_learners', array( 'post_id' => $item->ID, 'type' => 'sensei_course_status', 'status' => 'any' ) ) );
$title = get_the_title( $item );
// translators: Placeholder is the item title.
$a_title = sprintf( __( 'Edit &#8220;%s&#8221;' ), $title );
$a_title = sprintf( __( 'Edit &#8220;%s&#8221;', 'woothemes-sensei' ), $title );

$grading_action = '';
if ( version_compare($wp_version, '4.1', '>=') ) {
Expand Down
4 changes: 2 additions & 2 deletions includes/class-sensei-modules.php
View file
Open in desktop
Expand Up @@ -1816,7 +1816,7 @@ public function course_module_metabox( $post ) {
<div id="taxonomy-<?php echo $tax_name; ?>" class="categorydiv">
<ul id="<?php echo $tax_name; ?>-tabs" class="category-tabs">
<li class="tabs"><a href="#<?php echo $tax_name; ?>-all"><?php echo $taxonomy->labels->all_items; ?></a></li>
<li class="hide-if-no-js"><a href="#<?php echo $tax_name; ?>-pop"><?php _e( 'Most Used' ); ?></a></li>
<li class="hide-if-no-js"><a href="#<?php echo $tax_name; ?>-pop"><?php _e( 'Most Used','woothemes-sensei' ); ?></a></li>
</ul>

<div id="<?php echo $tax_name; ?>-pop" class="tabs-panel" style="display: none;">
Expand All @@ -1840,7 +1840,7 @@ public function course_module_metabox( $post ) {
<a id="sensei-<?php echo $tax_name; ?>-add-toggle" href="#<?php echo $tax_name; ?>-add" class="hide-if-no-js">
<?php
/* translators: %s: add new taxonomy label */
printf( __( '+ %s' ), $taxonomy->labels->add_new_item );
printf( __( '+ %s', 'woothemes-sensei' ), $taxonomy->labels->add_new_item );
?>
</a>
</h4>
Expand Down
4 changes: 2 additions & 2 deletions includes/class-sensei-updates.php
View file
Open in desktop
Expand Up @@ -138,7 +138,7 @@ public function sensei_updates_page() {
|| ! wp_verify_nonce( $_POST[ $function_name.'_nonce_field' ] , 'run_'.$function_name ) ){

wp_die(
'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
'<h1>' . __( 'Cheatin&#8217; uh?', 'woothemes-sensei' ) . '</h1>' .
'<p>' . __( 'The nonce supplied in order to run this update function is invalid', 'woothemes-sensei' ) . '</p>',
403
);
Expand Down Expand Up @@ -187,7 +187,7 @@ public function sensei_updates_page() {
|| ! wp_verify_nonce( $_GET[ $function_name.'_nonce' ] , 'run_'.$function_name ) ){

wp_die(
'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
'<h1>' . __( 'Cheatin&#8217; uh?', 'woothemes-sensei' ) . '</h1>' .
'<p>' . __( 'The nonce supplied in order to run this update function is invalid', 'woothemes-sensei' ) . '</p>',
403
);
Expand Down
2 changes: 1 addition & 1 deletion includes/class-sensei-wc.php
View file
Open in desktop
Expand Up @@ -962,7 +962,7 @@ public static function the_course_no_permissions_message( $course_id ) {

if ( self::is_product_in_cart( $wc_product_id ) ) {

$cart_link = '<a href="' . wc_get_checkout_url() . '" title="' . __( 'Checkout', 'woocommerce' ) . '">' . __( 'checkout', 'woocommerce' ) . '</a>';
$cart_link = '<a href="' . wc_get_checkout_url() . '" title="' . __( 'Checkout', 'woothemes-sensei' ) . '">' . __( 'checkout', 'woothemes-sensei' ) . '</a>';

// translators: Placeholder is a link to the cart.
$message = sprintf( __( 'This course is already in your cart, please proceed to %1$s, to gain access.', 'woothemes-sensei' ), $cart_link );
Expand Down
4 changes: 2 additions & 2 deletions includes/rest-api/class-sensei-rest-api-endpoint-courses.php
View file
Open in desktop
Expand Up @@ -65,7 +65,7 @@ public function get_items( $request ) {

$course = $this->factory->find_one_by_id($item_id);
if ( empty( $course ) ) {
return $this->not_found( __( 'Course not found' ) );
return $this->not_found( __( 'Course not found', 'woothemes-sensei' ) );
}

return $this->succeed( $this->prepare_data_transfer_object( $course ) );
Expand Down Expand Up @@ -233,4 +233,4 @@ public function get_item_schema() {

return $this->add_additional_fields_schema( $schema );
}
}
}
4 changes: 2 additions & 2 deletions includes/rest-api/class-sensei-rest-api-endpoint-modules.php
View file
Open in desktop
Expand Up @@ -38,7 +38,7 @@ public function get_items( $request ) {

$course = $this->factory->find_one_by_id($item_id);
if ( empty( $course ) ) {
return $this->not_found( __( 'Module not found' ) );
return $this->not_found( __( 'Module not found', 'woothemes-sensei' ) );
}

return $this->succeed( $this->prepare_data_transfer_object( $course ) );
Expand Down Expand Up @@ -76,4 +76,4 @@ protected function add_links( $model ) {
)
);
}
}
}
11 changes: 7 additions & 4 deletions phpcs.xml.dist
View file
Open in desktop
@@ -1,5 +1,8 @@
<?xml version="1.0"?>
<ruleset name="Sensei">
<ruleset name="Sensei"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="vendor/squizlabs/php_codesniffer/phpcs.xsd">

<description>A custom set of code standard rules to check for Sensei plugin.</description>

<!-- For help in understanding this file: https://github.com/squizlabs/PHP_CodeSniffer/wiki/Annotated-ruleset.xml -->
Expand Down Expand Up @@ -37,16 +40,16 @@
<rule ref="WordPress.NamingConventions.PrefixAllGlobals">
<properties>
<property name="prefixes" type="array">
<element name="sensei"/>
<element name="woothemes"/>
<element value="sensei"/>
<element value="woothemes"/>
</property>
</properties>
</rule>

<rule ref="WordPress.WP.I18n">
<properties>
<property name="text_domain" type="array">
<element name="woothemes-sensei"/>
<element value="woothemes-sensei"/>
</property>
</properties>
</rule>
Expand Down