WordPress.org

Make WordPress Core

Ticket #13238: 13238.3.diff

File 13238.3.diff, 4.0 KB (added by PeteMall, 4 years ago)

Updated patch.

  • wp-admin/ms-themes.php

     
    2929        <form action="<?php echo esc_url( admin_url( 'ms-edit.php?action=updatethemes' ) ); ?>" method="post"> 
    3030                <?php screen_icon(); ?> 
    3131                <h2><?php _e( 'Network Themes' ) ?></h2> 
    32                 <p><?php _e( 'Disable themes network-wide. You can enable themes on a site-by-site basis.' ) ?></p> 
     32                <p><?php _e( 'Themes must be enabled for your network before they will be available to individual sites.' ) ?></p> 
    3333                <table class="widefat"> 
    3434                        <thead> 
    3535                                <tr> 
    36                                         <th style="width:15%;text-align:center;"><?php _e( 'Active' ) ?></th> 
     36                                        <th style="width:15%;text-align:center;"><?php _e( 'Enable' ) ?></th> 
    3737                                        <th style="width:25%;"><?php _e( 'Theme' ) ?></th> 
    3838                                        <th style="width:10%;"><?php _e( 'Version' ) ?></th> 
    3939                                        <th style="width:60%;"><?php _e( 'Description' ) ?></th> 
     
    8080        <p> 
    8181                <?php printf( __( 'Themes Installed: %d' ), $total_theme_count); ?> 
    8282                <br /> 
    83                 <?php printf( __( 'Themes Activated: %d' ), $activated_themes_count); ?> 
     83                <?php printf( __( 'Themes Enabled: %d' ), $activated_themes_count); ?> 
    8484        </p> 
    8585</div> 
    8686 
  • wp-admin/themes.php

     
    3434$help = '<p>' . __('Themes give your WordPress style. Once a theme is installed, you may preview it, activate it or deactivate it here.') . '</p>'; 
    3535if ( current_user_can('install_themes') ) { 
    3636        $help .= '<p>' . sprintf(__('You can find additional themes for your site by using the new <a href="%1$s">Theme Browser/Installer</a> functionality or by browsing the <a href="http://wordpress.org/extend/themes/">WordPress Theme Directory</a> directly and installing manually.  To install a theme <em>manually</em>, <a href="%2$s">upload its ZIP archive with the new uploader</a> or copy its folder via FTP into your <code>wp-content/themes</code> directory.'), 'theme-install.php', 'theme-install.php?tab=upload' ) . '</p>'; 
    37         $help .= '<p>' . __('Once a theme is uploaded, you should see it on this page.') . '</p>' ; 
     37        $help .= '<p>' . __('Once a theme is uploaded, you should see it on this screen.') . '</p>' ; 
    3838} 
    3939 
    4040add_contextual_help($current_screen, $help); 
     
    4444 
    4545require_once('./admin-header.php'); 
    4646if ( is_multisite() && current_user_can('edit_themes') ) { 
    47         ?><div id="message0" class="updated"><p><?php _e('Administrator: new themes must be activated in the <a href="ms-themes.php">Themes Admin</a> page before they appear here.'); ?></p></div><?php 
     47        ?><div id="message0" class="updated"><p><?php printf( __('Administrator: new themes must be activated in the <a href="%s">Network Themes</a> screen before they appear here.'), admin_url( 'ms-themes.php') ); ?></p></div><?php 
    4848} 
    4949?> 
    5050 
     
    5252<div id="message1" class="updated"><p><?php _e('The active theme is broken.  Reverting to the default theme.'); ?></p></div> 
    5353<?php elseif ( isset($_GET['activated']) ) : 
    5454                if ( isset($wp_registered_sidebars) && count( (array) $wp_registered_sidebars ) ) { ?> 
    55 <div id="message2" class="updated"><p><?php printf(__('New theme activated. This theme supports widgets, please visit the <a href="%s">widgets settings page</a> to configure them.'), admin_url('widgets.php') ); ?></p></div><?php 
     55<div id="message2" class="updated"><p><?php printf( __('New theme activated. This theme supports widgets, please visit the <a href="%s">widgets settings</a> screen to configure them.'), admin_url( 'widgets.php' ) ); ?></p></div><?php 
    5656                } else { ?> 
    57 <div id="message2" class="updated"><p><?php printf(__('New theme activated. <a href="%s">Visit site</a>'), get_bloginfo('url') . '/'); ?></p></div><?php 
     57<div id="message2" class="updated"><p><?php printf( __('New theme activated. <a href="%s">Visit site</a>'), home_url( '/ ' ) ); ?></p></div><?php 
    5858                } 
    5959        elseif ( isset($_GET['deleted']) ) : ?> 
    6060<div id="message3" class="updated"><p><?php _e('Theme deleted.') ?></p></div>