<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[61071] trunk/src/wp-includes: Abilities API: Code quality fixes around translations</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/61071">61071</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/61071","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>gziolo</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2025-10-27 11:55:51 +0000 (Mon, 27 Oct 2025)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>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 <a href="https://core.trac.wordpress.org/changeset/61032">[61032]</a>.
Props gziolo, jorgefilipecosta.
See <a href="https://core.trac.wordpress.org/ticket/64098">#64098</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesabilitiesapiclasswpabilitiesregistryphp">trunk/src/wp-includes/abilities-api/class-wp-abilities-registry.php</a></li>
<li><a href="#trunksrcwpincludesabilitiesapiclasswpabilitycategoriesregistryphp">trunk/src/wp-includes/abilities-api/class-wp-ability-categories-registry.php</a></li>
<li><a href="#trunksrcwpincludesabilitiesapiclasswpabilitycategoryphp">trunk/src/wp-includes/abilities-api/class-wp-ability-category.php</a></li>
<li><a href="#trunksrcwpincludesabilitiesapiclasswpabilityphp">trunk/src/wp-includes/abilities-api/class-wp-ability.php</a></li>
<li><a href="#trunksrcwpincludesabilitiesapiphp">trunk/src/wp-includes/abilities-api.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesabilitiesapiclasswpabilitiesregistryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/abilities-api/class-wp-abilities-registry.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/abilities-api/class-wp-abilities-registry.php 2025-10-27 11:15:03 UTC (rev 61070)
+++ trunk/src/wp-includes/abilities-api/class-wp-abilities-registry.php 2025-10-27 11:55:51 UTC (rev 61071)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -236,7 +236,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @see wp_get_ability()
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $name The name of the registered ability, with its namespace.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return ?WP_Ability The registered ability instance, or null if it is not registered.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return WP_Ability|null The registered ability instance, or null if it is not registered.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function get_registered( string $name ): ?WP_Ability {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $this->is_registered( $name ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -243,7 +243,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> _doing_it_wrong(
</span><span class="cx" style="display: block; padding: 0 10px"> __METHOD__,
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Ability name. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- sprintf( esc_html__( 'Ability "%s" not found.' ), esc_attr( $name ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ sprintf( __( 'Ability "%s" not found.' ), esc_html( $name ) ),
</ins><span class="cx" style="display: block; padding: 0 10px"> '6.9.0'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> return null;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -265,7 +265,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> _doing_it_wrong(
</span><span class="cx" style="display: block; padding: 0 10px"> __METHOD__,
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'Ability API should not be initialized before the <code>init</code> action has fired' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // translators: %s: init action.
+ __( 'Ability API should not be initialized before the %s action has fired.' ),
+ '<code>init</code>'
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> '6.9.0'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -314,6 +316,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * This is a security hardening measure to prevent serialization of the registry.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function __sleep(): array {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- throw new LogicException( __CLASS__ . ' should never be serialized' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ throw new LogicException( __CLASS__ . ' should never be serialized.' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesabilitiesapiclasswpabilitycategoriesregistryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/abilities-api/class-wp-ability-categories-registry.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/abilities-api/class-wp-ability-categories-registry.php 2025-10-27 11:15:03 UTC (rev 61070)
+++ trunk/src/wp-includes/abilities-api/class-wp-ability-categories-registry.php 2025-10-27 11:55:51 UTC (rev 61071)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -205,7 +205,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> _doing_it_wrong(
</span><span class="cx" style="display: block; padding: 0 10px"> __METHOD__,
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'Ability API should not be initialized before the <code>init</code> action has fired' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // translators: %s: init action.
+ __( 'Ability API should not be initialized before the %s action has fired.' ),
+ '<code>init</code>'
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> '6.9.0'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -249,6 +251,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * This is a security hardening measure to prevent serialization of the registry.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function __sleep(): array {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- throw new LogicException( __CLASS__ . ' should never be serialized' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ throw new LogicException( __CLASS__ . ' should never be serialized.' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesabilitiesapiclasswpabilitycategoryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/abilities-api/class-wp-ability-category.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/abilities-api/class-wp-ability-category.php 2025-10-27 11:15:03 UTC (rev 61070)
+++ trunk/src/wp-includes/abilities-api/class-wp-ability-category.php 2025-10-27 11:55:51 UTC (rev 61071)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,7 +75,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function __construct( string $slug, array $args ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $slug ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> throw new InvalidArgumentException(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- esc_html__( 'The ability category slug cannot be empty.' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'The ability category slug cannot be empty.' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -211,6 +211,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * This is a security hardening measure to prevent serialization of the ability category.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function __sleep(): array {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- throw new LogicException( __CLASS__ . ' should never be serialized' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ throw new LogicException( __CLASS__ . ' should never be serialized.' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesabilitiesapiclasswpabilityphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/abilities-api/class-wp-ability.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/abilities-api/class-wp-ability.php 2025-10-27 11:15:03 UTC (rev 61070)
+++ trunk/src/wp-includes/abilities-api/class-wp-ability.php 2025-10-27 11:55:51 UTC (rev 61071)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -169,7 +169,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Property "%1$s" is not a valid property for ability "%2$s". Please check the %3$s class for allowed properties.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>' . esc_html( $property_name ) . '</code>',
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>' . esc_html( $this->name ) . '</code>',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<code>' . self::class . '</code>'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<code>' . __CLASS__ . '</code>'
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> '6.9.0'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -445,7 +445,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s ability name. */
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Ability "%s" does not define an input schema required to validate the provided input.' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->name
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ esc_html( $this->name )
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -457,7 +457,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %1$s ability name, %2$s error message. */
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Ability "%1$s" has invalid input. Reason: %2$s' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->name,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ esc_html( $this->name ),
</ins><span class="cx" style="display: block; padding: 0 10px"> $valid_input->get_error_message()
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -514,7 +514,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error(
</span><span class="cx" style="display: block; padding: 0 10px"> 'ability_invalid_execute_callback',
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s ability name. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- sprintf( __( 'Ability "%s" does not have a valid execute callback.' ), $this->name )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ sprintf( __( 'Ability "%s" does not have a valid execute callback.' ), esc_html( $this->name ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -542,7 +542,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %1$s ability name, %2$s error message. */
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Ability "%1$s" has invalid output. Reason: %2$s' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->name,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ esc_html( $this->name ),
</ins><span class="cx" style="display: block; padding: 0 10px"> $valid_output->get_error_message()
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -581,7 +581,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error(
</span><span class="cx" style="display: block; padding: 0 10px"> 'ability_invalid_permissions',
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s ability name. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- sprintf( __( 'Ability "%s" does not have necessary permission.' ), $this->name )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ sprintf( __( 'Ability "%s" does not have necessary permission.' ), esc_html( $this->name ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -638,6 +638,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * This is a security hardening measure to prevent serialization of the ability.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function __sleep(): array {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- throw new LogicException( __CLASS__ . ' should never be serialized' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ throw new LogicException( __CLASS__ . ' should never be serialized.' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesabilitiesapiphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/abilities-api.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/abilities-api.php 2025-10-27 11:15:03 UTC (rev 61070)
+++ trunk/src/wp-includes/abilities-api.php 2025-10-27 11:55:51 UTC (rev 61071)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -274,7 +274,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> __FUNCTION__,
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: wp_abilities_api_init, 2: string value of the ability name. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- esc_html__( 'Abilities must be registered on the %1$s action. The ability %2$s was not registered.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'Abilities must be registered on the %1$s action. The ability %2$s was not registered.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> '<code>wp_abilities_api_init</code>',
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>' . esc_html( $name ) . '</code>'
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span></span></pre>
</div>
</div>
</body>
</html>