Ticket #45574: 45574.diff

src/wp-admin/includes/update.php

@@ -262 +262 @@
                 return false;
         }
 
+        $version_url = sprintf(
+                /* translators: %s: WordPress version */
+                esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ),
+                sanitize_title( $cur->current )
+        );
+
         if ( current_user_can( 'update_core' ) ) {
                 $msg = sprintf(
-                        /* translators: 1: Codex URL to release notes, 2: new WordPress version, 3: URL to network admin, 4: accessibility text */
+                        /* translators: 1: URL to WordPress release notes, 2: new WordPress version, 3: URL to network admin, 4: accessibility text */
                         __( '<a href="%1$s">WordPress %2$s</a> is available! <a href="%3$s" aria-label="%4$s">Please update now</a>.' ),
-                        sprintf(
-                                /* translators: %s: WordPress version */
-                                esc_url( __( 'https://codex.wordpress.org/Version_%s' ) ),
-                                $cur->current
-                        ),
+                        $version_url,
                         $cur->current,
                         network_admin_url( 'update-core.php' ),
                         esc_attr__( 'Please update WordPress now' )
                 );
         } else {
                 $msg = sprintf(
-                        /* translators: 1: Codex URL to release notes, 2: new WordPress version */
+                        /* translators: 1: URL to WordPress release notes, 2: new WordPress version */
                         __( '<a href="%1$s">WordPress %2$s</a> is available! Please notify the site administrator.' ),
-                        sprintf(
-                                /* translators: %s: WordPress version */
-                                esc_url( __( 'https://codex.wordpress.org/Version_%s' ) ),
-                                $cur->current
-                        ),
+                        $version_url,
                         $cur->current
                 );
         }

src/wp-admin/install.php

@@ -238 +238 @@
 $php_compat    = version_compare( $php_version, $required_php_version, '>=' );
 $mysql_compat  = version_compare( $mysql_version, $required_mysql_version, '>=' ) || file_exists( WP_CONTENT_DIR . '/db.php' );
 
+$version_url = sprintf(
+        /* translators: %s: WordPress version */
+        esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ),
+        sanitize_title( $wp_version )
+);
+
 if ( ! $mysql_compat && ! $php_compat ) {
-        /* translators: 1: WordPress version number, 2: Minimum required PHP version number, 3: Minimum required MySQL version number, 4: Current PHP version number, 5: Current MySQL version number */
-        $compat = sprintf( __( 'You cannot install because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.' ), $wp_version, $required_php_version, $required_mysql_version, $php_version, $mysql_version );
+        /* translators: 1: URL to WordPress release notes, 2: WordPress version number, 3: Minimum required PHP version number, 4: Minimum required MySQL version number, 5: Current PHP version number, 6: Current MySQL version number */
+        $compat = sprintf(__( 'You cannot install because <a href="%1$s">WordPress %2$s</a> requires PHP version %3$s or higher and MySQL version %4$s or higher. You are running PHP version %5$s and MySQL version %6$s.' ), $version_url, $wp_version, $required_php_version, $required_mysql_version, $php_version, $mysql_version );
 } elseif ( ! $php_compat ) {
-        /* translators: 1: WordPress version number, 2: Minimum required PHP version number, 3: Current PHP version number */
-        $compat = sprintf( __( 'You cannot install because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher. You are running version %3$s.' ), $wp_version, $required_php_version, $php_version );
+        /* translators: 1: URL to WordPress release notes, 2: WordPress version number, 3: Minimum required PHP version number, 4: Current PHP version number */
+        $compat = sprintf( __( 'You cannot install because <a href="%1$s">WordPress %2$s</a> requires PHP version %3$s or higher. You are running version %4$s.' ), $version_url, $wp_version, $required_php_version, $php_version );
 } elseif ( ! $mysql_compat ) {
-        /* translators: 1: WordPress version number, 2: Minimum required MySQL version number, 3: Current MySQL version number */
-        $compat = sprintf( __( 'You cannot install because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires MySQL version %2$s or higher. You are running version %3$s.' ), $wp_version, $required_mysql_version, $mysql_version );
+        /* translators: 1: URL to WordPress release notes, 2: WordPress version number, 3: Minimum required MySQL version number, 4: Current MySQL version number */
+        $compat = sprintf( __( 'You cannot install because <a href="%1$s">WordPress %2$s</a> requires MySQL version %3$s or higher. You are running version %4$s.' ), $version_url, $wp_version, $required_mysql_version, $mysql_version );
 }
 
 if ( ! $mysql_compat || ! $php_compat ) {

src/wp-admin/update-core.php

@@ -70 +70 @@
                                 $mysql_compat = version_compare( $mysql_version, $update->mysql_version, '>=' );
                         }
 
