Changeset 61071

Timestamp:

10/27/2025 11:55:51 AM (6 weeks ago)

Author:

gziolo

Message:

Abilities API: Code quality fixes around translations

This aligns with how translations are handled across all places in the Abilities API codebase. It addresses the feedback raised during syncing back changes to Abilities API repository with ​https://github.com/WordPress/abilities-api/pull/126.

Developed in ​https://github.com/WordPress/wordpress-develop/pull/10424.

Follow-up [61032].
Props gziolo, jorgefilipecosta.
See #64098.

Location:

trunk/src/wp-includes

Files:

• abilities-api.php (modified) (1 diff)
• abilities-api/class-wp-abilities-registry.php (modified) (4 diffs)
• abilities-api/class-wp-ability-categories-registry.php (modified) (2 diffs)
• abilities-api/class-wp-ability-category.php (modified) (2 diffs)
• abilities-api/class-wp-ability.php (modified) (7 diffs)

trunk/src/wp-includes/abilities-api.php

@@ -275 +275 @@
             sprintf(
                 /* translators: 1: wp_abilities_api_init, 2: string value of the ability name. */
-                esc_html__( 'Abilities must be registered on the %1$s action. The ability %2$s was not registered.' ),
+                __( 'Abilities must be registered on the %1$s action. The ability %2$s was not registered.' ),
                 '<code>wp_abilities_api_init</code>',
                 '<code>' . esc_html( $name ) . '</code>'

trunk/src/wp-includes/abilities-api/class-wp-abilities-registry.php

@@ -237 +237 @@
      *
      * @param string $name The name of the registered ability, with its namespace.
-     * @return ?WP_Ability The registered ability instance, or null if it is not registered.
+     * @return WP_Ability|null The registered ability instance, or null if it is not registered.
      */
     public function get_registered( string $name ): ?WP_Ability {
@@ -244 +244 @@
                 __METHOD__,
                 /* translators: %s: Ability name. */
-                sprintf( esc_html__( 'Ability "%s" not found.' ), esc_attr( $name ) ),
+                sprintf( __( 'Ability "%s" not found.' ), esc_html( $name ) ),
                 '6.9.0'
             );
@@ -266 +266 @@
                 __METHOD__,
                 sprintf(
-                    __( 'Ability API should not be initialized before the <code>init</code> action has fired' )
+                    // translators: %s: init action.
+                    __( 'Ability API should not be initialized before the %s action has fired.' ),
+                    '<code>init</code>'
                 ),
                 '6.9.0'
@@ -315 +317 @@
      */
     public function __sleep(): array {
-        throw new LogicException( __CLASS__ . ' should never be serialized' );
+        throw new LogicException( __CLASS__ . ' should never be serialized.' );
     }
 }

trunk/src/wp-includes/abilities-api/class-wp-ability-categories-registry.php

@@ -206 +206 @@
                 __METHOD__,
                 sprintf(
-                    __( 'Ability API should not be initialized before the <code>init</code> action has fired' )
+                    // translators: %s: init action.
+                    __( 'Ability API should not be initialized before the %s action has fired.' ),
+                    '<code>init</code>'
                 ),
                 '6.9.0'
@@ -250 +252 @@
      */
     public function __sleep(): array {
-        throw new LogicException( __CLASS__ . ' should never be serialized' );
+        throw new LogicException( __CLASS__ . ' should never be serialized.' );
     }
 }

trunk/src/wp-includes/abilities-api/class-wp-ability-category.php

@@ -76 +76 @@
         if ( empty( $slug ) ) {
             throw new InvalidArgumentException(
-                esc_html__( 'The ability category slug cannot be empty.' )
+                __( 'The ability category slug cannot be empty.' )
             );
         }
@@ -212 +212 @@
      */
     public function __sleep(): array {
-        throw new LogicException( __CLASS__ . ' should never be serialized' );
+        throw new LogicException( __CLASS__ . ' should never be serialized.' );
     }
 }

trunk/src/wp-includes/abilities-api/class-wp-ability.php

@@ -170 +170 @@
                         '<code>' . esc_html( $property_name ) . '</code>',
                         '<code>' . esc_html( $this->name ) . '</code>',
-                        '<code>' . self::class . '</code>'
+                        '<code>' . __CLASS__ . '</code>'
                     ),
                     '6.9.0'
@@ -446 +446 @@
                     /* translators: %s ability name. */
                     __( 'Ability "%s" does not define an input schema required to validate the provided input.' ),
-                    $this->name
+                    esc_html( $this->name )
                 )
             );
@@ -458 +458 @@
                     /* translators: %1$s ability name, %2$s error message. */
                     __( 'Ability "%1$s" has invalid input. Reason: %2$s' ),
-                    $this->name,
+                    esc_html( $this->name ),
                     $valid_input->get_error_message()
                 )
@@ -515 +515 @@
                 'ability_invalid_execute_callback',
                 /* translators: %s ability name. */
-                sprintf( __( 'Ability "%s" does not have a valid execute callback.' ), $this->name )
+                sprintf( __( 'Ability "%s" does not have a valid execute callback.' ), esc_html( $this->name ) )
             );
         }
@@ -543 +543 @@
                     /* translators: %1$s ability name, %2$s error message. */
                     __( 'Ability "%1$s" has invalid output. Reason: %2$s' ),
-                    $this->name,
+                    esc_html( $this->name ),
                     $valid_output->get_error_message()
                 )
@@ -582 +582 @@
                 'ability_invalid_permissions',
                 /* translators: %s ability name. */
-                sprintf( __( 'Ability "%s" does not have necessary permission.' ), $this->name )
+                sprintf( __( 'Ability "%s" does not have necessary permission.' ), esc_html( $this->name ) )
             );
         }
@@ -639 +639 @@
      */
     public function __sleep(): array {
-        throw new LogicException( __CLASS__ . ' should never be serialized' );
+        throw new LogicException( __CLASS__ . ' should never be serialized.' );
     }
 }