Changeset 990

Show
Ignore:
Timestamp:
05/28/07 12:50:56 (2 years ago)
Author:
donncha
Message:

gettext changes by momo360modena, applied patch from #347

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/wp-admin/wpmu-blogs.php

    r984 r990  
    280280</script> 
    281281 
    282 <h2><?php _e ('Blogs') ?></h2> 
     282<h2><?php _e('Blogs') ?></h2> 
    283283<form name="searchform" action="wpmu-blogs.php" method="get" style="float: left; margin-right: 3em;">  
    284284  <table><td> 
  • trunk/wp-admin/wpmu-edit.php

    r986 r990  
    8888                        print "</ul>"; 
    8989                } else { 
    90                         print "No Users Found"
     90                        _e('No Users Found')
    9191                } 
    9292                exit; 
     
    146146                        $wpdb->show_errors(); 
    147147                        if( !is_wp_error($blog_id) ) { 
    148                                 @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'] ) ); 
     148                                $content_mail = sprintf(__('New blog created by %1s\n\nAddress: http://%2s\nName: %3s'), $current_user->user_login , $newdomain.$path, wp_specialchars($blog['title']) ); 
     149                                @wp_mail( get_option('admin_email'),  sprintf(__('[%s] New Blog Created'), $current_site->site_name), $content_mail ); 
    149150                                wp_redirect( add_query_arg( "updated", "blogadded", $_SERVER[ 'HTTP_REFERER' ] ) ); 
    150151                                die(); 
     
    182183                } 
    183184                // update blogs table 
    184                 $query = "UPDATE $wpdb->blogs 
    185                                 SET    domain       = '".$_POST[ 'blog' ][ 'domain' ]."', 
     185                $query = "UPDATE $wpdb->blogs SET 
     186                                domain       = '".$_POST[ 'blog' ][ 'domain' ]."', 
    186187                                path         = '".$_POST[ 'blog' ][ 'path' ]."', 
    187188                                registered   = '".$_POST[ 'blog' ][ 'registered' ]."', 
  • trunk/wp-admin/wpmu-options.php

    r945 r990  
    9494                <table width="100%" cellspacing="2" cellpadding="5" class="editform">  
    9595                <?php 
    96                 $lang_files = glob( ABSPATH . WPINC . "/languages/*" ); 
     96                $lang_files = glob( ABSPATH . WPINC . "/languages/*.mo" ); 
    9797                $lang = get_site_option( "WPLANG" ); 
    9898                if( is_array( $lang_files ) ) { 
  • trunk/wp-content/mu-plugins/delete-blog.php

    r980 r990  
    2424                global $wpdb, $current_blog, $current_site; 
    2525                $this->delete_blog_hash = get_settings('delete_blog_hash'); 
    26                 print '<div class="wrap"><h2>' . __('Delete Blog') . '</h2>'; 
     26                echo '<div class="wrap"><h2>' . __('Delete Blog') . '</h2>'; 
    2727                if( $_POST[ 'action' ] == "deleteblog" && $_POST[ 'confirmdelete' ] == '1' ) { 
    2828                        $hash = substr( md5( $_SERVER[ 'REQUEST_URI' ] . time() ), 0, 6 ); 
     
    5353                        if( get_option('delete_blog_hash') == $_GET[ 'h' ] ) { 
    5454                                $this->reallydeleteblog = true; 
    55                                 print "<p>" . __('Thank you for using ' .$current_site->site_name. ', your blog has been deleted. Happy trails to you until we meet again.') . "</p>"; 
     55                                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>"; 
    5656                        } else { 
    5757                                $this->reallydeleteblog = false; 
    58                                 print "<p>" . __("I'm sorry, the link you clicked is stale. Please select another option.") . "</p>"; 
     58                                echo "<p>" . __("I'm sorry, the link you clicked is stale. Please select another option.") . "</p>"; 
    5959                        } 
    6060                } else { 
    6161?> 
    62 <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> 
    63 <p><?php _e('Remember, once deleted your blog cannot be restored.') ?></p> 
    64 <form method='post' name='deletedirect'> 
    65 <input type="hidden" name="page" value="<?php echo $_GET['page'] ?>" /> 
    66 <input type='hidden' name='action' value='deleteblog' /> 
    67 <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> 
    68 <p class="submit"><input type='submit' value='<?php _e('Delete My Blog Permanently &raquo;') ?>' /></p> 
    69 </form> 
     62                       <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> 
     63                       <p><?php _e('Remember, once deleted your blog cannot be restored.') ?></p> 
     64                       <form method='post' name='deletedirect'> 
     65                       <input type="hidden" name="page" value="<?php echo $_GET['page'] ?>" /> 
     66                       <input type='hidden' name='action' value='deleteblog' /> 
     67                       <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> 
     68                       <p class="submit"><input type='submit' value='<?php _e('Delete My Blog Permanently &raquo;') ?>' /></p> 
     69                       </form> 
    7070<?php 
    7171                } 
    72                 print "</div>"; 
     72                echo "</div>"; 
    7373        } 
    7474}