Ticket #17944: 17944-textual.diff

wp-admin/includes/class-wp-themes-list-table.php

@@ -156 +156 @@
         $actions = apply_filters( 'theme_action_links', $actions, $themes[$theme_name] );
 
         $actions = implode ( ' | ', $actions );
+        
+        $ct = array(
+                'title'          => $title,
+                'template_dir'   => $template_dir,
+                'stylesheet_dir' => $stylesheet_dir,
+                'parent_theme'   => $parent_theme,
+        );
 ?>
                 <a href="<?php echo $preview_link; ?>" class="<?php echo $thickbox_class; ?> screenshot">
 <?php if ( $screenshot ) : ?>
@@ -167 +174 @@
         printf( __( '%1$s %2$s by %3$s' ), $title, $version, $author ) ; ?></h3>
 <p class="description"><?php echo $description; ?></p>
 <span class='action-links'><?php echo $actions ?></span>
-        <?php if ( current_user_can( 'edit_themes' ) && $parent_theme ) {
-        /* translators: 1: theme title, 2:  template dir, 3: stylesheet_dir, 4: theme title, 5: parent_theme */ ?>
-        <p><?php printf( __( 'The template files are located in <code>%2$s</code>. The stylesheet files are located in <code>%3$s</code>. <strong>%4$s</strong> uses templates from <strong>%5$s</strong>. Changes made to the templates will affect both themes.' ), $title, str_replace( WP_CONTENT_DIR, '', $template_dir ), str_replace( WP_CONTENT_DIR, '', $stylesheet_dir ), $title, $parent_theme ); ?></p>
-<?php } else { ?>
-        <p><?php printf( __( 'All of this theme&#8217;s files are located in <code>%2$s</code>.' ), $title, str_replace( WP_CONTENT_DIR, '', $template_dir ), str_replace( WP_CONTENT_DIR, '', $stylesheet_dir ) ); ?></p>
-<?php } ?>
+<?php $this->show_files_location( $ct ); ?>
 <?php if ( $tags ) : ?>
 <p><?php _e( 'Tags:' ); ?> <?php echo join( ', ', $tags ); ?></p>
 <?php endif; ?>
@@ -217 +219 @@
                 // Only get here if each word exists in the tags or one of the fields
                 return true;
         }
+        
+        /**
+        * Show location of template and theme files
+        *
+        * @param object/array $ct The theme to show it's file locations
+        */
+        function show_files_location( $ct ) {
+                if ( ! is_array( $ct ) ) {
+                        $ct = get_object_vars( $ct );
+                }
+                if ( current_user_can( 'edit_themes' ) && ! empty( $ct['parent_theme'] ) ) {
+                        /* translators: 1:  template dir, 2: stylesheet_dir, 3: theme title, 4: parent_theme */ ?>
+                        <p><?php printf( __( 'Parent theme files are located in <code>%1$s</code>. Child theme files are located in <code>%2$s</code>. <strong>%3$s</strong> uses templates from <strong>%4$s</strong>. Changes made to the templates will affect both themes.' ), str_replace( WP_CONTENT_DIR, '', $ct['template_dir'] ), str_replace( WP_CONTENT_DIR, '', $ct['stylesheet_dir'] ), $ct['title'], $ct['parent_theme'] ); ?></p>
+                <?php } else { ?>
+                        <p><?php printf( __( 'All of this theme&#8217;s files are located in <code>%1$s</code>.' ), str_replace( WP_CONTENT_DIR, '', $ct['template_dir'] ) ); ?></p>
+                <?php }
+        }
 }
 
 ?>

wp-admin/setup-config.php

@@ -50 +50 @@
 require_once(ABSPATH . WPINC . '/class-wp-error.php');
 
 if (!file_exists(ABSPATH . 'wp-config-sample.php'))
-        wp_die('Sorry, I need a wp-config-sample.php file to work from. Please re-upload this file from your WordPress installation.');
+        wp_die( __( 'Sorry, I need a wp-config-sample.php file to work from. Please re-upload this file from your WordPress installation.' ) );
 
 $configFile = file(ABSPATH . 'wp-config-sample.php');
 
 // Check if wp-config.php has been created
 if (file_exists(ABSPATH . 'wp-config.php'))
-        wp_die("<p>The file 'wp-config.php' already exists. If you need to reset any of the configuration items in this file, please delete it first. You may try <a href='install.php'>installing now</a>.</p>");
+        wp_die( __( "<p>The file 'wp-config.php' already exists. If you need to reset any of the configuration items in this file, please delete it first. You may try <a href='install.php'>installing now</a>.</p>" ) );
 
 // Check if wp-config.php exists above the root directory but is not part of another install
 if (file_exists(ABSPATH . '../wp-config.php') && ! file_exists(ABSPATH . '../wp-settings.php'))
-        wp_die("<p>The file 'wp-config.php' already exists one level above your WordPress installation. If you need to reset any of the configuration items in this file, please delete it first. You may try <a href='install.php'>installing now</a>.</p>");
+        wp_die( __( "<p>The file 'wp-config.php' already exists one level above your WordPress installation. If you need to reset any of the configuration items in this file, please delete it first. You may try <a href='install.php'>installing now</a>.</p>" ) );
 
 if (isset($_GET['step']))
         $step = $_GET['step'];

wp-admin/themes.php

@@ -117 +117 @@
                 }
         }
         echo implode ( ' | ', $options );
+        
+        $wp_list_table->show_files_location( $ct );
 
         if ( $ct->tags ) : ?>
         <p><?php _e('Tags:'); ?> <?php echo join(', ', $ct->tags); ?></p>