fixes for numbered placeholder in translatable strings

Author: paulgoodchild

src/lib/src/ActionRouter/Actions/Render/Components/Scans/ItemAnalysis/History.php

@@ -32,7 +32,7 @@ protected function getRenderData() :array {
 					if ( $column === 'created_at' ) {
 					$this->history[ $ts ][] = sprintf(
 						/* translators: %1$s: detection type, %2$s: scanner name */
-						__( "File detected as %1$s by %2$s scanner.", 'wp-simple-firewall' ),
+						__( 'File detected as %1$s by %2$s scanner.', 'wp-simple-firewall' ),
 							sprintf( '<strong>%s</strong>', \implode( ', ', $item->getStatusForHuman() ) ),
 							sprintf( '<strong>%s</strong>',
 								self::con()->comps->scans->getScanCon( $item->VO->scan )->getScanName() )

src/lib/src/Controller/Config/Modules/StringsOptions.php

@@ -312,7 +312,7 @@ public function getFor( string $key ) :array {
 					\implode( ' ', [
 						sprintf(
 							/* translators: %1$s: WP root directory name, %2$s: wp-content directory path */
-							__( "The %1$s directory is like the %2$s directory and many non-WordPress files are kept there.", 'wp-simple-firewall' ), __( 'WP root', 'wp-simple-firewall' ), '<code>/wp-content/</code>' ),
+							__( 'The %1$s directory is like the %2$s directory and many non-WordPress files are kept there.', 'wp-simple-firewall' ), __( 'WP root', 'wp-simple-firewall' ), '<code>/wp-content/</code>' ),
 						__( "Since it's normally messy, it's the perfect place to hide malicious files in plain sight.", 'wp-simple-firewall' ),
 						__( "We have rules to detect unidentified files, but you'll probably see false positive results.", 'wp-simple-firewall' ),
 						$additional,
@@ -764,7 +764,7 @@ public function getFor( string $key ) :array {
 						__( 'Important', 'wp-simple-firewall' ),
 						sprintf(
 							/* translators: %1$s: wp-admin path, %2$s: wp-login.php path */
-							__( "This will cause %1$s and %2$s URLs to return HTTP 404 errors while you're not logged-in.", 'wp-simple-firewall' ),
+							__( "This will cause %1\$s and %2\$s URLs to return HTTP 404 errors while you're not logged-in.", 'wp-simple-firewall' ),
 							'<code>/wp-admin/</code>',
 							'<code>/wp-login.php</code>'
 						)
@@ -999,7 +999,7 @@ public function getFor( string $key ) :array {
 						),
 						sprintf(
 							/* translators: %1$s: server variable name, %2$s: server variable name */
-							__( "If the correct setting is not %1$s, we recommend contacting your hosting provider to request that they configure your hosting so that %2$s provides the actual visitor IP address.", 'wp-simple-firewall' ),
+							__( 'If the correct setting is not %1$s, we recommend contacting your hosting provider to request that they configure your hosting so that %2$s provides the actual visitor IP address.', 'wp-simple-firewall' ),
 							sprintf( '<code>%s</code>', 'REMOTE_ADDR' ), sprintf( '<code>%s</code>', 'REMOTE_ADDR' ) )
 					] ),
 				];
@@ -1064,7 +1064,7 @@ public function getFor( string $key ) :array {
 						.' '.__( "It'll find a suitable location automatically, but if this fails, you may see PHP warnings on your site and certain Shield functionality won't be available.", 'wp-simple-firewall' ),
 						sprintf(
 							/* translators: %1$s: plugin name, %2$s: directory path */
-							__( "%1$s has successfully chosen the following location to create its temporary directory: %2$s", 'wp-simple-firewall' ), $pluginName,
+							__( '%1$s has successfully chosen the following location to create its temporary directory: %2$s', 'wp-simple-firewall' ), $pluginName,
 							sprintf( '<code>%s</code>', \dirname( $tmpDir ) ) ),
 						sprintf( '%s - %s', __( 'Important', 'wp-simple-firewall' ), __( 'You should only provide a value for this configuration option if you experience any trouble.', 'wp-simple-firewall' ) ),
 					];

src/lib/src/Controller/Config/Opts/SectionNotices.php

@@ -218,7 +218,7 @@ function ( $provider ) {
 					if ( !empty( $installedButNotEnabledProviders ) ) {
 						$warnings[] = sprintf(
 							/* translators: %1$s: plugin name, %2$s: provider name */
-							__( "%1$s has an integration available to protect the forms of a 3rd party plugin you're using: %2$s", 'wp-simple-firewall' ),
+							__( '%1$s has an integration available to protect the forms of a 3rd party plugin you are using: %2$s', 'wp-simple-firewall' ),
 							$con->labels->Name,
 							\implode( ', ', \array_map(
 								function ( $provider ) {

src/lib/src/Modules/CommentsFilter/Scan/HumanDictionary.php

@@ -43,7 +43,7 @@ public function scan( array $commData ) {
 				'human',
 				sprintf(
 					/* translators: %1$s: word found, %2$s: field name */
-					__( "Human SPAM filter found '%1$s' in '%2$s'", 'wp-simple-firewall' ), $word, $key ),
+					__( 'Human SPAM filter found "%1$s" in "%2$s"', 'wp-simple-firewall' ), $word, $key ),
 				[
 					'word' => $word,
 					'key'  => $key

src/lib/src/Modules/Plugin/Lib/MeterAnalysis/Component/SystemPhpVersion.php

@@ -28,15 +28,15 @@ public function title() :string {
 	public function descProtected() :string {
 		return sprintf(
 			/* translators: %1$s: current PHP version, %2$s: minimum required version */
-			__( "WordPress is running on a recent version (%1$s) of PHP (at least %2$s).", 'wp-simple-firewall' ),
+			__( 'WordPress is running on a recent version (%1$s) of PHP (at least %2$s).', 'wp-simple-firewall' ),
 			Services::Data()->getPhpVersionCleaned(), '7.4' );
 	}
 
 	public function descUnprotected() :string {
 		return \implode( ' ', [
-			sprintf( __( "WordPress is running an old version (%s) of PHP.", 'wp-simple-firewall' ),
+			sprintf( __( 'WordPress is running an old version (%s) of PHP.', 'wp-simple-firewall' ),
 				Services::Data()->getPhpVersionCleaned() ),
-			sprintf( __( "WordPress.org recommends running on at least PHP %s.", 'wp-simple-firewall' ), '7.4' )
+			sprintf( __( 'WordPress.org recommends running on at least PHP %s.', 'wp-simple-firewall' ), '7.4' )
 		] );
 	}
 }

src/lib/src/Zones/Zone/Scans.php

@@ -46,7 +46,7 @@ public function description() :array {
 			] ),
 			\implode( ' ', [
 				/* translators: %1$s: service name, %2$s: product name */
-				sprintf( __( "%1$s is %2$s's exclusive service that protects your wp-config.php file.", 'wp-simple-firewall' ), 'FileLocker', 'ShieldPRO' ),
+				sprintf( __( '%1$s is a %2$s exclusive service that protects your wp-config.php file.', 'wp-simple-firewall' ), 'FileLocker', 'ShieldPRO' ),
 				__( 'With it you can be instantly alerted to changes to the file with a clear view on the precise changes and easy next-steps on how to proceed.', 'wp-simple-firewall' ),
 			] ),
 		];