gettext changes by momo360modena, applied patch from #347

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@990 7be80a69-a1ef-0310-a953-fb0f7c49ff36

4 files changed, 22 insertions, 21 deletions

diff --git a/wp-admin/wpmu-blogs.php b/wp-admin/wpmu-blogs.php
index ce3a137..2a95772 100644
--- a/wp-admin/wpmu-blogs.php
+++ b/wp-admin/wpmu-blogs.php
@@ -279,7 +279,7 @@ function check_all_rows() {
 //  -->
 </script>
 
-<h2><?php _e ('Blogs') ?></h2>
+<h2><?php _e('Blogs') ?></h2>
 <form name="searchform" action="wpmu-blogs.php" method="get" style="float: left; margin-right: 3em;"> 
   <table><td>
   <fieldset> 
@@ -553,4 +553,4 @@ break;
 ?> 
 
 </div>
-<?php include('admin-footer.php'); ?>
+<?php include('admin-footer.php'); ?>
\ No newline at end of file
diff --git a/wp-admin/wpmu-edit.php b/wp-admin/wpmu-edit.php
index 0a27707..eb37fa3 100644
--- a/wp-admin/wpmu-edit.php
+++ b/wp-admin/wpmu-edit.php
@@ -87,7 +87,7 @@ switch( $_REQUEST[ 'action' ] ) {
 			}
 			print "</ul>";
 		} else {
-			print "No Users Found";
+			_e('No Users Found');
 		}
 		exit;
 	break;