+                        $version_url = sprintf(
+                                /* translators: %s: WordPress version */
+                                esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ),
+                                sanitize_title( $update->current )
+                        );
+
                         if ( ! $mysql_compat && ! $php_compat ) {
-                                /* translators: 1: WordPress version number, 2: Minimum required PHP version number, 3: Minimum required MySQL version number, 4: Current PHP version number, 5: Current MySQL version number */
-                                $message = sprintf( __( 'You cannot update because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.' ), $update->current, $update->php_version, $update->mysql_version, $php_version, $mysql_version );
+                                /* translators: 1: URL to WordPress release notes, 2: WordPress version number, 3: Minimum required PHP version number, 4: Minimum required MySQL version number, 5: Current PHP version number, 6: Current MySQL version number */
+                                $message = sprintf( __( 'You cannot update because <a href="%1$s">WordPress %2$s</a> requires PHP version %3$s or higher and MySQL version %4$s or higher. You are running PHP version %5$s and MySQL version %6$s.' ), $version_url, $update->current, $update->php_version, $update->mysql_version, $php_version, $mysql_version );
                         } elseif ( ! $php_compat ) {
-                                /* translators: 1: WordPress version number, 2: Minimum required PHP version number, 3: Current PHP version number */
-                                $message = sprintf( __( 'You cannot update because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher. You are running version %3$s.' ), $update->current, $update->php_version, $php_version );
+                                /* translators: 1: URL to WordPress release notes, 1: WordPress version number, 2: Minimum required PHP version number, 3: Current PHP version number */
+                                $message = sprintf( __( 'You cannot update because <a href="%1$s">WordPress %2$s</a> requires PHP version %3$s or higher. You are running version %4$s.' ), $version_url, $update->current, $update->php_version, $php_version );
                         } elseif ( ! $mysql_compat ) {
                                 /* translators: 1: WordPress version number, 2: Minimum required MySQL version number, 3: Current MySQL version number */
-                                $message = sprintf( __( 'You cannot update because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires MySQL version %2$s or higher. You are running version %3$s.' ), $update->current, $update->mysql_version, $mysql_version );
-                        } else {              /* translators: 1: WordPress version number, 2: WordPress version number including locale if necessary */
-                                $message = sprintf( __( 'You can update to <a href="https://codex.wordpress.org/Version_%1$s">WordPress %2$s</a> automatically:' ), $update->current, $version_string );
+                                $message = sprintf( __( 'You cannot update because <a href="%1$s">WordPress %2$s</a> requires MySQL version %3$s or higher. You are running version %4$s.' ), $version_url, $update->current, $update->mysql_version, $mysql_version );
+                        } else {
+                                /* translators: 1: URL to WordPress release notes, 2: WordPress version number including locale if necessary */
+                                $message = sprintf( __( 'You can update to <a href="%1$s">WordPress %2$s</a> automatically:' ), $version_url, $version_string );
                         }
                         if ( ! $mysql_compat || ! $php_compat ) {
                                 $show_buttons = false;

src/wp-admin/upgrade.php

@@ -80 +80 @@
 
         <?php
 elseif ( ! $php_compat || ! $mysql_compat ) :
+        $version_url = sprintf(
+                /* translators: %s: WordPress version */
+                esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ),
+                sanitize_title( $wp_version )
+        );
+
         if ( ! $mysql_compat && ! $php_compat ) {
-                printf( __( 'You cannot update because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.' ), $wp_version, $required_php_version, $required_mysql_version, $php_version, $mysql_version );
+                /* translators: 1: URL to WordPress release notes, 2: WordPress version number, 3: Minimum required PHP version number, 4: Minimum required MySQL version number, 5: Current PHP version number, 6: Current MySQL version number */
+                $message = sprintf( __( 'You cannot update because <a href="%1$s">WordPress %2$s</a> requires PHP version %3$s or higher and MySQL version %4$s or higher. You are running PHP version %5$s and MySQL version %6$s.' ), $version_url, $wp_version, $required_php_version, $required_mysql_version, $php_version, $mysql_version );
         } elseif ( ! $php_compat ) {
-                printf( __( 'You cannot update because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher. You are running version %3$s.' ), $wp_version, $required_php_version, $php_version );
+                /* translators: 1: URL to WordPress release notes, 1: WordPress version number, 2: Minimum required PHP version number, 3: Current PHP version number */
+                $message = sprintf( __( 'You cannot update because <a href="%1$s">WordPress %2$s</a> requires PHP version %3$s or higher. You are running version %4$s.' ), $version_url, $wp_version, $required_php_version, $php_version );
         } elseif ( ! $mysql_compat ) {
-                printf( __( 'You cannot update because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires MySQL version %2$s or higher. You are running version %3$s.' ), $wp_version, $required_mysql_version, $mysql_version );
+                /* translators: 1: WordPress version number, 2: Minimum required MySQL version number, 3: Current MySQL version number */
+                $message = sprintf( __( 'You cannot update because <a href="%1$s">WordPress %2$s</a> requires MySQL version %3$s or higher. You are running version %4$s.' ), $version_url, $wp_version, $required_mysql_version, $mysql_version );
         }
         ?>
         <?php