Skip to content

Commit

Permalink
s/blog/site/ in more places. props PeteMall, see #11644.
Browse files Browse the repository at this point in the history 
git-svn-id: http://svn.automattic.com/wordpress/trunk@14313 1a063a9b-81f0-0310-95a4-ce76da25c4cd
  • Loading branch information
nacin committed Apr 30, 2010
1 parent 2c1cc83 commit f9df8a3
Show file tree
Hide file tree
Showing 16 changed files with 37 additions and 37 deletions.
2 changes: 1 addition & 1 deletion wp-admin/edit-link-category-form.php
View file
Expand Up @@ -11,7 +11,7 @@
die('-1');

if ( !current_user_can('manage_categories') )
wp_die(__('You do not have sufficient permissions to edit link categories for this blog.'));
wp_die(__('You do not have sufficient permissions to edit link categories for this site.'));

/**
* @var object
Expand Down
4 changes: 2 additions & 2 deletions wp-admin/export.php
View file
Expand Up @@ -10,7 +10,7 @@
require_once ('admin.php');

if ( !current_user_can('edit_files') )
wp_die(__('You do not have sufficient permissions to export the content of this blog.'));
wp_die(__('You do not have sufficient permissions to export the content of this site.'));

/** Load WordPress export API */
require_once('./includes/export.php');
Expand Down Expand Up @@ -59,7 +59,7 @@

<p><?php _e('When you click the button below WordPress will create an XML file for you to save to your computer.'); ?></p>
<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>
<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>
<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>
<form action="" method="get">
<h3><?php _e('Options'); ?></h3>

Expand Down
4 changes: 2 additions & 2 deletions wp-admin/import.php
View file
Expand Up @@ -10,7 +10,7 @@
require_once ('admin.php');

if ( !current_user_can('edit_files') )
wp_die(__('You do not have sufficient permissions to import content in this blog.'));
wp_die(__('You do not have sufficient permissions to import content in this site.'));

$title = __('Import');
require_once ('admin-header.php');
Expand All @@ -20,7 +20,7 @@
<div class="wrap">
<?php screen_icon(); ?>
<h2><?php echo esc_html( $title ); ?></h2>
<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>
<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>

<?php

Expand Down
4 changes: 2 additions & 2 deletions wp-admin/link-add.php
View file
Expand Up @@ -10,7 +10,7 @@
require_once('./admin.php');

if ( ! current_user_can('manage_links') )
wp_die(__('You do not have sufficient permissions to add links to this blog.'));
wp_die(__('You do not have sufficient permissions to add links to this site.'));

$title = __('Add New Link');
$parent_file = 'link-manager.php';
Expand All @@ -27,4 +27,4 @@
include('./edit-link-form.php');

require('./admin-footer.php');
?>
?>
4 changes: 2 additions & 2 deletions wp-admin/link-manager.php
View file
Expand Up @@ -15,7 +15,7 @@
$doaction = $_GET['action'] ? $_GET['action'] : $_GET['action2'];

if ( ! current_user_can('manage_links') )
wp_die( __('You do not have sufficient permissions to edit the links for this blog.') );
wp_die( __('You do not have sufficient permissions to edit the links for this site.') );

