Make WordPress Core

Changeset 5825


Ignore:
Timestamp:
07/30/2007 04:32:12 PM (17 years ago)
Author:
markjaquith
Message:

Favor the term "blog" instead of "weblog." Props foolswisdom and Nazgul. fixes #4674

Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/includes/schema.php

    r5707 r5825  
    157157    $guessurl = preg_replace('|/wp-admin/.*|i', '', $schema . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
    158158    add_option('siteurl', $guessurl, __('WordPress web address'));
    159     add_option('blogname', __('My Weblog'), __('Blog title'));
     159    add_option('blogname', __('My Blog'), __('Blog title'));
    160160    add_option('blogdescription', __('Just another WordPress weblog'), __('Short tagline'));
    161161    add_option('new_users_can_blog', 0);
  • trunk/wp-admin/includes/upgrade.php

    r5820 r5825  
    124124Password: %3\$s
    125125
    126 We hope you enjoy your new weblog. Thanks!
     126We hope you enjoy your new blog. Thanks!
    127127
    128128--The WordPress Team
  • trunk/wp-admin/install.php

    r5708 r5825  
    4646    <table width="100%">
    4747        <tr>
    48             <th width="33%"><?php _e('Weblog title:'); ?></th>
     48            <th width="33%"><?php _e('Blog title:'); ?></th>
    4949            <td><input name="weblog_title" type="text" id="weblog_title" size="25" /></td>
    5050        </tr>
  • trunk/wp-admin/options-discussion.php

    r4740 r5825  
    1919<label for="default_pingback_flag">
    2020<input name="default_pingback_flag" type="checkbox" id="default_pingback_flag" value="1" <?php checked('1', get_option('default_pingback_flag')); ?> />
    21 <?php _e('Attempt to notify any Weblogs linked to from the article (slows down posting.)') ?></label>
     21<?php _e('Attempt to notify any blogs linked to from the article (slows down posting.)') ?></label>
    2222</li>
    2323<li>
    2424<label for="default_ping_status">
    2525<input name="default_ping_status" type="checkbox" id="default_ping_status" value="open" <?php checked('open', get_option('default_ping_status')); ?> />
    26 <?php _e('Allow link notifications from other Weblogs (pingbacks and trackbacks.)') ?></label>
     26<?php _e('Allow link notifications from other blogs (pingbacks and trackbacks.)') ?></label>
    2727</li>
    2828<li>
  • trunk/wp-admin/options-general.php

    r5700 r5825  
    1515<table class="optiontable">
    1616<tr valign="top">
    17 <th scope="row"><?php _e('Weblog title:') ?></th>
     17<th scope="row"><?php _e('Blog title:') ?></th>
    1818<td><input name="blogname" type="text" id="blogname" value="<?php form_option('blogname'); ?>" size="40" /></td>
    1919</tr>
     
    2222<td><input name="blogdescription" type="text" id="blogdescription" style="width: 95%" value="<?php form_option('blogdescription'); ?>" size="45" />
    2323<br />
    24 <?php _e('In a few words, explain what this weblog is about.') ?></td>
     24<?php _e('In a few words, explain what this blog is about.') ?></td>
    2525</tr>
    2626<tr valign="top">
     
    6464</tr>
    6565<tr>
    66 <th scope="row"><?php _e('Times in the weblog should differ by:') ?> </th>
     66<th scope="row"><?php _e('Times in the blog should differ by:') ?> </th>
    6767<td><input name="gmt_offset" type="text" id="gmt_offset" size="2" value="<?php form_option('gmt_offset'); ?>" />
    6868<?php _e('hours') ?> (<?php _e('Your timezone offset, for example <code>-6</code> for Central Time.'); ?>)</td>
  • trunk/wp-content/themes/default/sidebar.php

    r5700 r5825  
    2222
    2323            <?php /* If this is a yearly archive */ } elseif (is_day()) { ?>
    24             <p>You are currently browsing the <a href="<?php bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives
     24            <p>You are currently browsing the <a href="<?php bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> blog archives
    2525            for the day <?php the_time('l, F jS, Y'); ?>.</p>
    2626
    2727            <?php /* If this is a monthly archive */ } elseif (is_month()) { ?>
    28             <p>You are currently browsing the <a href="<?php bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives
     28            <p>You are currently browsing the <a href="<?php bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> blog archives
    2929            for <?php the_time('F, Y'); ?>.</p>
    3030
    3131            <?php /* If this is a yearly archive */ } elseif (is_year()) { ?>
    32             <p>You are currently browsing the <a href="<?php bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives
     32            <p>You are currently browsing the <a href="<?php bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> blog archives
    3333            for the year <?php the_time('Y'); ?>.</p>
    3434
    3535            <?php /* If this is a monthly archive */ } elseif (is_search()) { ?>
    36             <p>You have searched the <a href="<?php echo bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives
     36            <p>You have searched the <a href="<?php echo bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> blog archives
    3737            for <strong>'<?php the_search_query(); ?>'</strong>. If you are unable to find anything in these search results, you can try one of these links.</p>
    3838
    3939            <?php /* If this is a monthly archive */ } elseif (isset($_GET['paged']) && !empty($_GET['paged'])) { ?>
    40             <p>You are currently browsing the <a href="<?php echo bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives.</p>
     40            <p>You are currently browsing the <a href="<?php echo bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> blog archives.</p>
    4141
    4242            <?php } ?>
  • trunk/xmlrpc.php

    r5807 r5825  
    708708      }
    709709
    710       /* warning: here we make the assumption that the weblog's URL is on the same server */
     710      /* warning: here we make the assumption that the blog's URL is on the same server */
    711711      $filename = get_option('home') . '/';
    712712      $filename = preg_replace('#https?://.+?/#', $_SERVER['DOCUMENT_ROOT'].'/', $filename);
     
    743743      }
    744744
    745       /* warning: here we make the assumption that the weblog's URL is on the same server */
     745      /* warning: here we make the assumption that the blog's URL is on the same server */
    746746      $filename = get_option('home') . '/';
    747747      $filename = preg_replace('#https?://.+?/#', $_SERVER['DOCUMENT_ROOT'].'/', $filename);
     
    778778      $user = set_current_user(0, $user_login);
    779779      if ( !current_user_can($cap) )
    780         return new IXR_Error(401, __('Sorry, you can not post on this weblog or category.'));
     780        return new IXR_Error(401, __('Sorry, you are not allowed to post on this blog.'));
    781781
    782782      $post_status = ($publish) ? 'publish' : 'draft';
     
    918918      $user = set_current_user(0, $user_login);
    919919      if ( !current_user_can($cap) )
    920         return new IXR_Error(401, __('Sorry, you can not post on this weblog or category.'));
     920        return new IXR_Error(401, __('Sorry, you are not allowed to post on this blog.'));
    921921
    922922        // The post_type defaults to post, but could also be page.
     
    14581458
    14591459
    1460     /* metaweblog.getCategories ...returns the list of categories on a given weblog */
     1460    /* metaweblog.getCategories ...returns the list of categories on a given blog */
    14611461    function mw_getCategories($args) {
    14621462
     
    16141614
    16151615
    1616     /* mt.getCategoryList ...returns the list of categories on a given weblog */
     1616    /* mt.getCategoryList ...returns the list of categories on a given blog */
    16171617    function mt_getCategoryList($args) {
    16181618
Note: See TracChangeset for help on using the changeset viewer.