Make WordPress Core

Changeset 4133


Ignore:
Timestamp:
08/30/2006 04:40:17 PM (18 years ago)
Author:
ryan
Message:

s/URI/URL/. Props Nazgul. fixes #2666

Location:
trunk
Files:
19 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/edit-comments.php

    r3944 r4133  
    4646  <input type="submit" name="submit" value="<?php _e('Search') ?>"  /> 
    4747  <input type="hidden" name="mode" value="<?php echo $mode; ?>" />
    48   <?php _e('(Searches within comment text, e-mail, URI, and IP address.)') ?>
     48  <?php _e('(Searches within comment text, e-mail, URL, and IP address.)') ?>
    4949  </fieldset>
    5050</form>
  • trunk/wp-admin/edit-form-comment.php

    r3918 r4133  
    3131</fieldset>
    3232<fieldset id="uridiv">
    33         <legend><label for="URL"><?php _e('URI:') ?></label></legend>
     33        <legend><label for="URL"><?php _e('URL:') ?></label></legend>
    3434        <div>
    3535          <input type="text" id="newcomment_author_url" name="newcomment_author_url" size="35" value="<?php echo $comment->comment_author_url ?>" tabindex="3" id="URL" />
  • trunk/wp-admin/edit-form.php

    r3942 r4133  
    5252<input type="hidden" name="post_pingback" value="<?php echo get_option('default_pingback_flag') ?>" id="post_pingback" />
    5353
    54 <p><label for="trackback"> <?php printf(__('<a href="%s" title="Help on trackbacks"><strong>TrackBack</strong> a <abbr title="Universal Resource Identifier">URI</abbr></a>:</label> (Separate multiple <abbr title="Universal Resource Identifier">URI</abbr>s with spaces.)<br />'), 'http://wordpress.org/docs/reference/post/#trackback') ?>
     54<p><label for="trackback"> <?php printf(__('<a href="%s" title="Help on trackbacks"><strong>TrackBack</strong> a <abbr title="Universal Resource Locator">URL</abbr></a>:</label> (Separate multiple <abbr title="Universal Resource Locator">URL</abbr>s with spaces.)<br />'), 'http://wordpress.org/docs/reference/post/#trackback') ?>
    5555    <input type="text" name="trackback_url" style="width: 360px" id="trackback" tabindex="7" /></p>
    5656
  • trunk/wp-admin/link-manager.php

    r4021 r4133  
    106106    <tr>
    107107        <th width="15%" style="text-align: left"><?php _e('Name') ?></th>
    108         <th style="text-align: left"><?php _e('URI') ?></th>
     108        <th style="text-align: left"><?php _e('URL') ?></th>
    109109        <th style="text-align: left"><?php _e('Categories') ?></th>
    110110        <th><?php _e('rel') ?></th>
  • trunk/wp-admin/options-discussion.php

    r3759 r4133  
    7474<p><?php printf(__('Hold a comment in the queue if it contains more than %s links. (A common characteristic of comment spam is a large number of hyperlinks.)'), '<input name="comment_max_links" type="text" id="comment_max_links" size="3" value="' . get_settings('comment_max_links'). '" />' ) ?></p>
    7575
    76 <p><?php _e('When a comment contains any of these words in its content, name, URI, e-mail, or IP, hold it in the moderation queue: (Separate multiple words with new lines.) <a href="http://codex.wordpress.org/Spam_Words">Common spam words</a>.') ?></p>
     76<p><?php _e('When a comment contains any of these words in its content, name, URL, e-mail, or IP, hold it in the moderation queue: (Separate multiple words with new lines.) <a href="http://codex.wordpress.org/Spam_Words">Common spam words</a>.') ?></p>
    7777<p>
    7878<textarea name="moderation_keys" cols="60" rows="4" id="moderation_keys" style="width: 98%; font-size: 12px;" class="code"><?php form_option('moderation_keys'); ?></textarea>
  • trunk/wp-admin/options-general.php

    r4115 r4133  
    2424</tr>
    2525<tr valign="top">
    26 <th scope="row"><?php _e('WordPress address (URI):') ?></th>
     26<th scope="row"><?php _e('WordPress address (URL):') ?></th>
    2727<td><input name="siteurl" type="text" id="siteurl" value="<?php form_option('siteurl'); ?>" size="40" class="code" /></td>
    2828</tr>
    2929<tr valign="top">
    30 <th scope="row"><?php _e('Blog address (URI):') ?></th>
     30<th scope="row"><?php _e('Blog address (URL):') ?></th>
    3131<td><input name="home" type="text" id="home" value="<?php form_option('home'); ?>" size="40" class="code" /><br /><?php _e('If you want your blog homepage <a href="http://codex.wordpress.org/Giving_WordPress_Its_Own_Directory">to be different than the directory</a> you installed WordPress in, enter that address here.'); ?></td>
    3232</tr>
  • trunk/wp-admin/options-permalink.php

    r4112 r4133  
    103103<div class="wrap">
    104104  <h2><?php _e('Customize Permalink Structure') ?></h2>
    105   <p><?php _e('By default WordPress uses web URIs which have question marks and lots of numbers in them, however WordPress offers you the ability to create a custom URI structure for your permalinks and archives. This can improve the aesthetics, usability, and forward-compatibility of your links. A <a href="http://codex.wordpress.org/Using_Permalinks">number of tags are available</a>, and here are some examples to get you started.'); ?></p>
     105  <p><?php _e('By default WordPress uses web <abbr title="Universal Resource Locator">URL</abbr>s which have question marks and lots of numbers in them, however WordPress offers you the ability to create a custom URL structure for your permalinks and archives. This can improve the aesthetics, usability, and forward-compatibility of your links. A <a href="http://codex.wordpress.org/Using_Permalinks">number of tags are available</a>, and here are some examples to get you started.'); ?></p>
    106106
    107107<?php
     
    153153<h3><?php _e('Optional'); ?></h3>
    154154<?php if ($is_apache) : ?>
    155     <p><?php _e('If you like, you may enter a custom prefix for your category URIs here. For example, <code>/taxonomy/tags</code> would make your category links like <code>http://example.org/taxonomy/tags/uncategorized/</code>. If you leave this blank the default will be used.') ?></p>
     155    <p><?php _e('If you like, you may enter a custom prefix for your category <abbr title="Universal Resource Locator">URL</abbr>s here. For example, <code>/taxonomy/tags</code> would make your category links like <code>http://example.org/taxonomy/tags/uncategorized/</code>. If you leave this blank the default will be used.') ?></p>
    156156<?php else : ?>
    157     <p><?php _e('If you like, you may enter a custom prefix for your category URIs here. For example, <code>/index.php/taxonomy/tags</code> would make your category links like <code>http://example.org/index.php/taxonomy/tags/uncategorized/</code>. If you leave this blank the default will be used.') ?></p>
     157    <p><?php _e('If you like, you may enter a custom prefix for your category <abbr title="Universal Resource Locator">URL</abbr>s here. For example, <code>/index.php/taxonomy/tags</code> would make your category links like <code>http://example.org/index.php/taxonomy/tags/uncategorized/</code>. If you leave this blank the default will be used.') ?></p>
    158158<?php endif; ?>
    159159    <p>
  • trunk/wp-admin/options-writing.php

    r3759 r4133  
    9797<fieldset class="options">
    9898<legend><?php _e('Update Services') ?></legend>
    99 <p><?php _e('When you publish a new post, WordPress automatically notifies the following site update services. For more about this, see <a href="http://codex.wordpress.org/Update_Services">Update Services</a> on the Codex. Separate multiple service URIs with line breaks.') ?></p>
     99<p><?php _e('When you publish a new post, WordPress automatically notifies the following site update services. For more about this, see <a href="http://codex.wordpress.org/Update_Services">Update Services</a> on the Codex. Separate multiple service <abbr title="Universal Resource Locator">URL</abbr>s with line breaks.') ?></p>
    100100
    101101<textarea name="ping_sites" id="ping_sites" style="width: 98%;" rows="3" cols="50"><?php form_option('ping_sites'); ?></textarea>
  • trunk/wp-content/themes/classic/comments-popup.php

    r3902 r4133  
    2525
    2626<?php if ('open' == $post->ping_status) { ?>
    27 <p><?php _e("The <acronym title=\"Uniform Resource Identifier\">URI</acronym> to TrackBack this entry is:"); ?> <em><?php trackback_url() ?></em></p>
     27<p><?php _e("The <abbr title=\"Universal Resource Locator\">URL</abbr> to TrackBack this entry is:"); ?> <em><?php trackback_url() ?></em></p>
    2828<?php } ?>
    2929
     
    7171    <p>
    7272      <input type="text" name="url" id="url" value="<?php echo $comment_author_url; ?>" size="28" tabindex="3" />
    73        <label for="url"><?php _e("<acronym title=\"Uniform Resource Identifier\">URI</acronym>"); ?></label>
     73       <label for="url"><?php _e("<abbr title=\"Universal Resource Locator\">URL</abbr>"); ?></label>
    7474    </p>
    7575
  • trunk/wp-content/themes/classic/comments.php

    r2254 r4133  
    2828<p><?php comments_rss_link(__('<abbr title="Really Simple Syndication">RSS</abbr> feed for comments on this post.')); ?>
    2929<?php if ( pings_open() ) : ?>
    30     <a href="<?php trackback_url() ?>" rel="trackback"><?php _e('TrackBack <abbr title="Uniform Resource Identifier">URI</abbr>'); ?></a>
     30    <a href="<?php trackback_url() ?>" rel="trackback"><?php _e('TrackBack <abbr title="Universal Resource Locator">URL</abbr>'); ?></a>
    3131<?php endif; ?>
    3232</p>
  • trunk/wp-content/themes/default/comments-popup.php

    r3902 r4133  
    2525
    2626<?php if ('open' == $post->ping_status) { ?>
    27 <p>The <acronym title="Uniform Resource Identifier">URI</acronym> to TrackBack this entry is: <em><?php trackback_url() ?></em></p>
     27<p>The <abbr title="Universal Resource Locator">URL</abbr> to TrackBack this entry is: <em><?php trackback_url() ?></em></p>
    2828<?php } ?>
    2929
     
    7171    <p>
    7272      <input type="text" name="url" id="url" value="<?php echo $comment_author_url; ?>" size="28" tabindex="3" />
    73        <label for="url"><acronym title="Uniform Resource Identifier">URI</acronym></label>
     73       <label for="url"><abbr title="Universal Resource Locator">URL</abbr></label>
    7474    </p>
    7575
  • trunk/wp-includes/comment.php

    r3990 r4133  
    554554            $pingback_server_url_len = $pingback_href_end - $pingback_href_start;
    555555            $pingback_server_url = substr($contents, $pingback_href_start, $pingback_server_url_len);
    556             // We may find rel="pingback" but an incomplete pingback URI
     556            // We may find rel="pingback" but an incomplete pingback URL
    557557            if ($pingback_server_url_len > 0) {
    558558                // We got it!
  • trunk/wp-includes/link-template.php

    r4112 r4133  
    399399            } else {
    400400                // If using path info style permalinks, make sure the index is in
    401                 // the URI.
     401                // the URL.
    402402                if ( strpos($qstr, $index) === false )
    403403                    $qstr = '/' . $index . $qstr;
  • trunk/wp-includes/pluggable.php

    r3992 r4133  
    346346        $notify_message .= sprintf( __('Author : %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
    347347        $notify_message .= sprintf( __('E-mail : %s'), $comment->comment_author_email ) . "\r\n";
    348         $notify_message .= sprintf( __('URI    : %s'), $comment->comment_author_url ) . "\r\n";
     348        $notify_message .= sprintf( __('URL    : %s'), $comment->comment_author_url ) . "\r\n";
    349349        $notify_message .= sprintf( __('Whois  : http://ws.arin.net/cgi-bin/whois.pl?queryinput=%s'), $comment->comment_author_IP ) . "\r\n";
    350350        $notify_message .= __('Comment: ') . "\r\n" . $comment->comment_content . "\r\n\r\n";
     
    354354        $notify_message  = sprintf( __('New trackback on your post #%1$s "%2$s"'), $comment->comment_post_ID, $post->post_title ) . "\r\n";
    355355        $notify_message .= sprintf( __('Website: %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
    356         $notify_message .= sprintf( __('URI    : %s'), $comment->comment_author_url ) . "\r\n";
     356        $notify_message .= sprintf( __('URL    : %s'), $comment->comment_author_url ) . "\r\n";
    357357        $notify_message .= __('Excerpt: ') . "\r\n" . $comment->comment_content . "\r\n\r\n";
    358358        $notify_message .= __('You can see all trackbacks on this post here: ') . "\r\n";
     
    361361        $notify_message  = sprintf( __('New pingback on your post #%1$s "%2$s"'), $comment->comment_post_ID, $post->post_title ) . "\r\n";
    362362        $notify_message .= sprintf( __('Website: %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
    363         $notify_message .= sprintf( __('URI    : %s'), $comment->comment_author_url ) . "\r\n";
     363        $notify_message .= sprintf( __('URL    : %s'), $comment->comment_author_url ) . "\r\n";
    364364        $notify_message .= __('Excerpt: ') . "\r\n" . sprintf('[...] %s [...]', $comment->comment_content ) . "\r\n\r\n";
    365365        $notify_message .= __('You can see all pingbacks on this post here: ') . "\r\n";
     
    421421    $notify_message .= sprintf( __('Author : %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
    422422    $notify_message .= sprintf( __('E-mail : %s'), $comment->comment_author_email ) . "\r\n";
    423     $notify_message .= sprintf( __('URI    : %s'), $comment->comment_author_url ) . "\r\n";
     423    $notify_message .= sprintf( __('URL    : %s'), $comment->comment_author_url ) . "\r\n";
    424424    $notify_message .= sprintf( __('Whois  : http://ws.arin.net/cgi-bin/whois.pl?queryinput=%s'), $comment->comment_author_IP ) . "\r\n";
    425425    $notify_message .= __('Comment: ') . "\r\n" . $comment->comment_content . "\r\n\r\n";
  • trunk/wp-includes/post.php

    r4119 r4133  
    815815//
    816816
    817 function add_ping($post_id, $uri) { // Add a URI to those already pung
     817function add_ping($post_id, $uri) { // Add a URL to those already pung
    818818    global $wpdb;
    819819    $pung = $wpdb->get_var("SELECT pinged FROM $wpdb->posts WHERE ID = $post_id");
     
    845845}
    846846
    847 function get_pung($post_id) { // Get URIs already pung for a post
     847function get_pung($post_id) { // Get URLs already pung for a post
    848848    global $wpdb;
    849849    $pung = $wpdb->get_var("SELECT pinged FROM $wpdb->posts WHERE ID = $post_id");
     
    854854}
    855855
    856 function get_to_ping($post_id) { // Get any URIs in the todo list
     856function get_to_ping($post_id) { // Get any URLs in the todo list
    857857    global $wpdb;
    858858    $to_ping = $wpdb->get_var("SELECT to_ping FROM $wpdb->posts WHERE ID = $post_id");
     
    11101110        foreach ($posts as $id => $post) {
    11111111
    1112             // URI => page name
     1112            // URL => page name
    11131113            $uri = get_page_uri($id);
    11141114            $attachments = $wpdb->get_results("SELECT ID, post_name, post_parent FROM $wpdb->posts WHERE post_type = 'attachment' AND post_parent = '$id'");
  • trunk/wp-includes/query.php

    r4132 r4133  
    765765        }
    766766
    767         // Category stuff for nice URIs
     767        // Category stuff for nice URLs
    768768
    769769        global $cache_categories;
     
    824824        }
    825825
    826         // Author stuff for nice URIs
     826        // Author stuff for nice URLs
    827827
    828828        if ('' != $q['author_name']) {
  • trunk/wp-includes/rewrite.php

    r3791 r4133  
    8585    $url = $url_split[0];
    8686
    87     // Get rid of URI ?query=string
     87    // Get rid of URL ?query=string
    8888    $url_split = explode('?', $url);
    8989    $url = $url_split[0];
  • trunk/wp-trackback.php

    r3928 r4133  
    8787    $dupe = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_post_ID = '$comment_post_ID' AND comment_author_url = '$comment_author_url'");
    8888    if ( $dupe )
    89         trackback_response(1, 'We already have a ping from that URI for this post.');
     89        trackback_response(1, 'We already have a ping from that URL for this post.');
    9090
    9191    $commentdata = compact('comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_content', 'comment_type');
  • trunk/xmlrpc.php

    r4049 r4133  
    329329      }
    330330
    331       /* warning: here we make the assumption that the weblog's URI is on the same server */
     331      /* warning: here we make the assumption that the weblog's URL is on the same server */
    332332      $filename = get_settings('home') . '/';
    333333      $filename = preg_replace('#https?://.+?/#', $_SERVER['DOCUMENT_ROOT'].'/', $filename);
     
    364364      }
    365365
    366       /* warning: here we make the assumption that the weblog's URI is on the same server */
     366      /* warning: here we make the assumption that the weblog's URL is on the same server */
    367367      $filename = get_settings('home') . '/';
    368368      $filename = preg_replace('#https?://.+?/#', $_SERVER['DOCUMENT_ROOT'].'/', $filename);
     
    11541154        } else {
    11551155            // TODO: Attempt to extract a post ID from the given URL
    1156             return new IXR_Error(33, 'The specified target URI cannot be used as a target. It either doesn\'t exist, or it is not a pingback-enabled resource.');
     1156            return new IXR_Error(33, 'The specified target URL cannot be used as a target. It either doesn\'t exist, or it is not a pingback-enabled resource.');
    11571157        }
    11581158        $post_ID = (int) $post_ID;
    11591159
    11601160
    1161         logIO("O","(PB) URI='$pagelinkedto' ID='$post_ID' Found='$way'");
     1161        logIO("O","(PB) URL='$pagelinkedto' ID='$post_ID' Found='$way'");
    11621162
    11631163        $post = get_post($post_ID);
    11641164
    11651165        if ( !$post ) // Post_ID not found
    1166             return new IXR_Error(33, 'The specified target URI cannot be used as a target. It either doesn\'t exist, or it is not a pingback-enabled resource.');
     1166            return new IXR_Error(33, 'The specified target URL cannot be used as a target. It either doesn\'t exist, or it is not a pingback-enabled resource.');
    11671167
    11681168        if ( $post_ID == url_to_postid($pagelinkedfrom) )
    1169             return new IXR_Error(0, 'The source URI and the target URI cannot both point to the same resource.');
     1169            return new IXR_Error(0, 'The source URL and the target URL cannot both point to the same resource.');
    11701170
    11711171        // Check if pings are on
    11721172        if ( 'closed' == $post->ping_status )
    1173             return new IXR_Error(33, 'The specified target URI cannot be used as a target. It either doesn\'t exist, or it is not a pingback-enabled resource.');
     1173            return new IXR_Error(33, 'The specified target URL cannot be used as a target. It either doesn\'t exist, or it is not a pingback-enabled resource.');
    11741174
    11751175        // Let's check that the remote site didn't already pingback this entry
     
    11851185        $linea = wp_remote_fopen( $pagelinkedfrom );
    11861186        if ( !$linea )
    1187             return new IXR_Error(16, 'The source URI does not exist.');
     1187            return new IXR_Error(16, 'The source URL does not exist.');
    11881188
    11891189        // Work around bug in strip_tags():
     
    12201220
    12211221        if ( empty($context) ) // URL pattern not found
    1222             return new IXR_Error(17, 'The source URI does not contain a link to the target URI, and so cannot be used as a source.');
     1222            return new IXR_Error(17, 'The source URL does not contain a link to the target URL, and so cannot be used as a source.');
    12231223
    12241224        $pagelinkedfrom = preg_replace('#&([^amp\;])#is', '&amp;$1', $pagelinkedfrom);
     
    12601260        if (!$post_ID) {
    12611261            // We aren't sure that the resource is available and/or pingback enabled
    1262             return new IXR_Error(33, 'The specified target URI cannot be used as a target. It either doesn\'t exist, or it is not a pingback-enabled resource.');
     1262            return new IXR_Error(33, 'The specified target URL cannot be used as a target. It either doesn\'t exist, or it is not a pingback-enabled resource.');
    12631263        }
    12641264
     
    12671267        if (!$actual_post) {
    12681268            // No such post = resource not found
    1269             return new IXR_Error(32, 'The specified target URI does not exist.');
     1269            return new IXR_Error(32, 'The specified target URL does not exist.');
    12701270        }
    12711271
Note: See TracChangeset for help on using the changeset viewer.