golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

git-svn-id: http://svn.automattic.com/wordpress/trunk@5825 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
markjaquith 2007-07-30 16:32:12 +00:00
parent e06883dfcc
commit 8c454d7909
7 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/includes/schema.php
View File

@ -156,7 +156,7 @@ function populate_options() {
$schema = ( isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ) ? 'https://' : 'http://'; $schema = ( isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ) ? 'https://' : 'http://';
$guessurl = preg_replace('|/wp-admin/.*|i', '', $schema . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']); $guessurl = preg_replace('|/wp-admin/.*|i', '', $schema . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
add_option('siteurl', $guessurl, __('WordPress web address')); add_option('siteurl', $guessurl, __('WordPress web address'));
add_option('blogname', __('My Weblog'), __('Blog title')); add_option('blogname', __('My Blog'), __('Blog title'));
add_option('blogdescription', __('Just another WordPress weblog'), __('Short tagline')); add_option('blogdescription', __('Just another WordPress weblog'), __('Short tagline'));
add_option('new_users_can_blog', 0); add_option('new_users_can_blog', 0);
add_option('users_can_register', 0); add_option('users_can_register', 0);

2
wp-admin/includes/upgrade.php
View File

@ -123,7 +123,7 @@ You can log in to the administrator account with the following information:
Username: %2\$s Username: %2\$s
Password: %3\$s Password: %3\$s
We hope you enjoy your new weblog. Thanks! We hope you enjoy your new blog. Thanks!
--The WordPress Team --The WordPress Team
http://wordpress.org/ http://wordpress.org/

2
wp-admin/install.php
View File

@ -45,7 +45,7 @@ switch($step) {
<form id="setup" method="post" action="install.php?step=2"> <form id="setup" method="post" action="install.php?step=2">
<table width="100%"> <table width="100%">
<tr> <tr>
<th width="33%"><?php _e('Weblog title:'); ?></th> <th width="33%"><?php _e('Blog title:'); ?></th>
<td><input name="weblog_title" type="text" id="weblog_title" size="25" /></td> <td><input name="weblog_title" type="text" id="weblog_title" size="25" /></td>
</tr> </tr>
<tr> <tr>

6
wp-admin/options-discussion.php
View File

@ -18,12 +18,12 @@ include('admin-header.php');
<li> <li>
<label for="default_pingback_flag"> <label for="default_pingback_flag">
<input name="default_pingback_flag" type="checkbox" id="default_pingback_flag" value="1" <?php checked('1', get_option('default_pingback_flag')); ?> /> <input name="default_pingback_flag" type="checkbox" id="default_pingback_flag" value="1" <?php checked('1', get_option('default_pingback_flag')); ?> />
<?php _e('Attempt to notify any Weblogs linked to from the article (slows down posting.)') ?></label> <?php _e('Attempt to notify any blogs linked to from the article (slows down posting.)') ?></label>
</li> </li>
<li> <li>
<label for="default_ping_status"> <label for="default_ping_status">
<input name="default_ping_status" type="checkbox" id="default_ping_status" value="open" <?php checked('open', get_option('default_ping_status')); ?> /> <input name="default_ping_status" type="checkbox" id="default_ping_status" value="open" <?php checked('open', get_option('default_ping_status')); ?> />
<?php _e('Allow link notifications from other Weblogs (pingbacks and trackbacks.)') ?></label> <?php _e('Allow link notifications from other blogs (pingbacks and trackbacks.)') ?></label>
</li> </li>
<li> <li>
<label for="default_comment_status"> <label for="default_comment_status">
@ -83,4 +83,4 @@ include('admin-header.php');
</form> </form>
</div> </div>
<?php include('./admin-footer.php'); ?> <?php include('./admin-footer.php'); ?>

6
wp-admin/options-general.php
View File

@ -14,14 +14,14 @@ include('./admin-header.php');
<p class="submit"><input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" /></p> <p class="submit"><input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" /></p>
<table class="optiontable"> <table class="optiontable">
<tr valign="top"> <tr valign="top">
<th scope="row"><?php _e('Weblog title:') ?></th> <th scope="row"><?php _e('Blog title:') ?></th>
<td><input name="blogname" type="text" id="blogname" value="<?php form_option('blogname'); ?>" size="40" /></td> <td><input name="blogname" type="text" id="blogname" value="<?php form_option('blogname'); ?>" size="40" /></td>
</tr> </tr>
<tr valign="top"> <tr valign="top">
<th scope="row"><?php _e('Tagline:') ?></th> <th scope="row"><?php _e('Tagline:') ?></th>
<td><input name="blogdescription" type="text" id="blogdescription" style="width: 95%" value="<?php form_option('blogdescription'); ?>" size="45" /> <td><input name="blogdescription" type="text" id="blogdescription" style="width: 95%" value="<?php form_option('blogdescription'); ?>" size="45" />
<br /> <br />
<?php _e('In a few words, explain what this weblog is about.') ?></td> <?php _e('In a few words, explain what this blog is about.') ?></td>
</tr> </tr>
<tr valign="top"> <tr valign="top">
<th scope="row"><?php _e('WordPress address (URL):') ?></th> <th scope="row"><?php _e('WordPress address (URL):') ?></th>
@ -63,7 +63,7 @@ include('./admin-header.php');
<td><code><?php echo gmdate(__('Y-m-d g:i:s a')); ?></code></td> <td><code><?php echo gmdate(__('Y-m-d g:i:s a')); ?></code></td>
</tr> </tr>
<tr> <tr>
<th scope="row"><?php _e('Times in the weblog should differ by:') ?> </th> <th scope="row"><?php _e('Times in the blog should differ by:') ?> </th>
<td><input name="gmt_offset" type="text" id="gmt_offset" size="2" value="<?php form_option('gmt_offset'); ?>" /> <td><input name="gmt_offset" type="text" id="gmt_offset" size="2" value="<?php form_option('gmt_offset'); ?>" />
<?php _e('hours') ?> (<?php _e('Your timezone offset, for example <code>-6</code> for Central Time.'); ?>)</td> <?php _e('hours') ?> (<?php _e('Your timezone offset, for example <code>-6</code> for Central Time.'); ?>)</td>
</tr> </tr>

10
wp-content/themes/default/sidebar.php
View File

@ -21,23 +21,23 @@
<p>You are currently browsing the archives for the <?php single_cat_title(''); ?> category.</p> <p>You are currently browsing the archives for the <?php single_cat_title(''); ?> category.</p>
<?php /* If this is a yearly archive */ } elseif (is_day()) { ?> <?php /* If this is a yearly archive */ } elseif (is_day()) { ?>
<p>You are currently browsing the <a href="<?php bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives <p>You are currently browsing the <a href="<?php bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> blog archives
for the day <?php the_time('l, F jS, Y'); ?>.</p> for the day <?php the_time('l, F jS, Y'); ?>.</p>
<?php /* If this is a monthly archive */ } elseif (is_month()) { ?> <?php /* If this is a monthly archive */ } elseif (is_month()) { ?>
<p>You are currently browsing the <a href="<?php bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives <p>You are currently browsing the <a href="<?php bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> blog archives
for <?php the_time('F, Y'); ?>.</p> for <?php the_time('F, Y'); ?>.</p>
<?php /* If this is a yearly archive */ } elseif (is_year()) { ?> <?php /* If this is a yearly archive */ } elseif (is_year()) { ?>
<p>You are currently browsing the <a href="<?php bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives <p>You are currently browsing the <a href="<?php bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> blog archives
for the year <?php the_time('Y'); ?>.</p> for the year <?php the_time('Y'); ?>.</p>
<?php /* If this is a monthly archive */ } elseif (is_search()) { ?> <?php /* If this is a monthly archive */ } elseif (is_search()) { ?>
<p>You have searched the <a href="<?php echo bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives <p>You have searched the <a href="<?php echo bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> blog archives
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> 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>
<?php /* If this is a monthly archive */ } elseif (isset($_GET['paged']) && !empty($_GET['paged'])) { ?> <?php /* If this is a monthly archive */ } elseif (isset($_GET['paged']) && !empty($_GET['paged'])) { ?>
<p>You are currently browsing the <a href="<?php echo bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives.</p> <p>You are currently browsing the <a href="<?php echo bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> blog archives.</p>
<?php } ?> <?php } ?>

12
xmlrpc.php
View File

@ -707,7 +707,7 @@ class wp_xmlrpc_server extends IXR_Server {
return new IXR_Error(401, __('Sorry, this user can not edit the template.')); return new IXR_Error(401, __('Sorry, this user can not edit the template.'));
} }
/* warning: here we make the assumption that the weblog's URL is on the same server */ /* warning: here we make the assumption that the blog's URL is on the same server */
$filename = get_option('home') . '/'; $filename = get_option('home') . '/';
$filename = preg_replace('#https?://.+?/#', $_SERVER['DOCUMENT_ROOT'].'/', $filename); $filename = preg_replace('#https?://.+?/#', $_SERVER['DOCUMENT_ROOT'].'/', $filename);
@ -742,7 +742,7 @@ class wp_xmlrpc_server extends IXR_Server {
return new IXR_Error(401, __('Sorry, this user can not edit the template.')); return new IXR_Error(401, __('Sorry, this user can not edit the template.'));
} }
/* warning: here we make the assumption that the weblog's URL is on the same server */ /* warning: here we make the assumption that the blog's URL is on the same server */
$filename = get_option('home') . '/'; $filename = get_option('home') . '/';
$filename = preg_replace('#https?://.+?/#', $_SERVER['DOCUMENT_ROOT'].'/', $filename); $filename = preg_replace('#https?://.+?/#', $_SERVER['DOCUMENT_ROOT'].'/', $filename);
@ -777,7 +777,7 @@ class wp_xmlrpc_server extends IXR_Server {
$cap = ($publish) ? 'publish_posts' : 'edit_posts'; $cap = ($publish) ? 'publish_posts' : 'edit_posts';
$user = set_current_user(0, $user_login); $user = set_current_user(0, $user_login);
if ( !current_user_can($cap) ) if ( !current_user_can($cap) )
return new IXR_Error(401, __('Sorry, you can not post on this weblog or category.')); return new IXR_Error(401, __('Sorry, you are not allowed to post on this blog.'));
$post_status = ($publish) ? 'publish' : 'draft'; $post_status = ($publish) ? 'publish' : 'draft';
@ -917,7 +917,7 @@ class wp_xmlrpc_server extends IXR_Server {
$cap = ($publish) ? 'publish_posts' : 'edit_posts'; $cap = ($publish) ? 'publish_posts' : 'edit_posts';
$user = set_current_user(0, $user_login); $user = set_current_user(0, $user_login);
if ( !current_user_can($cap) ) if ( !current_user_can($cap) )
return new IXR_Error(401, __('Sorry, you can not post on this weblog or category.')); return new IXR_Error(401, __('Sorry, you are not allowed to post on this blog.'));
// The post_type defaults to post, but could also be page. // The post_type defaults to post, but could also be page.
$post_type = "post"; $post_type = "post";
@ -1457,7 +1457,7 @@ class wp_xmlrpc_server extends IXR_Server {
} }
/* metaweblog.getCategories ...returns the list of categories on a given weblog */ /* metaweblog.getCategories ...returns the list of categories on a given blog */
function mw_getCategories($args) { function mw_getCategories($args) {
global $wpdb; global $wpdb;
@ -1613,7 +1613,7 @@ class wp_xmlrpc_server extends IXR_Server {
} }
/* mt.getCategoryList ...returns the list of categories on a given weblog */ /* mt.getCategoryList ...returns the list of categories on a given blog */
function mt_getCategoryList($args) { function mt_getCategoryList($args) {
global $wpdb; global $wpdb;