Fix PHPCS #209

abhijitrakas · 2019-06-05T05:27:22Z

Fix PHPCS errors. Some errors are still there which needs more attention and testing so not fixing now.

abhijitrakas · 2019-06-10T05:06:44Z

@chandrapatel Please review this PR once you are free.

admin/class-fastcgi-purger.php

admin/class-nginx-helper-admin.php

admin/js/nginx-helper-admin.js

admin/partials/nginx-helper-admin-display.php

admin/partials/nginx-helper-general-options.php

admin/partials/nginx-helper-sidebar-display.php

abhijitrakas · 2019-06-12T06:15:46Z

@thrijith Updated code as per suggested please check.

admin/js/nginx-helper-admin.js

Exclude vendor directory from PHPCS checks

thrijith · 2019-12-20T14:42:22Z

Conflicts have been resolved and remaining CS issue has been fixed. @chandrapatel please review and merge, if the changes look ok to you.
Thanks

chandrapatel · 2019-12-23T09:27:40Z

admin/partials/nginx-helper-general-options.php

+												esc_html__( ' (or page/custom post) is ', 'nginx-helper' ),
+												esc_html__( 'modified', 'nginx-helper' ),
+												esc_html__( ' or ', 'nginx-helper' ),
+												esc_html__( 'added', 'nginx-helper' )


This is not correct way to make small string translatable. We need to allow entire string translatable.

chandrapatel · 2019-12-23T09:27:49Z

admin/partials/nginx-helper-general-options.php

+												esc_html__( 'when a ', 'nginx-helper' ),
+												esc_html__( 'published post', 'nginx-helper' ),
+												esc_html__( ' (or page/custom post) is ', 'nginx-helper' ),
+												esc_html__( 'trashed', 'nginx-helper' )


This is not correct way to make small string translatable. We need to allow entire string translatable.

chandrapatel · 2019-12-23T09:27:55Z

admin/partials/nginx-helper-general-options.php

+												esc_html__( 'when a ', 'nginx-helper' ),
+												esc_html__( 'post', 'nginx-helper' ),
+												esc_html__( ' is ', 'nginx-helper' ),
+												esc_html__( 'published', 'nginx-helper' )


This is not correct way to make small string translatable. We need to allow entire string translatable.

chandrapatel · 2019-12-23T09:28:01Z

admin/partials/nginx-helper-general-options.php

+												esc_html__( 'when a ', 'nginx-helper' ),
+												esc_html__( 'comment', 'nginx-helper' ),
+												esc_html__( ' is ', 'nginx-helper' ),
+												esc_html__( 'approved/published', 'nginx-helper' )


This is not correct way to make small string translatable. We need to allow entire string translatable.

chandrapatel · 2019-12-23T09:28:07Z

admin/partials/nginx-helper-general-options.php

+												esc_html__( 'when a ', 'nginx-helper' ),
+												esc_html__( 'comment', 'nginx-helper' ),
+												esc_html__( ' is ', 'nginx-helper' ),
+												esc_html__( 'unapproved/deleted', 'nginx-helper' )


This is not correct way to make small string translatable. We need to allow entire string translatable.

chandrapatel · 2019-12-23T09:28:12Z

admin/partials/nginx-helper-general-options.php

+												esc_html__( ' (or page/custom post) is ', 'nginx-helper' ),
+												esc_html__( 'modified', 'nginx-helper' ),
+												esc_html__( ' or ', 'nginx-helper' ),
+												esc_html__( 'added', 'nginx-helper' )


This is not correct way to make small string translatable. We need to allow entire string translatable.

chandrapatel · 2019-12-23T09:28:19Z

admin/partials/nginx-helper-general-options.php

+												esc_html__( 'when a ', 'nginx-helper' ),
+												esc_html__( 'published post', 'nginx-helper' ),
+												esc_html__( ' (or page/custom post) is ', 'nginx-helper' ),
+												esc_html__( 'trashed', 'nginx-helper' )


This is not correct way to make small string translatable. We need to allow entire string translatable.

chandrapatel · 2019-12-23T09:28:24Z

admin/partials/nginx-helper-general-options.php

+												esc_html__( 'when a ', 'nginx-helper' ),
+												esc_html__( 'comment', 'nginx-helper' ),
+												esc_html__( ' is ', 'nginx-helper' ),
+												esc_html__( 'approved/published', 'nginx-helper' )


This is not correct way to make small string translatable. We need to allow entire string translatable.

chandrapatel · 2019-12-23T09:28:29Z

admin/partials/nginx-helper-general-options.php

+												esc_html__( 'when a ', 'nginx-helper' ),
+												esc_html__( 'comment', 'nginx-helper' ),
+												esc_html__( ' is ', 'nginx-helper' ),
+												esc_html__( 'unapproved/deleted', 'nginx-helper' )


This is not correct way to make small string translatable. We need to allow entire string translatable.

chandrapatel · 2019-12-23T09:29:01Z

