From da1f2896cfe0e719c14375f95a4acb223eaf180f Mon Sep 17 00:00:00 2001 From: donncha Date: Wed, 24 Oct 2007 08:11:47 +0000 Subject: gettext the disable upload message Remove mention of paid-upgrades.php, props momo360modena, fixes #470 git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1127 7be80a69-a1ef-0310-a953-fb0f7c49ff36 --- wp-admin/includes/mu.php | 2 +- wp-admin/includes/upload.php | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'wp-admin') diff --git a/wp-admin/includes/mu.php b/wp-admin/includes/mu.php index d1a2f59..cbf5c9d 100644 --- a/wp-admin/includes/mu.php +++ b/wp-admin/includes/mu.php @@ -332,7 +332,7 @@ function wpmu_checkAvailableSpace() { if( ($spaceAllowed - $size) <= 0 ) { define( 'DISABLE_UPLOADS', true ); - define( 'DISABLE_UPLOADS_MESSAGE', 'Sorry, you must delete files before you can upload any more, or buy more space' ); + define( 'DISABLE_UPLOADS_MESSAGE', __('Sorry, you must delete files before you can upload any more.') ); } } add_action('upload_files_upload','wpmu_checkAvailableSpace'); diff --git a/wp-admin/includes/upload.php b/wp-admin/includes/upload.php index c66feeb..3064b08 100644 --- a/wp-admin/includes/upload.php +++ b/wp-admin/includes/upload.php @@ -207,11 +207,11 @@ function wp_upload_tab_upload_action() { switch ( $action ) : case 'upload' : if ( defined('DISABLE_UPLOADS') && constant('DISABLE_UPLOADS') ) { - if ( defined('DISABLE_UPLOADS_MESSAGE') && constant('DISABLE_UPLOADS_MESSAGE') ) { - return die(__(DISABLE_UPLOADS_MESSAGE)); - } else { - return die(__('Sorry, uploads are temporarily disabled.')); - } + if ( defined('DISABLE_UPLOADS_MESSAGE') && constant('DISABLE_UPLOADS_MESSAGE') ) { + wp_die(__(DISABLE_UPLOADS_MESSAGE)); + } else { + wp_die(__('Sorry, uploads are temporarily disabled.')); + } } global $from_tab, $post_id, $style; if ( !$from_tab ) -- cgit