Make WordPress Core

Changeset 4499


Ignore:
Timestamp:
11/20/2006 02:17:07 AM (18 years ago)
Author:
ryan
Message:

Standardize on Links instead of Bookmarks until we change our minds again.

Location:
trunk/wp-admin
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/categories.php

    r4495 r4499  
    3838
    3939    if ( $cat_ID == get_option('default_link_category') )
    40         wp_die(sprintf(__("Can't delete the <strong>%s</strong> category: this is the default one for bookmarks"), $cat_name));
     40        wp_die(sprintf(__("Can't delete the <strong>%s</strong> category: this is the default one for links"), $cat_name));
    4141
    4242    wp_delete_category($cat_ID);
     
    100100        <th scope="col"><?php _e('Description') ?></th>
    101101        <th scope="col" width="90" style="text-align: center"><?php _e('Posts') ?></th>
    102         <th scope="col" width="90" style="text-align: center"><?php _e('Bookmarks') ?></th>
     102        <th scope="col" width="90" style="text-align: center"><?php _e('Links') ?></th>
    103103        <th colspan="2" style="text-align: center"><?php _e('Action') ?></th>
    104104    </tr>
     
    115115<?php if ( current_user_can('manage_categories') ) : ?>
    116116<div class="wrap">
    117 <p><?php printf(__('<strong>Note:</strong><br />Deleting a category does not delete the posts and bookmarks in that category.  Instead, posts in the deleted category are set to the category <strong>%s</strong> and bookmarks are set to <strong>%s</strong>.'), get_catname(get_option('default_category')), get_catname(get_option('default_link_category'))) ?></p>
     117<p><?php printf(__('<strong>Note:</strong><br />Deleting a category does not delete the posts and links in that category.  Instead, posts in the deleted category are set to the category <strong>%s</strong> and links are set to <strong>%s</strong>.'), get_catname(get_option('default_category')), get_catname(get_option('default_link_category'))) ?></p>
    118118</div>
    119119
  • trunk/wp-admin/link-add.php

    r4495 r4499  
    22require_once('admin.php');
    33
    4 $title = __('Add Bookmark');
     4$title = __('Add Link');
    55$this_file = 'link-manager.php';
    66$parent_file = 'link-manager.php';
  • trunk/wp-admin/link-manager.php

    r4495 r4499  
    77require_once ('admin.php');
    88
    9 $title = __('Manage Bookmarks');
    10 $this_file = $parent_file = 'link-manager.php';
    119wp_enqueue_script( 'listman' );
    1210
     
    1917    $order_by = 'order_name';
    2018
    21 $title = __('Manage Bookmarks');
     19$title = __('Manage Blogroll');
     20$this_file = $parent_file = 'link-manager.php';
    2221include_once ("./admin-header.php");
    2322
    2423if (!current_user_can('manage_links'))
    25     wp_die(__("You do not have sufficient permissions to edit the bookmarks for this blog."));
     24    wp_die(__("You do not have sufficient permissions to edit the links for this blog."));
    2625
    2726switch ($order_by) {
     
    6766    echo '<div style="background-color: rgb(207, 235, 247);" id="message" class="updated fade"><p>';
    6867    $deleted = (int) $_GET['deleted'];
    69     printf(__('%s bookmarks deleted.'), $deleted);
     68    printf(__('%s links deleted.'), $deleted);
    7069    echo '</p></div>';
    7170}
     
    8685
    8786$select_order = "<select name=\"order_by\">\n";
    88 $select_order .= '<option value="order_id"' . (($order_by == 'order_id') ? " selected='selected'" : '') . '>' .  __('Bookmark ID') . "</option>\n";
     87$select_order .= '<option value="order_id"' . (($order_by == 'order_id') ? " selected='selected'" : '') . '>' .  __('Link ID') . "</option>\n";
    8988$select_order .= '<option value="order_name"' . (($order_by == 'order_name') ? " selected='selected'" : '') . '>' .  __('Name') . "</option>\n";
    9089$select_order .= '<option value="order_url"' . (($order_by == 'order_url') ? " selected='selected'" : '') . '>' .  __('Address') . "</option>\n";
     
    163162
    164163        echo '<td><a href="link.php?link_id='.$link->link_id.'&amp;action=edit" class="edit">'.__('Edit').'</a></td>';
    165         echo '<td><a href="' . wp_nonce_url('link.php?link_id='.$link->link_id.'&amp;action=delete', 'delete-bookmark_' . $link->link_id ) . '"'." onclick=\"return deleteSomething( 'link', $link->link_id , '".sprintf(__("You are about to delete the &quot;%s&quot; bookmark to %s.\\n&quot;Cancel&quot; to stop, &quot;OK&quot; to delete."), js_escape($link->link_name), js_escape($link->link_url)).'\' );" class="delete">'.__('Delete').'</a></td>';
     164        echo '<td><a href="' . wp_nonce_url('link.php?link_id='.$link->link_id.'&amp;action=delete', 'delete-bookmark_' . $link->link_id ) . '"'." onclick=\"return deleteSomething( 'link', $link->link_id , '".sprintf(__("You are about to delete the &quot;%s&quot; link to %s.\\n&quot;Cancel&quot; to stop, &quot;OK&quot; to delete."), js_escape($link->link_name), js_escape($link->link_url)).'\' );" class="delete">'.__('Delete').'</a></td>';
    166165        echo '<td align="center"><input type="checkbox" name="linkcheck[]" value="'.$link->link_id.'" /></td>';
    167166        echo "\n    </tr>\n";
     
    173172<div id="ajax-response"></div>
    174173
    175 <p class="submit"><input type="submit" class="button" name="deletebookmarks" id="deletebookmarks" value="<?php _e('Delete Checked Bookmarks') ?> &raquo;" onclick="return confirm('<?php _e("You are about to delete these bookmarks permanently \\n  \'Cancel\' to stop, \'OK\' to delete.") ?>')" /></p>
     174<p class="submit"><input type="submit" class="button" name="deletebookmarks" id="deletebookmarks" value="<?php _e('Delete Checked Links') ?> &raquo;" onclick="return confirm('<?php _e("You are about to delete these links permanently \\n  \'Cancel\' to stop, \'OK\' to delete.") ?>')" /></p>
    176175</form>
    177176</div>
  • trunk/wp-admin/link.php

    r4495 r4499  
    9797        $parent_file = 'link-manager.php';
    9898        $submenu_file = 'link-manager.php';
    99         $title = __('Edit Bookmark');
     99        $title = __('Edit Link');
    100100        include_once ('admin-header.php');
    101101        if (!current_user_can('manage_links'))
    102             wp_die(__('You do not have sufficient permissions to edit the bookmarks for this blog.'));
     102            wp_die(__('You do not have sufficient permissions to edit the links for this blog.'));
    103103
    104104        $link_id = (int) $_GET['link_id'];
Note: See TracChangeset for help on using the changeset viewer.