admin/partials/nginx-helper-general-options.php

@@ -604,9 +646,13 @@
 						echo wp_kses(
 							sprintf(
 								'%1$s<br /><small>%2$s</small>',
-								esc_html__( 'Nginx Map path to include in nginx settings', 'nginx-helper' ), esc_html__( '(recommended)', 'nginx-helper' )
+								esc_html__( 'Nginx Map path to include in nginx settings', 'nginx-helper' ),
+								esc_html__( '(recommended)', 'nginx-helper' )


This is not correct way to make small string translatable. We need to allow entire string translatable.

chandrapatel · 2019-12-23T09:29:25Z

admin/partials/nginx-helper-general-options.php

-									esc_html__( 'Or,', 'nginx-helper' ), esc_html__( 'Text to manually copy and paste in nginx settings', 'nginx-helper' ), esc_html__( '(if your network is small and new sites are not added frequently)', 'nginx-helper' )
+									esc_html__( 'Or,', 'nginx-helper' ),
+									esc_html__( 'Text to manually copy and paste in nginx settings', 'nginx-helper' ),
+									esc_html__( '(if your network is small and new sites are not added frequently)', 'nginx-helper' )


This is not correct way to make small string translatable. We need to allow entire string translatable.

chandrapatel · 2019-12-23T09:29:37Z

admin/partials/nginx-helper-general-options.php

-							esc_html__( 'Can\'t write on log file.', 'nginx-helper' ), esc_html__( 'Check you have write permission on ', 'nginx-helper' ), esc_url( $log_path . 'nginx.log' )
+							esc_html__( 'Can\'t write on log file.', 'nginx-helper' ),
+							esc_html__( 'Check you have write permission on ', 'nginx-helper' ),
+							esc_url( $log_path . 'nginx.log' )


This is not correct way to make small string translatable. We need to allow entire string translatable.

chandrapatel · 2019-12-23T09:29:56Z

admin/partials/nginx-helper-sidebar-display.php

+				'%s <a href=\'%s\'>%s</a>.',
+				esc_html__( 'Please use our', 'nginx-helper' ),
+				esc_url( 'http://rtcamp.com/support/forum/wordpress-nginx/' ),
+				esc_html__( 'free support forum', 'nginx-helper' )


This is not correct way to make small string translatable. We need to allow entire string translatable.

chandrapatel · 2019-12-23T09:38:36Z

Conflicts have been resolved and remaining CS issue has been fixed. @chandrapatel please review and merge, if the changes look ok to you.
Thanks

@thrijith I have left feedback for translatable strings but we will fix it new PR and I'm merging this PR.

Feedback Addressed

Fix phpcs

32ee025

abhijitrakas requested a review from chandrapatel June 5, 2019 05:27

abhijitrakas requested a review from thrijith June 10, 2019 14:03

thrijith previously requested changes Jun 10, 2019

View reviewed changes

Remove extra escaping and make alert message translatable

25bf7f1

thrijith reviewed Jun 18, 2019

View reviewed changes

admin/js/nginx-helper-admin.js Outdated Show resolved Hide resolved

thrijith added 2 commits December 20, 2019 19:07

Merge branch 'master' into abhijitrakas-feature/phpcs-fixes

8a61d84

Use Yoda check

cf3d04f

Exclude vendor directory from PHPCS checks

chandrapatel reviewed Dec 23, 2019

View reviewed changes

chandrapatel approved these changes Dec 23, 2019

View reviewed changes

chandrapatel merged commit f60700a into rtCamp:master Dec 23, 2019

thrijith mentioned this pull request Jan 3, 2020

Version Update 2.2.0 #226

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix PHPCS #209

Fix PHPCS #209

abhijitrakas commented Jun 5, 2019

abhijitrakas commented Jun 10, 2019

abhijitrakas commented Jun 12, 2019

thrijith commented Dec 20, 2019

chandrapatel Dec 23, 2019

chandrapatel Dec 23, 2019

chandrapatel Dec 23, 2019

chandrapatel Dec 23, 2019

chandrapatel Dec 23, 2019

chandrapatel Dec 23, 2019

chandrapatel Dec 23, 2019

chandrapatel Dec 23, 2019

chandrapatel Dec 23, 2019

chandrapatel Dec 23, 2019

chandrapatel Dec 23, 2019

chandrapatel Dec 23, 2019

chandrapatel Dec 23, 2019 •

edited

Loading

chandrapatel commented Dec 23, 2019

Fix PHPCS #209

Fix PHPCS #209

Conversation

abhijitrakas commented Jun 5, 2019

abhijitrakas commented Jun 10, 2019

abhijitrakas commented Jun 12, 2019

thrijith commented Dec 20, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

chandrapatel Dec 23, 2019 • edited Loading

Choose a reason for hiding this comment

chandrapatel commented Dec 23, 2019

chandrapatel Dec 23, 2019 •

edited

Loading