@@ -145,7 +145,8 @@ switch( $_REQUEST[ 'action' ] ) {
 			$blog_id = wpmu_create_blog($newdomain, $path, wp_specialchars( $blog['title'] ), $user_id ,'', $current_site->id);
 			$wpdb->show_errors();
 			if( !is_wp_error($blog_id) ) {
-				@wp_mail( get_option('admin_email'),  sprintf(__('[%s] New Blog Created'), $current_site->site_name), "New blog created by {$current_user->user_login}\n\nAddress: http://{$newdomain}{$path}\nName: ".wp_specialchars( $blog['title'] ) );
+				$content_mail = sprintf(__('New blog created by %1s\n\nAddress: http://%2s\nName: %3s'), $current_user->user_login , $newdomain.$path, wp_specialchars($blog['title']) );
+				@wp_mail( get_option('admin_email'),  sprintf(__('[%s] New Blog Created'), $current_site->site_name), $content_mail );
 				wp_redirect( add_query_arg( "updated", "blogadded", $_SERVER[ 'HTTP_REFERER' ] ) );
 				die();
 			} else {
@@ -181,8 +182,8 @@ switch( $_REQUEST[ 'action' ] ) {
 			}
 		}
 		// update blogs table
-		$query = "UPDATE $wpdb->blogs
-				SET    domain       = '".$_POST[ 'blog' ][ 'domain' ]."',
+		$query = "UPDATE $wpdb->blogs SET
+				domain       = '".$_POST[ 'blog' ][ 'domain' ]."',
 				path         = '".$_POST[ 'blog' ][ 'path' ]."',
 				registered   = '".$_POST[ 'blog' ][ 'registered' ]."',
 				public       = '".$_POST[ 'blog' ][ 'public' ]."',
@@ -416,4 +417,4 @@ switch( $_REQUEST[ 'action' ] ) {
 		wpmu_admin_do_redirect( "wpmu-admin.php" );
 	break;
 }
-?>
+?>
\ No newline at end of file
diff --git a/wp-admin/wpmu-options.php b/wp-admin/wpmu-options.php
index c26650d..d845063 100644
--- a/wp-admin/wpmu-options.php
+++ b/wp-admin/wpmu-options.php
@@ -93,7 +93,7 @@ if (isset($_GET['updated'])) {
 		<legend><?php _e('Site Wide Settings <em>(These settings may be overridden by blog owners)</em>') ?></legend> 
 		<table width="100%" cellspacing="2" cellpadding="5" class="editform"> 
 		<?php
-		$lang_files = glob( ABSPATH . WPINC . "/languages/*" );
+		$lang_files = glob( ABSPATH . WPINC . "/languages/*.mo" );
 		$lang = get_site_option( "WPLANG" );
 		if( is_array( $lang_files ) ) {
 			?>
diff --git a/wp-content/mu-plugins/delete-blog.php b/wp-content/mu-plugins/delete-blog.php
index e0c775f..c0e1261 100644
--- a/wp-content/mu-plugins/delete-blog.php
+++ b/wp-content/mu-plugins/delete-blog.php
@@ -23,7 +23,7 @@ class delete_blog {
 	function plugin_content() {
 		global $wpdb, $current_blog, $current_site;
 		$this->delete_blog_hash = get_settings('delete_blog_hash');
-		print '<div class="wrap"><h2>' . __('Delete Blog') . '</h2>';
+		echo '<div class="wrap"><h2>' . __('Delete Blog') . '</h2>';
 		if( $_POST[ 'action' ] == "deleteblog" && $_POST[ 'confirmdelete' ] == '1' ) {
 			$hash = substr( md5( $_SERVER[ 'REQUEST_URI' ] . time() ), 0, 6 );
 			update_option( "delete_blog_hash", $hash );
@@ -52,27 +52,27 @@ SITE_NAME
 		} elseif( isset( $_GET[ 'h' ] ) && $_GET[ 'h' ] != '' && get_option('delete_blog_hash') != false ) {
 			if( get_option('delete_blog_hash') == $_GET[ 'h' ] ) {
 				$this->reallydeleteblog = true;
-				print "<p>" . __('Thank you for using ' .$current_site->site_name. ', your blog has been deleted. Happy trails to you until we meet again.') . "</p>";
+				echo "<p>" . sprintf(__('Thank you for using %s, your blog has been deleted. Happy trails to you until we meet again.'), $current_site->site_name) . "</p>";
 			} else {
 				$this->reallydeleteblog = false;
-				print "<p>" . __("I'm sorry, the link you clicked is stale. Please select another option.") . "</p>";
+				echo "<p>" . __("I'm sorry, the link you clicked is stale. Please select another option.") . "</p>";
 			}
 		} else {
 ?>
-<p><?php _e('If you do not want to use your ' .$current_site->site_name. ' blog any more, you can delete it using the form below. When you click <q>Delete My Blog</q> you will be sent an email with a link in it. Click on this link to delete your blog.') ?></p>
-<p><?php _e('Remember, once deleted your blog cannot be restored.') ?></p>
-<form method='post' name='deletedirect'>
-<input type="hidden" name="page" value="<?php echo $_GET['page'] ?>" />
-<input type='hidden' name='action' value='deleteblog' />
-<p><input id='confirmdelete' type='checkbox' name='confirmdelete' value='1' /> <label for='confirmdelete'><strong><?php printf( __("I'm sure I want to permanently disable my blog, and I am aware I can never get it back or use %s again."), $current_blog->domain ) ?></strong></label></p>
-<p class="submit"><input type='submit' value='<?php _e('Delete My Blog Permanently &raquo;') ?>' /></p>
-</form>
+			<p><?php printf(__('If you do not want to use your %s blog any more, you can delete it using the form below. When you click <strong>Delete My Blog</strong> you will be sent an email with a link in it. Click on this link to delete your blog.'), $current_site->site_name); ?></p>
+			<p><?php _e('Remember, once deleted your blog cannot be restored.') ?></p>
+			<form method='post' name='deletedirect'>
+			<input type="hidden" name="page" value="<?php echo $_GET['page'] ?>" />
+			<input type='hidden' name='action' value='deleteblog' />
+			<p><input id='confirmdelete' type='checkbox' name='confirmdelete' value='1' /> <label for='confirmdelete'><strong><?php printf( __("I'm sure I want to permanently disable my blog, and I am aware I can never get it back or use %s again."), $current_blog->domain); ?></strong></label></p>
+			<p class="submit"><input type='submit' value='<?php _e('Delete My Blog Permanently &raquo;') ?>' /></p>
+			</form>
 <?php
 		}
-		print "</div>";
+		echo "</div>";
 	}
 }
 
 $delete_blog_obj = new delete_blog();
 
-?>
+?>
\ No newline at end of file