WordPress.org
Get WordPress

Make WordPress Core

Ticket #47239: 47239.patch

File 47239.patch, 14.4 KB (added by dilipbheda, 6 years ago)

  • src/wp-admin/includes/plugin-install.php 

    diff --git a/src/wp-admin/includes/plugin-install.php b/src/wp-admin/includes/plugin-install.php
index b5f770d65a..078ae3b104 100644
    a b function plugins_api( $action, $args = array() ) { 
    173173                if ( $ssl && is_wp_error( $request ) ) {
    174174                        trigger_error(
    175175                                sprintf(
    176                                         /* translators: %s: support forums URL */
    177                                         __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.' ),
     176                                        /* translators: %s: support URL */
     177                                        __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support</a>.' ),
    178178                                        __( 'https://wordpress.org/support/' )
    179179                                ) . ' ' . __( '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)' ),
    180180                                headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE
    … … function plugins_api( $action, $args = array() ) { 
    186186                        $res = new WP_Error(
    187187                                'plugins_api_failed',
    188188                                sprintf(
    189                                         /* translators: %s: support forums URL */
    190                                         __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.' ),
     189                                        /* translators: %s: support URL */
     190                                        __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support</a>.' ),
    191191                                        __( 'https://wordpress.org/support/' )
    192192                                ),
    193193                                $request->get_error_message()
    … … function plugins_api( $action, $args = array() ) { 
    201201                                $res = new WP_Error(
    202202                                        'plugins_api_failed',
    203203                                        sprintf(
    204                                                 /* translators: %s: support forums URL */
    205                                                 __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.' ),
     204                                                /* translators: %s: support URL */
     205                                                __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support</a>.' ),
    206206                                                __( 'https://wordpress.org/support/' )
    207207                                        ),
    208208                                        wp_remote_retrieve_body( $request )

  • src/wp-admin/includes/theme.php 

    diff --git a/src/wp-admin/includes/theme.php b/src/wp-admin/includes/theme.php
index f1d0d374bd..78a52b2124 100644
    a b function themes_api( $action, $args = array() ) { 
    503503                        if ( ! wp_doing_ajax() ) {
    504504                                trigger_error(
    505505                                        sprintf(
    506                                                 /* translators: %s: support forums URL */
    507                                                 __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.' ),
     506                                                /* translators: %s: support URL */
     507                                                __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support</a>.' ),
    508508                                                __( 'https://wordpress.org/support/' )
    509509                                        ) . ' ' . __( '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)' ),
    510510                                        headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE
    … … function themes_api( $action, $args = array() ) { 
    517517                        $res = new WP_Error(
    518518                                'themes_api_failed',
    519519                                sprintf(
    520                                         /* translators: %s: support forums URL */
    521                                         __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.' ),
     520                                        /* translators: %s: support URL */
     521                                        __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support</a>.' ),
    522522                                        __( 'https://wordpress.org/support/' )
    523523                                ),
    524524                                $request->get_error_message()
    … … function themes_api( $action, $args = array() ) { 
    532532                                $res = new WP_Error(
    533533                                        'themes_api_failed',
    534534                                        sprintf(
    535                                                 /* translators: %s: support forums URL */
    536                                                 __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.' ),
     535                                                /* translators: %s: support URL */
     536                                                __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support</a>.' ),
    537537                                                __( 'https://wordpress.org/support/' )
    538538                                        ),
    539539                                        wp_remote_retrieve_body( $request )

  • src/wp-admin/includes/translation-install.php 

    diff --git a/src/wp-admin/includes/translation-install.php b/src/wp-admin/includes/translation-install.php
index 73d27fb1b2..7ff5380155 100644
    a b function translations_api( $type, $args = null ) { 
    5858                if ( $ssl && is_wp_error( $request ) ) {
    5959                        trigger_error(
    6060                                sprintf(
    61                                         /* translators: %s: support forums URL */
    62                                         __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.' ),
     61                                        /* translators: %s: support URL */
     62                                        __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support</a>.' ),
    6363                                        __( 'https://wordpress.org/support/' )
    6464                                ) . ' ' . __( '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)' ),
    6565                                headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE
    … … function translations_api( $type, $args = null ) { 
    7272                        $res = new WP_Error(
    7373                                'translations_api_failed',
    7474                                sprintf(
    75                                         /* translators: %s: support forums URL */
    76                                         __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.' ),
     75                                        /* translators: %s: support URL */
     76                                        __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support</a>.' ),
    7777                                        __( 'https://wordpress.org/support/' )
    7878                                ),
    7979                                $request->get_error_message()
    … … function translations_api( $type, $args = null ) { 
    8484                                $res = new WP_Error(
    8585                                        'translations_api_failed',
    8686                                        sprintf(
    87                                                 /* translators: %s: support forums URL */
    88                                                 __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.' ),
     87                                                /* translators: %s: support URL */
     88                                                __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support</a>.' ),
    8989                                                __( 'https://wordpress.org/support/' )
    9090                                        ),
    9191                                        wp_remote_retrieve_body( $request )

  • src/wp-admin/includes/update.php 

    diff --git a/src/wp-admin/includes/update.php b/src/wp-admin/includes/update.php
index 1a4bee003a..0bbdfee63d 100644
    a b function get_core_checksums( $version, $locale ) { 
    130130        if ( $ssl && is_wp_error( $response ) ) {
    131131                trigger_error(
    132132                        sprintf(
    133                                 /* translators: %s: support forums URL */
    134                                 __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.' ),
     133                                /* translators: %s: support URL */
     134                                __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support</a>.' ),
    135135                                __( 'https://wordpress.org/support/' )
    136136                        ) . ' ' . __( '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)' ),
    137137                        headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE

  • src/wp-admin/theme-install.php 

    diff --git a/src/wp-admin/theme-install.php b/src/wp-admin/theme-install.php
index 8184297991..d996d3853e 100644
    a b wp_localize_script( 
    5858                        'upload'              => __( 'Upload Theme' ),
    5959                        'back'                => __( 'Back' ),
    6060                        'error'               => sprintf(
    61                                 /* translators: %s: support forums URL */
    62                                 __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.' ),
     61                                /* translators: %s: support URL */
     62                                __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support</a>.' ),
    6363                                __( 'https://wordpress.org/support/' )
    6464                        ),
    6565                        'tryAgain'            => __( 'Try Again' ),

  • src/wp-includes/customize/class-wp-customize-themes-section.php 

    diff --git a/src/wp-includes/customize/class-wp-customize-themes-section.php b/src/wp-includes/customize/class-wp-customize-themes-section.php
index b112552e23..8f20357102 100644
    a b class WP_Customize_Themes_Section extends WP_Customize_Section { 
    8181                                                <?php $this->filter_bar_content_template(); ?>
    8282                                        </div>
    8383                                        <?php $this->filter_drawer_content_template(); ?>
    84                                         <div class="error unexpected-error" style="display: none; "><p><?php _e( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.' ); ?></p></div>
     84                                        <div class="error unexpected-error" style="display: none; "><p><?php _e( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support</a>.' ); ?></p></div>
    8585                                        <ul class="themes">
    8686                                        </ul>
    8787                                        <p class="no-themes"><?php _e( 'No themes found. Try a different search.' ); ?></p>

  • src/wp-includes/update.php 

    diff --git a/src/wp-includes/update.php b/src/wp-includes/update.php
index 824575099b..4afa579221 100644
    a b function wp_version_check( $extra_stats = array(), $force_check = false ) { 
    153153        if ( $ssl && is_wp_error( $response ) ) {
    154154                trigger_error(
    155155                        sprintf(
    156                                 /* translators: %s: support forums URL */
    157                                 __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.' ),
     156                                /* translators: %s: support URL */
     157                                __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support</a>.' ),
    158158                                __( 'https://wordpress.org/support/' )
    159159                        ) . ' ' . __( '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)' ),
    160160                        headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE
    … … function wp_update_plugins( $extra_stats = array() ) { 
    377377        if ( $ssl && is_wp_error( $raw_response ) ) {
    378378                trigger_error(
    379379                        sprintf(
    380                                 /* translators: %s: support forums URL */
    381                                 __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.' ),
     380                                /* translators: %s: support URL */
     381                                __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support</a>.' ),
    382382                                __( 'https://wordpress.org/support/' )
    383383                        ) . ' ' . __( '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)' ),
    384384                        headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE
    … … function wp_update_themes( $extra_stats = array() ) { 
    562562        if ( $ssl && is_wp_error( $raw_response ) ) {
    563563                trigger_error(
    564564                        sprintf(
    565                                 /* translators: %s: support forums URL */
    566                                 __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.' ),
     565                                /* translators: %s: support URL */
     566                                __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support</a>.' ),
    567567                                __( 'https://wordpress.org/support/' )
    568568                        ) . ' ' . __( '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)' ),
    569569                        headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE

  • src/wp-login.php 

    diff --git a/src/wp-login.php b/src/wp-login.php
index 5ecf5f0dbf..143b4c42a0 100644
    a b switch ( $action ) { 
    938938                                $user = new WP_Error(
    939939                                        'test_cookie',
    940940                                        sprintf(
    941                                                 /* translators: 1: Browser cookie documentation URL, 2: Support forums URL */
    942                                                 __( '<strong>ERROR</strong>: Cookies are blocked due to unexpected output. For help, please see <a href="%1$s">this documentation</a> or try the <a href="%2$s">support forums</a>.' ),
     941                                                /* translators: 1: Browser cookie documentation URL, 2: Support URL */
     942                                                __( '<strong>ERROR</strong>: Cookies are blocked due to unexpected output. For help, please see <a href="%1$s">this documentation</a> or try the <a href="%2$s">support</a>.' ),
    943943                                                __( 'https://wordpress.org/support/article/cookies/' ),
    944944                                                __( 'https://wordpress.org/support/' )
    945945                                        )