WordPress.org

Make WordPress Core

Changeset 31899


Ignore:
Timestamp:
03/26/2015 03:16:33 PM (6 years ago)
Author:
ocean90
Message:

Remove <code> tags from translatable strings.

Uncomment deprecation notice for get_bloginfo( 'text_direction' ), see [14360].

props ramiy, DrewAPicture.
fixes #30614.

Location:
trunk/src/wp-includes
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-includes/general-template.php

    r31854 r31899  
    610610        case 'home' : // DEPRECATED
    611611        case 'siteurl' : // DEPRECATED
    612             _deprecated_argument( __FUNCTION__, '2.2', sprintf( __('The <code>%s</code> option is deprecated for the family of <code>bloginfo()</code> functions.' ), $show ) . ' ' . sprintf( __( 'Use the <code>%s</code> option instead.' ), 'url'  ) );
     612            _deprecated_argument( __FUNCTION__, '2.2', sprintf(
     613                /* translators: 1: 'siteurl'/'home' argument, 2: bloginfo() function name, 3: 'url' argument */
     614                __( 'The %1$s option is deprecated for the family of %2$s functions. Use the %3$s option instead.' ),
     615                '<code>' . $show . '</code>',
     616                '<code>bloginfo()</code>',
     617                '<code>url</code>'
     618            ) );
    613619        case 'url' :
    614620            $output = home_url();
     
    670676            break;
    671677        case 'text_direction':
    672             //_deprecated_argument( __FUNCTION__, '2.2', sprintf( __('The <code>%s</code> option is deprecated for the family of <code>bloginfo()</code> functions.' ), $show ) . ' ' . sprintf( __( 'Use the <code>%s</code> function instead.' ), 'is_rtl()'  ) );
     678            _deprecated_argument( __FUNCTION__, '2.2', sprintf(
     679                /* translators: 1: 'text_direction' argument, 2: bloginfo() function name, 3: is_rtl() function name */
     680                __( 'The %1$s option is deprecated for the family of %2$s functions. Use the %3$s function instead.' ),
     681                '<code>' . $show . '</code>',
     682                '<code>bloginfo()</code>',
     683                '<code>is_rtl()</code>'
     684            ) );
    673685            if ( function_exists( 'is_rtl' ) ) {
    674686                $output = is_rtl() ? 'rtl' : 'ltr';
  • trunk/src/wp-includes/ms-load.php

    r31657 r31899  
    409409    $query = $wpdb->prepare( "SHOW TABLES LIKE %s", $wpdb->esc_like( $wpdb->site ) );
    410410    if ( ! $wpdb->get_var( $query ) ) {
    411         $msg .= '<p>' . sprintf( __( '<strong>Database tables are missing.</strong> This means that MySQL is not running, WordPress was not installed properly, or someone deleted <code>%s</code>. You really should look at your database now.' ), $wpdb->site ) . '</p>';
     411        $msg .= '<p>' . sprintf(
     412            /* translators: %s: table name */
     413            __( '<strong>Database tables are missing.</strong> This means that MySQL is not running, WordPress was not installed properly, or someone deleted %s. You really should look at your database now.' ),
     414            '<code>' . $wpdb->site . '</code>'
     415        ) . '</p>';
    412416    } else {
    413         $msg .= '<p>' . sprintf( __( '<strong>Could not find site <code>%1$s</code>.</strong> Searched for table <code>%2$s</code> in database <code>%3$s</code>. Is that right?' ), rtrim( $domain . $path, '/' ), $wpdb->blogs, DB_NAME ) . '</p>';
     417        $msg .= '<p>' . sprintf(
     418            /* translators: 1: site url, 2: table name, 3: database name */
     419            __( '<strong>Could not find site %1$s.</strong> Searched for table %2$s in database %3$s. Is that right?' ),
     420            '<code>' . rtrim( $domain . $path, '/' ) . '</code>',
     421            '<code>' . $wpdb->blogs . '</code>',
     422            '<code>' . DB_NAME . '</code>'
     423        ) . '</p>';
    414424    }
    415425    $msg .= '<p><strong>' . __( 'What do I do now?' ) . '</strong> ';
Note: See TracChangeset for help on using the changeset viewer.