WordPress.org

Make WordPress Core

Changeset 44451


Ignore:
Timestamp:
01/08/2019 03:28:15 AM (3 years ago)
Author:
pento
Message:

Install/Upgrade: Link to HelpHub instead of the Codex.

WordPress version links in the Codex (eg, https://codex.wordpress.org/Version_5.0) are redirected to their HelpHub equivalent.

Rather than relying on the redirect, Core and link directly to HelpHub.

Props swissspidy.
Fixes #45574.

Location:
trunk/src/wp-admin
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-admin/includes/update.php

    r43571 r44451  
    263263    }
    264264
     265    $version_url = sprintf(
     266        /* translators: %s: WordPress version */
     267        esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ),
     268        sanitize_title( $cur->current )
     269    );
     270
    265271    if ( current_user_can( 'update_core' ) ) {
    266272        $msg = sprintf(
    267             /* translators: 1: Codex URL to release notes, 2: new WordPress version, 3: URL to network admin, 4: accessibility text */
     273            /* translators: 1: URL to WordPress release notes, 2: new WordPress version, 3: URL to network admin, 4: accessibility text */
    268274            __( '<a href="%1$s">WordPress %2$s</a> is available! <a href="%3$s" aria-label="%4$s">Please update now</a>.' ),
    269             sprintf(
    270                 /* translators: %s: WordPress version */
    271                 esc_url( __( 'https://codex.wordpress.org/Version_%s' ) ),
    272                 $cur->current
    273             ),
     275            $version_url,
    274276            $cur->current,
    275277            network_admin_url( 'update-core.php' ),
     
    278280    } else {
    279281        $msg = sprintf(
    280             /* translators: 1: Codex URL to release notes, 2: new WordPress version */
     282            /* translators: 1: URL to WordPress release notes, 2: new WordPress version */
    281283            __( '<a href="%1$s">WordPress %2$s</a> is available! Please notify the site administrator.' ),
    282             sprintf(
    283                 /* translators: %s: WordPress version */
    284                 esc_url( __( 'https://codex.wordpress.org/Version_%s' ) ),
    285                 $cur->current
    286             ),
     284            $version_url,
    287285            $cur->current
    288286        );
  • trunk/src/wp-admin/install.php

    r43571 r44451  
    239239$mysql_compat  = version_compare( $mysql_version, $required_mysql_version, '>=' ) || file_exists( WP_CONTENT_DIR . '/db.php' );
    240240
     241$version_url = sprintf(
     242    /* translators: %s: WordPress version */
     243    esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ),
     244    sanitize_title( $wp_version )
     245);
     246
    241247if ( ! $mysql_compat && ! $php_compat ) {
    242     /* 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 */
    243     $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 );
     248    /* 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 */
     249    $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 );
    244250} elseif ( ! $php_compat ) {
    245     /* translators: 1: WordPress version number, 2: Minimum required PHP version number, 3: Current PHP version number */
    246     $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 );
     251    /* translators: 1: URL to WordPress release notes, 2: WordPress version number, 3: Minimum required PHP version number, 4: Current PHP version number */
     252    $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 );
    247253} elseif ( ! $mysql_compat ) {
    248     /* translators: 1: WordPress version number, 2: Minimum required MySQL version number, 3: Current MySQL version number */
    249     $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 );
     254    /* translators: 1: URL to WordPress release notes, 2: WordPress version number, 3: Minimum required MySQL version number, 4: Current MySQL version number */
     255    $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 );
    250256}
    251257
  • trunk/src/wp-admin/update-core.php

    r43571 r44451  
    7171            }
    7272
     73            $version_url = sprintf(
     74                /* translators: %s: WordPress version */
     75                esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ),
     76                sanitize_title( $update->current )
     77            );
     78
    7379            if ( ! $mysql_compat && ! $php_compat ) {
    74                 /* 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 */
    75                 $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 );
     80                /* 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 */
     81                $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 );
    7682            } elseif ( ! $php_compat ) {
    77                 /* translators: 1: WordPress version number, 2: Minimum required PHP version number, 3: Current PHP version number */
    78                 $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 );
     83                /* translators: 1: URL to WordPress release notes, 1: WordPress version number, 2: Minimum required PHP version number, 3: Current PHP version number */
     84                $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 );
    7985            } elseif ( ! $mysql_compat ) {
    8086                /* translators: 1: WordPress version number, 2: Minimum required MySQL version number, 3: Current MySQL version number */
    81                 $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 );
    82             } else {              /* translators: 1: WordPress version number, 2: WordPress version number including locale if necessary */
    83                 $message = sprintf( __( 'You can update to <a href="https://codex.wordpress.org/Version_%1$s">WordPress %2$s</a> automatically:' ), $update->current, $version_string );
     87                $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 );
     88            } else {
     89                /* translators: 1: URL to WordPress release notes, 2: WordPress version number including locale if necessary */
     90                $message = sprintf( __( 'You can update to <a href="%1$s">WordPress %2$s</a> automatically:' ), $version_url, $version_string );
    8491            }
    8592            if ( ! $mysql_compat || ! $php_compat ) {
  • trunk/src/wp-admin/upgrade.php

    r43571 r44451  
    8181    <?php
    8282elseif ( ! $php_compat || ! $mysql_compat ) :
     83    $version_url = sprintf(
     84        /* translators: %s: WordPress version */
     85        esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ),
     86        sanitize_title( $wp_version )
     87    );
     88
    8389    if ( ! $mysql_compat && ! $php_compat ) {
    84         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 );
     90        /* 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 */
     91        $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 );
    8592    } elseif ( ! $php_compat ) {
    86         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 );
     93        /* translators: 1: URL to WordPress release notes, 1: WordPress version number, 2: Minimum required PHP version number, 3: Current PHP version number */
     94        $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 );
    8795    } elseif ( ! $mysql_compat ) {
    88         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 );
     96        /* translators: 1: WordPress version number, 2: Minimum required MySQL version number, 3: Current MySQL version number */
     97        $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 );
    8998    }
    9099    ?>
Note: See TracChangeset for help on using the changeset viewer.