if ( 'delete' == $doaction ) {
$bulklinks = (array) $_GET['linkcheck'];
Expand Down Expand Up @@ -46,7 +46,7 @@
include_once ('./admin-header.php');

if ( ! current_user_can('manage_links') )
wp_die(__("You do not have sufficient permissions to edit the links for this blog."));
wp_die(__("You do not have sufficient permissions to edit the links for this site."));

switch ($order_by) {
case 'order_id' :
Expand Down
2 changes: 1 addition & 1 deletion wp-admin/link.php
View file
Expand Up @@ -15,7 +15,7 @@
wp_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[]'));

if ( ! current_user_can('manage_links') )
wp_die( __('You do not have sufficient permissions to edit the links for this blog.') );
wp_die( __('You do not have sufficient permissions to edit the links for this site.') );

if ( !empty($_POST['deletebookmarks']) )
$action = 'deletebookmarks';
Expand Down
4 changes: 2 additions & 2 deletions wp-admin/ms-edit.php
View file
Expand Up @@ -82,7 +82,7 @@
$blog_details = get_blog_details( $dashboard_blog );
if ( false === $blog_details ) {
if ( is_numeric( $dashboard_blog ) )
wp_die( __( 'Dashboard blog_id must be a blog that already exists' ) );
wp_die( __( 'A dashboard site referenced by ID must already exist' ) );
if ( is_subdomain_install() ) {
$domain = $dashboard_blog . '.' . $current_site->domain;
$path = $current_site->path;
Expand All @@ -98,7 +98,7 @@
}
}
if ( is_wp_error( $dashboard_blog_id ) )
wp_die( __( 'Problem creating dashboard blog: ' ) . $dashboard_blog_id->get_error_message() );
wp_die( __( 'Problem creating dashboard site: ' ) . $dashboard_blog_id->get_error_message() );
if ( $_POST['dashboard_blog_orig'] != $_POST['dashboard_blog'] ) {
$users = get_users_of_blog( get_site_option( 'dashboard_blog' ) );
$move_users = array();
Expand Down
2 changes: 1 addition & 1 deletion wp-admin/plugin-install.php
View file
Expand Up @@ -10,7 +10,7 @@
require_once('./admin.php');

if ( ! current_user_can('install_plugins') )
wp_die(__('You do not have sufficient permissions to install plugins on this blog.'));
wp_die(__('You do not have sufficient permissions to install plugins on this site.'));

include(ABSPATH . 'wp-admin/includes/plugin-install.php');

Expand Down
12 changes: 6 additions & 6 deletions wp-admin/plugins.php
View file
Expand Up @@ -45,7 +45,7 @@
switch ( $action ) {
case 'activate':
if ( ! current_user_can('activate_plugins') )
wp_die(__('You do not have sufficient permissions to activate plugins for this blog.'));
wp_die(__('You do not have sufficient permissions to activate plugins for this site.'));

check_admin_referer('activate-plugin_' . $plugin);

Expand All @@ -72,7 +72,7 @@
case 'activate-selected':
case 'network-activate-selected':
if ( ! current_user_can('activate_plugins') )
wp_die(__('You do not have sufficient permissions to activate plugins for this blog.'));
wp_die(__('You do not have sufficient permissions to activate plugins for this site.'));

check_admin_referer('bulk-manage-plugins');

Expand Down Expand Up @@ -126,7 +126,7 @@
break;
case 'error_scrape':
if ( ! current_user_can('activate_plugins') )
wp_die(__('You do not have sufficient permissions to activate plugins for this blog.'));
wp_die(__('You do not have sufficient permissions to activate plugins for this site.'));

check_admin_referer('plugin-activation-error_' . $plugin);

Expand All @@ -152,7 +152,7 @@ function plugin_sandbox_scrape( $plugin ) {
break;
case 'deactivate':
if ( ! current_user_can('activate_plugins') )
wp_die(__('You do not have sufficient permissions to deactivate plugins for this blog.'));
wp_die(__('You do not have sufficient permissions to deactivate plugins for this site.'));

check_admin_referer('deactivate-plugin_' . $plugin);
deactivate_plugins($plugin);
Expand All @@ -165,7 +165,7 @@ function plugin_sandbox_scrape( $plugin ) {
break;
case 'deactivate-selected':
if ( ! current_user_can('activate_plugins') )
wp_die(__('You do not have sufficient permissions to deactivate plugins for this blog.'));
wp_die(__('You do not have sufficient permissions to deactivate plugins for this site.'));

check_admin_referer('bulk-manage-plugins');

Expand All @@ -188,7 +188,7 @@ function plugin_sandbox_scrape( $plugin ) {
break;
case 'delete-selected':
if ( ! current_user_can('delete_plugins') )
wp_die(__('You do not have sufficient permissions to delete plugins for this blog.'));
wp_die(__('You do not have sufficient permissions to delete plugins for this site.'));

check_admin_referer('bulk-manage-plugins');

Expand Down
2 changes: 1 addition & 1 deletion wp-admin/theme-editor.php
View file
Expand Up @@ -10,7 +10,7 @@
require_once('./admin.php');

if ( !current_user_can('edit_themes') )
wp_die('<p>'.__('You do not have sufficient permissions to edit templates for this blog.').'</p>');
wp_die('<p>'.__('You do not have sufficient permissions to edit templates for this site.').'</p>');

$title = __("Edit Themes");
$parent_file = 'themes.php';
Expand Down
2 changes: 1 addition & 1 deletion wp-admin/theme-install.php
View file
Expand Up @@ -10,7 +10,7 @@
require_once('./admin.php');

if ( ! current_user_can('install_themes') )
wp_die(__('You do not have sufficient permissions to install themes on this blog.'));
wp_die(__('You do not have sufficient permissions to install themes on this site.'));

include(ABSPATH . 'wp-admin/includes/theme-install.php');

Expand Down
2 changes: 1 addition & 1 deletion wp-admin/update-core.php
View file
Expand Up @@ -10,7 +10,7 @@
require_once('./admin.php');

if ( ! current_user_can('update_plugins') )
wp_die(__('You do not have sufficient permissions to update plugins for this blog.'));
wp_die(__('You do not have sufficient permissions to update plugins for this site.'));

function list_core_update( $update ) {
global $wp_local_package, $wpdb;
Expand Down
20 changes: 10 additions & 10 deletions wp-admin/update.php
View file
Expand Up @@ -18,7 +18,7 @@

if ( 'update-selected' == $action ) {
if ( ! current_user_can( 'update_plugins' ) )
wp_die( __( 'You do not have sufficient permissions to update plugins for this blog.' ) );
wp_die( __( 'You do not have sufficient permissions to update plugins for this site.' ) );

check_admin_referer( 'bulk-update-plugins' );

Expand All @@ -45,7 +45,7 @@

} elseif ( 'upgrade-plugin' == $action ) {
if ( ! current_user_can('update_plugins') )
wp_die(__('You do not have sufficient permissions to update plugins for this blog.'));
wp_die(__('You do not have sufficient permissions to update plugins for this site.'));

check_admin_referer('upgrade-plugin_' . $plugin);

Expand All @@ -64,7 +64,7 @@

} elseif ('activate-plugin' == $action ) {
if ( ! current_user_can('update_plugins') )
wp_die(__('You do not have sufficient permissions to update plugins for this blog.'));
wp_die(__('You do not have sufficient permissions to update plugins for this site.'));

check_admin_referer('activate-plugin_' . $plugin);
if ( ! isset($_GET['failure']) && ! isset($_GET['success']) ) {
Expand Down Expand Up @@ -92,7 +92,7 @@
} elseif ( 'install-plugin' == $action ) {

if ( ! current_user_can('install_plugins') )
wp_die(__('You do not have sufficient permissions to install plugins for this blog.'));
wp_die(__('You do not have sufficient permissions to install plugins for this site.'));

include_once ABSPATH . 'wp-admin/includes/plugin-install.php'; //for plugins_api..

Expand Down Expand Up @@ -120,7 +120,7 @@
} elseif ( 'upload-plugin' == $action ) {

if ( ! current_user_can('install_plugins') )
wp_die(__('You do not have sufficient permissions to install plugins for this blog.'));
wp_die(__('You do not have sufficient permissions to install plugins for this site.'));

check_admin_referer('plugin-upload');

Expand All @@ -144,7 +144,7 @@
} elseif ( 'upgrade-theme' == $action ) {

if ( ! current_user_can('update_themes') )
wp_die(__('You do not have sufficient permissions to update themes for this blog.'));
wp_die(__('You do not have sufficient permissions to update themes for this site.'));

check_admin_referer('upgrade-theme_' . $theme);

Expand All @@ -164,7 +164,7 @@
include('./admin-footer.php');
} elseif ( 'update-selected-themes' == $action ) {
if ( ! current_user_can( 'update_themes' ) )
wp_die( __( 'You do not have sufficient permissions to update themes for this blog.' ) );
wp_die( __( 'You do not have sufficient permissions to update themes for this site.' ) );

check_admin_referer( 'bulk-update-themes' );

Expand All @@ -191,7 +191,7 @@
} elseif ( 'install-theme' == $action ) {

if ( ! current_user_can('install_themes') )
wp_die(__('You do not have sufficient permissions to install themes for this blog.'));
wp_die(__('You do not have sufficient permissions to install themes for this site.'));

include_once ABSPATH . 'wp-admin/includes/theme-install.php'; //for themes_api..

Expand Down Expand Up @@ -221,7 +221,7 @@
} elseif ( 'upload-theme' == $action ) {

if ( ! current_user_can('install_themes') )
wp_die(__('You do not have sufficient permissions to install themes for this blog.'));
wp_die(__('You do not have sufficient permissions to install themes for this site.'));

check_admin_referer('theme-upload');

Expand All @@ -247,4 +247,4 @@
} else {
do_action('update-custom_' . $action);
}
}
}
4 changes: 2 additions & 2 deletions wp-includes/load.php
View file
Expand Up @@ -392,7 +392,7 @@ function wp_start_object_cache() {
function wp_not_installed() {
if ( is_multisite() ) {
if ( ! is_blog_installed() && ! defined( 'WP_INSTALLING' ) )
wp_die( __( 'The blog you have requested is not installed properly. Please contact the system administrator.' ) );
wp_die( __( 'The site you have requested is not installed properly. Please contact the system administrator.' ) );
} elseif ( ! is_blog_installed() && false === strpos( $_SERVER['PHP_SELF'], 'install.php' ) && !defined( 'WP_INSTALLING' ) ) {
if ( defined( 'WP_SITEURL' ) )
$link = WP_SITEURL . '/wp-admin/install.php';
Expand Down Expand Up @@ -583,4 +583,4 @@ function is_multisite() {
return false;
}

?>
?>
4 changes: 2 additions & 2 deletions wp-includes/ms-load.php
View file
Expand Up @@ -68,7 +68,7 @@ function ms_site_check() {
return WP_CONTENT_DIR . '/blog-suspended.php';
} else {
header( 'HTTP/1.1 410 Gone' );
wp_die( /*WP_I18N_ARCHIVED*/'This blog has been archived or suspended.'/*/WP_I18N_ARCHIVED*/ );
wp_die( /*WP_I18N_ARCHIVED*/'This site has been archived or suspended.'/*/WP_I18N_ARCHIVED*/ );
}
}

Expand Down Expand Up @@ -181,7 +181,7 @@ function wpmu_current_site() {
// Still no dice.
// @todo Update or remove WPMU codex link.
if ( 1 == count( $sites ) )
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 ) );
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 ) );
else
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*/ );
}
Expand Down
2 changes: 1 addition & 1 deletion wp-includes/ms-settings.php
View file
Expand Up @@ -115,7 +115,7 @@
$current_blog->blog_id = $blog_id = 1;
} else {
$msg = ! $wpdb->get_var( "SHOW TABLES LIKE '$wpdb->site'" ) ? ' ' . /*WP_I18N_TABLES_MISSING*/'Database tables are missing.'/*/WP_I18N_TABLES_MISSING*/ : '';
wp_die( /*WP_I18N_NO_BLOG*/'No blog by that name on this system.'/*/WP_I18N_NO_BLOG*/ . $msg );
wp_die( /*WP_I18N_NO_BLOG*/'No site by that name on this system.'/*/WP_I18N_NO_BLOG*/ . $msg );
}
}
}
Expand Down

0 comments on commit f9df8a3

Please sign in to comment.