WordPress.org

Make WordPress Core

Ticket #11644: 11644.blog-site.diff

File 11644.blog-site.diff, 16.4 KB (added by PeteMall, 4 years ago)

Replace all 'blog' with 'site' in wp_die() strings.

  • wp-includes/load.php

     
    392392function wp_not_installed() { 
    393393        if ( is_multisite() ) { 
    394394                if ( ! is_blog_installed() && ! defined( 'WP_INSTALLING' ) ) 
    395                         wp_die( __( 'The blog you have requested is not installed properly. Please contact the system administrator.' ) ); 
     395                        wp_die( __( 'The site you have requested is not installed properly. Please contact the system administrator.' ) ); 
    396396        } elseif ( ! is_blog_installed() && false === strpos( $_SERVER['PHP_SELF'], 'install.php' ) && !defined( 'WP_INSTALLING' ) ) { 
    397397                if ( defined( 'WP_SITEURL' ) ) 
    398398                        $link = WP_SITEURL . '/wp-admin/install.php'; 
     
    583583        return false; 
    584584} 
    585585 
    586 ?> 
    587  No newline at end of file 
     586?> 
  • wp-includes/ms-load.php

     
    6868                        return WP_CONTENT_DIR . '/blog-suspended.php'; 
    6969                } else { 
    7070                        header( 'HTTP/1.1 410 Gone' ); 
    71                         wp_die( /*WP_I18N_ARCHIVED*/'This blog has been archived or suspended.'/*/WP_I18N_ARCHIVED*/ ); 
     71                        wp_die( /*WP_I18N_ARCHIVED*/'This site has been archived or suspended.'/*/WP_I18N_ARCHIVED*/ ); 
    7272                } 
    7373        } 
    7474 
     
    181181        // Still no dice. 
    182182        // @todo Update or remove WPMU codex link. 
    183183        if ( 1 == count( $sites ) ) 
    184                 wp_die( sprintf( /*WP_I18N_BLOG_DOESNT_EXIST*/'That blog does not exist. Please try <a href="%s">%s</a>.'/*/WP_I18N_BLOG_DOESNT_EXIST*/, $sites[0]->domain . $sites[0]->path ) ); 
     184                wp_die( sprintf( /*WP_I18N_BLOG_DOESNT_EXIST*/'That site does not exist. Please try <a href="%s">%s</a>.'/*/WP_I18N_BLOG_DOESNT_EXIST*/, $sites[0]->domain . $sites[0]->path ) ); 
    185185        else 
    186186                wp_die( /*WP_I18N_NO_SITE_DEFINED*/'No site defined on this host. If you are the owner of this site, please check <a href="http://codex.wordpress.org/Debugging_WPMU">Debugging WPMU</a> for help.'/*/WP_I18N_NO_SITE_DEFINED*/ ); 
    187187} 
  • wp-includes/ms-settings.php

     
    115115                        $current_blog->blog_id = $blog_id = 1; 
    116116                } else { 
    117117                        $msg = ! $wpdb->get_var( "SHOW TABLES LIKE '$wpdb->site'" ) ? ' ' . /*WP_I18N_TABLES_MISSING*/'Database tables are missing.'/*/WP_I18N_TABLES_MISSING*/ : ''; 
    118                         wp_die( /*WP_I18N_NO_BLOG*/'No blog by that name on this system.'/*/WP_I18N_NO_BLOG*/ . $msg ); 
     118                        wp_die( /*WP_I18N_NO_BLOG*/'No site by that name on this system.'/*/WP_I18N_NO_BLOG*/ . $msg ); 
    119119                } 
    120120        } 
    121121} 
  • wp-admin/ms-edit.php

     
    8282                        $blog_details = get_blog_details( $dashboard_blog ); 
    8383                        if ( false === $blog_details ) { 
    8484                                if ( is_numeric( $dashboard_blog ) ) 
    85                                         wp_die( __( 'Dashboard blog_id must be a blog that already exists' ) ); 
     85                                        wp_die( __( 'A dashboard site referenced by ID must already exist' ) ); 
    8686                                if ( is_subdomain_install() ) { 
    8787                                        $domain = $dashboard_blog . '.' . $current_site->domain; 
    8888                                        $path = $current_site->path; 
     
    9898                        } 
    9999                } 
    100100                if ( is_wp_error( $dashboard_blog_id ) ) 
    101                         wp_die( __( 'Problem creating dashboard blog: ' ) . $dashboard_blog_id->get_error_message() ); 
     101                        wp_die( __( 'Problem creating dashboard site: ' ) . $dashboard_blog_id->get_error_message() ); 
    102102                if ( $_POST['dashboard_blog_orig'] != $_POST['dashboard_blog'] ) { 
    103103                        $users = get_users_of_blog( get_site_option( 'dashboard_blog' ) ); 
    104104                        $move_users = array(); 
  • wp-admin/update.php

     
    1818 
    1919        if ( 'update-selected' == $action ) { 
    2020                if ( ! current_user_can( 'update_plugins' ) ) 
    21                         wp_die( __( 'You do not have sufficient permissions to update plugins for this blog.' ) ); 
     21                        wp_die( __( 'You do not have sufficient permissions to update plugins for this site.' ) ); 
    2222 
    2323                check_admin_referer( 'bulk-update-plugins' ); 
    2424 
     
    4545 
    4646        } elseif ( 'upgrade-plugin' == $action ) { 
    4747                if ( ! current_user_can('update_plugins') ) 
    48                         wp_die(__('You do not have sufficient permissions to update plugins for this blog.')); 
     48                        wp_die(__('You do not have sufficient permissions to update plugins for this site.')); 
    4949 
    5050                check_admin_referer('upgrade-plugin_' . $plugin); 
    5151 
     
    6464 
    6565        } elseif ('activate-plugin' == $action ) { 
    6666                if ( ! current_user_can('update_plugins') ) 
    67                         wp_die(__('You do not have sufficient permissions to update plugins for this blog.')); 
     67                        wp_die(__('You do not have sufficient permissions to update plugins for this site.')); 
    6868 
    6969                check_admin_referer('activate-plugin_' . $plugin); 
    7070                if ( ! isset($_GET['failure']) && ! isset($_GET['success']) ) { 
     
    9292        } elseif ( 'install-plugin' == $action ) { 
    9393 
    9494                if ( ! current_user_can('install_plugins') ) 
    95                         wp_die(__('You do not have sufficient permissions to install plugins for this blog.')); 
     95                        wp_die(__('You do not have sufficient permissions to install plugins for this site.')); 
    9696 
    9797                include_once ABSPATH . 'wp-admin/includes/plugin-install.php'; //for plugins_api.. 
    9898 
     
    120120        } elseif ( 'upload-plugin' == $action ) { 
    121121 
    122122                if ( ! current_user_can('install_plugins') ) 
    123                         wp_die(__('You do not have sufficient permissions to install plugins for this blog.')); 
     123                        wp_die(__('You do not have sufficient permissions to install plugins for this site.')); 
    124124 
    125125                check_admin_referer('plugin-upload'); 
    126126 
     
    144144        } elseif ( 'upgrade-theme' == $action ) { 
    145145 
    146146                if ( ! current_user_can('update_themes') ) 
    147                         wp_die(__('You do not have sufficient permissions to update themes for this blog.')); 
     147                        wp_die(__('You do not have sufficient permissions to update themes for this site.')); 
    148148 
    149149                check_admin_referer('upgrade-theme_' . $theme); 
    150150 
     
    164164                include('./admin-footer.php'); 
    165165        } elseif ( 'update-selected-themes' == $action ) { 
    166166                if ( ! current_user_can( 'update_themes' ) ) 
    167                         wp_die( __( 'You do not have sufficient permissions to update themes for this blog.' ) ); 
     167                        wp_die( __( 'You do not have sufficient permissions to update themes for this site.' ) ); 
    168168 
    169169                check_admin_referer( 'bulk-update-themes' ); 
    170170 
     
    191191        } elseif ( 'install-theme' == $action ) { 
    192192 
    193193                if ( ! current_user_can('install_themes') ) 
    194                         wp_die(__('You do not have sufficient permissions to install themes for this blog.')); 
     194                        wp_die(__('You do not have sufficient permissions to install themes for this site.')); 
    195195 
    196196                include_once ABSPATH . 'wp-admin/includes/theme-install.php'; //for themes_api.. 
    197197 
     
    221221        } elseif ( 'upload-theme' == $action ) { 
    222222 
    223223                if ( ! current_user_can('install_themes') ) 
    224                         wp_die(__('You do not have sufficient permissions to install themes for this blog.')); 
     224                        wp_die(__('You do not have sufficient permissions to install themes for this site.')); 
    225225 
    226226                check_admin_referer('theme-upload'); 
    227227 
     
    247247        } else { 
    248248                do_action('update-custom_' . $action); 
    249249        } 
    250 } 
    251  No newline at end of file 
     250} 
  • wp-admin/theme-editor.php

     
    1010require_once('./admin.php'); 
    1111 
    1212if ( !current_user_can('edit_themes') ) 
    13         wp_die('<p>'.__('You do not have sufficient permissions to edit templates for this blog.').'</p>'); 
     13        wp_die('<p>'.__('You do not have sufficient permissions to edit templates for this site.').'</p>'); 
    1414 
    1515$title = __("Edit Themes"); 
    1616$parent_file = 'themes.php'; 
  • wp-admin/edit-link-category-form.php

     
    1111        die('-1'); 
    1212 
    1313if ( !current_user_can('manage_categories') ) 
    14         wp_die(__('You do not have sufficient permissions to edit link categories for this blog.')); 
     14        wp_die(__('You do not have sufficient permissions to edit link categories for this site.')); 
    1515 
    1616/** 
    1717 * @var object 
  • wp-admin/plugin-install.php

     
    1010require_once('./admin.php'); 
    1111 
    1212if ( ! current_user_can('install_plugins') ) 
    13         wp_die(__('You do not have sufficient permissions to install plugins on this blog.')); 
     13        wp_die(__('You do not have sufficient permissions to install plugins on this site.')); 
    1414 
    1515include(ABSPATH . 'wp-admin/includes/plugin-install.php'); 
    1616 
  • wp-admin/plugins.php

     
    4545        switch ( $action ) { 
    4646                case 'activate': 
    4747                        if ( ! current_user_can('activate_plugins') ) 
    48                                 wp_die(__('You do not have sufficient permissions to activate plugins for this blog.')); 
     48                                wp_die(__('You do not have sufficient permissions to activate plugins for this site.')); 
    4949 
    5050                        check_admin_referer('activate-plugin_' . $plugin); 
    5151 
     
    7272                case 'activate-selected': 
    7373                case 'network-activate-selected': 
    7474                        if ( ! current_user_can('activate_plugins') ) 
    75                                 wp_die(__('You do not have sufficient permissions to activate plugins for this blog.')); 
     75                                wp_die(__('You do not have sufficient permissions to activate plugins for this site.')); 
    7676 
    7777                        check_admin_referer('bulk-manage-plugins'); 
    7878 
     
    126126                        break; 
    127127                case 'error_scrape': 
    128128                        if ( ! current_user_can('activate_plugins') ) 
    129                                 wp_die(__('You do not have sufficient permissions to activate plugins for this blog.')); 
     129                                wp_die(__('You do not have sufficient permissions to activate plugins for this site.')); 
    130130 
    131131                        check_admin_referer('plugin-activation-error_' . $plugin); 
    132132 
     
    152152                        break; 
    153153                case 'deactivate': 
    154154                        if ( ! current_user_can('activate_plugins') ) 
    155                                 wp_die(__('You do not have sufficient permissions to deactivate plugins for this blog.')); 
     155                                wp_die(__('You do not have sufficient permissions to deactivate plugins for this site.')); 
    156156 
    157157                        check_admin_referer('deactivate-plugin_' . $plugin); 
    158158                        deactivate_plugins($plugin); 
     
    165165                        break; 
    166166                case 'deactivate-selected': 
    167167                        if ( ! current_user_can('activate_plugins') ) 
    168                                 wp_die(__('You do not have sufficient permissions to deactivate plugins for this blog.')); 
     168                                wp_die(__('You do not have sufficient permissions to deactivate plugins for this site.')); 
    169169 
    170170                        check_admin_referer('bulk-manage-plugins'); 
    171171 
     
    188188                        break; 
    189189                case 'delete-selected': 
    190190                        if ( ! current_user_can('delete_plugins') ) 
    191                                 wp_die(__('You do not have sufficient permissions to delete plugins for this blog.')); 
     191                                wp_die(__('You do not have sufficient permissions to delete plugins for this site.')); 
    192192 
    193193                        check_admin_referer('bulk-manage-plugins'); 
    194194 
  • wp-admin/link-add.php

     
    1010require_once('./admin.php'); 
    1111 
    1212if ( ! current_user_can('manage_links') ) 
    13         wp_die(__('You do not have sufficient permissions to add links to this blog.')); 
     13        wp_die(__('You do not have sufficient permissions to add links to this site.')); 
    1414 
    1515$title = __('Add New Link'); 
    1616$parent_file = 'link-manager.php'; 
     
    2727include('./edit-link-form.php'); 
    2828 
    2929require('./admin-footer.php'); 
    30 ?> 
    31  No newline at end of file 
     30?> 
  • wp-admin/link.php

     
    1515wp_reset_vars(array('action', 'cat_id', 'linkurl', 'name', 'image', 'description', 'visible', 'target', 'category', 'link_id', 'submit', 'order_by', 'links_show_cat_id', 'rating', 'rel', 'notes', 'linkcheck[]')); 
    1616 
    1717if ( ! current_user_can('manage_links') ) 
    18         wp_die( __('You do not have sufficient permissions to edit the links for this blog.') ); 
     18        wp_die( __('You do not have sufficient permissions to edit the links for this site.') ); 
    1919 
    2020if ( !empty($_POST['deletebookmarks']) ) 
    2121        $action = 'deletebookmarks'; 
  • wp-admin/link-manager.php

     
    1515        $doaction = $_GET['action'] ? $_GET['action'] : $_GET['action2']; 
    1616 
    1717        if ( ! current_user_can('manage_links') ) 
    18                 wp_die( __('You do not have sufficient permissions to edit the links for this blog.') ); 
     18                wp_die( __('You do not have sufficient permissions to edit the links for this site.') ); 
    1919 
    2020        if ( 'delete' == $doaction ) { 
    2121                $bulklinks = (array) $_GET['linkcheck']; 
     
    4646include_once ('./admin-header.php'); 
    4747 
    4848if ( ! current_user_can('manage_links') ) 
    49         wp_die(__("You do not have sufficient permissions to edit the links for this blog.")); 
     49        wp_die(__("You do not have sufficient permissions to edit the links for this site.")); 
    5050 
    5151switch ($order_by) { 
    5252        case 'order_id' : 
  • wp-admin/theme-install.php

     
    1010require_once('./admin.php'); 
    1111 
    1212if ( ! current_user_can('install_themes') ) 
    13         wp_die(__('You do not have sufficient permissions to install themes on this blog.')); 
     13        wp_die(__('You do not have sufficient permissions to install themes on this site.')); 
    1414 
    1515include(ABSPATH . 'wp-admin/includes/theme-install.php'); 
    1616 
  • wp-admin/update-core.php

     
    1010require_once('./admin.php'); 
    1111 
    1212if ( ! current_user_can('update_plugins') ) 
    13         wp_die(__('You do not have sufficient permissions to update plugins for this blog.')); 
     13        wp_die(__('You do not have sufficient permissions to update plugins for this site.')); 
    1414 
    1515function list_core_update( $update ) { 
    1616        global $wp_local_package, $wpdb; 
  • wp-admin/import.php

     
    1010require_once ('admin.php'); 
    1111 
    1212if ( !current_user_can('edit_files') ) 
    13         wp_die(__('You do not have sufficient permissions to import content in this blog.')); 
     13        wp_die(__('You do not have sufficient permissions to import content in this site.')); 
    1414 
    1515$title = __('Import'); 
    1616require_once ('admin-header.php'); 
     
    2020<div class="wrap"> 
    2121<?php screen_icon(); ?> 
    2222<h2><?php echo esc_html( $title ); ?></h2> 
    23 <p><?php _e('If you have posts or comments in another system, WordPress can import those into this blog. To get started, choose a system to import from below:'); ?></p> 
     23<p><?php _e('If you have posts or comments in another system, WordPress can import those into this site. To get started, choose a system to import from below:'); ?></p> 
    2424 
    2525<?php 
    2626 
  • wp-admin/export.php

     
    1010require_once ('admin.php'); 
    1111 
    1212if ( !current_user_can('edit_files') ) 
    13         wp_die(__('You do not have sufficient permissions to export the content of this blog.')); 
     13        wp_die(__('You do not have sufficient permissions to export the content of this site.')); 
    1414 
    1515/** Load WordPress export API */ 
    1616require_once('./includes/export.php'); 
     
    5959 
    6060<p><?php _e('When you click the button below WordPress will create an XML file for you to save to your computer.'); ?></p> 
    6161<p><?php _e('This format, which we call WordPress eXtended RSS or WXR, will contain your posts, pages, comments, custom fields, categories, and tags.'); ?></p> 
    62 <p><?php _e('Once you&#8217;ve saved the download file, you can use the Import function on another WordPress blog to import this blog.'); ?></p> 
     62<p><?php _e('Once you&#8217;ve saved the download file, you can use the Import function on another WordPress site to import this site.'); ?></p> 
    6363<form action="" method="get"> 
    6464<h3><?php _e('Options'); ?></h3> 
    6565