<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[13295] trunk/wp-admin/custom-navigation.php: Some gettext and formatting.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13295">13295</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-02-22 18:03:03 +0000 (Mon, 22 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Some gettext and formatting. see <a href="http://trac.wordpress.org/ticket/11817">#11817</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincustomnavigationphp">trunk/wp-admin/custom-navigation.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmincustomnavigationphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/custom-navigation.php (13294 => 13295)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/custom-navigation.php 2010-02-22 17:48:50 UTC (rev 13294)
+++ trunk/wp-admin/custom-navigation.php 2010-02-22 18:03:03 UTC (rev 13295)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> <div class="wrap">
</span><del>- <div id="no-js"><h3>You do not have JavaScript enabled in your browser. Please enable it to access the Custom Menu functionality.</h3></div>
</del><ins>+ <div id="no-js"><h3><?php _e('You do not have JavaScript enabled in your browser. Please enable it to access the Custom Menu functionality.'); ?></h3></div>
</ins><span class="cx">
</span><span class="cx"> <?php
</span><span class="cx"> $messagesdiv = '';
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> if ( isset( $_POST['set_wp_menu'] ) ) {
</span><span class="cx"> // @todo validate set_wp_menu
</span><span class="cx"> update_option( 'wp_custom_nav_menu', $_POST['enable_wp_menu'] );
</span><del>- $messagesdiv = '<div id="message" class="updated fade below-h2"><p>'.$themename."'s Custom Menu has been updated!</p></div>";
</del><ins>+ $messagesdiv = '<div id="message" class="updated fade below-h2"><p>' . __('Custom Menu has been updated!') . '</p></div>';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( isset( $_POST['licount'] ) )
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> if ( $insert_menu_name != '' ) {
</span><span class="cx"> $existing_term = get_term_by( 'name', $insert_menu_name, 'nav_menu' );
</span><span class="cx"> if ( $existing_term ) {
</span><del>- $messagesdiv = '<div id="message" class="error fade below-h2"><p>' . $existing_term->name . ' Menu has already created - please try another name</p></div>';
</del><ins>+ $messagesdiv = '<div id="message" class="error fade below-h2"><p>' . esc_html( sprintf( e__('A menu named "%s" already exists; please try another name.'), $existing_term->name ) ) . '</p></div>';
</ins><span class="cx"> } else {
</span><span class="cx"> $term = wp_insert_term( $insert_menu_name, 'nav_menu' );
</span><span class="cx"> if ( !is_wp_error($term) ) {
</span><span class="lines">@@ -104,13 +104,13 @@
</span><span class="cx"> $custom_menus[$term->term_id] = $term;
</span><span class="cx"> $menu_selected_id = $term->term_id;
</span><span class="cx"> $menu_id_in_edit = $menu_selected_id;
</span><del>- $messagesdiv = '<div id="message" class="updated fade below-h2"><p>' . $term->name . ' Menu has been created!</p></div>';
</del><ins>+ $messagesdiv = '<div id="message" class="updated fade below-h2"><p>' . esc_html( sprintf( __('"%s" menu has been created!'), $term->name ) ) . '</p></div>';
</ins><span class="cx">
</span><span class="cx"> $postCounter = 0;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- $messagesdiv = '<div id="message" class="error fade below-h2"><p>Please enter a valid Menu name</p></div>';
</del><ins>+ $messagesdiv = '<div id="message" class="error fade below-h2"><p>' . __('Please enter a valid menu name.') . '</p></div>';
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -118,13 +118,13 @@
</span><span class="cx"> $success = wp_custom_nav_reset();
</span><span class="cx"> if ( $success ) {
</span><span class="cx"> // DISPLAY SUCCESS MESSAGE IF Menu Reset Correctly
</span><del>- $messagesdiv = '<div id="message" class="updated fade below-h2"><p>'.$themename."'s Custom Menu has been RESET!</p></div>";
</del><ins>+ $messagesdiv = '<div id="message" class="updated fade below-h2"><p>' . __('The menu has been reset.') . '</p></div>';
</ins><span class="cx"> // GET reset menu id
</span><span class="cx"> $custom_menus = array();
</span><span class="cx"> $menu_selected_id = 0;
</span><span class="cx"> } else {
</span><span class="cx"> // DISPLAY SUCCESS MESSAGE IF Menu Reset Correctly
</span><del>- $messagesdiv = '<div id="message" class="error fade below-h2"><p>'.$themename."'s Custom Menu could not be RESET. Please try again.</p></div>";
</del><ins>+ $messagesdiv = '<div id="message" class="error fade below-h2"><p>' . __('The menu could not be reset. Please try again.') . '</p></div>';
</ins><span class="cx"> }
</span><span class="cx"> } elseif ( $postCounter > 0 && $menu_selected_id > 0 ) {
</span><span class="cx"> $menu_objects = get_objects_in_term( $menu_selected_id, 'nav_menu' );
</span><span class="lines">@@ -180,7 +180,7 @@
</span><span class="cx"> ?>
</span><span class="cx"> <div id="pages-left">
</span><span class="cx"> <div class="inside">
</span><del>- <h2 class="maintitle">Custom Navigation</h2>
</del><ins>+ <h2 class="maintitle"><?php esc_html_e('Custom Navigation') ?></h2>
</ins><span class="cx"> <?php
</span><span class="cx">
</span><span class="cx"> //CHECK if custom menu has been enabled
</span><span class="lines">@@ -189,7 +189,7 @@
</span><span class="cx">
</span><span class="cx"> if ($checked == 'true') {
</span><span class="cx"> } else {
</span><del>- echo '<div id="message-enabled" class="error fade below-h2"><p><strong>The Custom Menu has not been Enabled yet. Please enable it in order to use it --------></strong></p></div>';
</del><ins>+ echo '<div id="message-enabled" class="error fade below-h2"><p><strong>' . __('The Custom Menu has not been Enabled yet. Please enable it in order to use it -------->') . '</strong></p></div>';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -205,7 +205,7 @@
</span><span class="cx"> <div class="sidebar-name-arrow">
</span><span class="cx"> <br/>
</span><span class="cx"> </div>
</span><del>- <h3><?php echo $menu_title; ?></h3>
</del><ins>+ <h3><?php echo esc_html($menu_title); ?></h3>
</ins><span class="cx">
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="lines">@@ -231,18 +231,18 @@
</span><span class="cx"> updatepostdata();
</span><span class="cx"> </script>
</span><span class="cx">
</span><del>- <input id="save_bottom" name="save_bottom" type="submit" value="Save All Changes" /></p>
</del><ins>+ <input id="save_bottom" name="save_bottom" type="submit" value="<?php esc_attr_e('Save All Changes'); ?>" /></p>
</ins><span class="cx"> </div><!-- /.inside -->
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div id="menu-right">
</span><span class="cx">
</span><del>- <h2 class="heading">Options</h2>
</del><ins>+ <h2 class="heading"><?php esc_html_e('Options'); ?></h2>
</ins><span class="cx">
</span><span class="cx"> <div class="widgets-holder-wrap">
</span><span class="cx"> <div class="sidebar-name">
</span><span class="cx"> <div class="sidebar-name-arrow"></div>
</span><del>- <h3>Setup Custom Menu</h3>
</del><ins>+ <h3><?php esc_html_e('Setup Custom Menu'); ?></h3>
</ins><span class="cx"> </div>
</span><span class="cx"> <div class="widget-holder">
</span><span class="cx">
</span><span class="lines">@@ -257,14 +257,14 @@
</span><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> <span >
</span><del>- <label>Enable</label><input type="radio" name="enable_wp_menu" value="true" <?php if ($checked=='true') { echo 'checked="checked"'; } ?> />
- <label>Disable</label><input type="radio" name="enable_wp_menu" value="false" <?php if ($checked=='true') { } else { echo 'checked="checked"'; } ?> />
</del><ins>+ <label><?php _e('Enable'); ?></label><input type="radio" name="enable_wp_menu" value="true" <?php if ($checked=='true') { echo 'checked="checked"'; } ?> />
+ <label><?php _e('Disable'); ?></label><input type="radio" name="enable_wp_menu" value="false" <?php if ($checked=='true') { } else { echo 'checked="checked"'; } ?> />
</ins><span class="cx"> </span><!-- /.checkboxes -->
</span><span class="cx">
</span><span class="cx"> <input id="set_wp_menu" type="submit" value="Set Menu" name="set_wp_menu" class="button" /><br />
</span><span class="cx">
</span><span class="cx"> <span>
</span><del>- <label>Reset Menu to Default</label>
</del><ins>+ <label><?php _e('Reset Menu to Default'); ?></label>
</ins><span class="cx"> <input id="reset_wp_menu" type="submit" value="Reset" name="reset_wp_menu" class="button" onclick="return confirm('Are you sure you want to RESET the Custom Navigation Menu to its Default Settings?');" />
</span><span class="cx"> </span>
</span><span class="cx">
</span><span class="lines">@@ -275,7 +275,7 @@
</span><span class="cx"> <div class="widgets-holder-wrap">
</span><span class="cx"> <div class="sidebar-name">
</span><span class="cx"> <div class="sidebar-name-arrow"></div>
</span><del>- <h3>Menu Selector</h3>
</del><ins>+ <h3><?php esc_html_e('Menu Selector'); ?></h3>
</ins><span class="cx"> </div>
</span><span class="cx"> <div class="widget-holder">
</span><span class="cx"> <select id="menu_select" name="menu_select">
</span><span class="lines">@@ -296,9 +296,9 @@
</span><span class="cx"> ?>
</span><span class="cx"> </select>
</span><span class="cx">
</span><del>- <input id="switch_menu" type="submit" value="Switch" name="switch_menu" class="button" />
</del><ins>+ <input id="switch_menu" type="submit" value="<?php esc_attr_e('Switch'); ?>" name="switch_menu" class="button" />
</ins><span class="cx"> <input id="add_menu_name" name="add_menu_name" type="text" value="" />
</span><del>- <input id="add_menu" type="submit" value="Add Menu" name="add_menu" class="button" />
</del><ins>+ <input id="add_menu" type="submit" value="<?php esc_attr_e('Add Menu'); ?>" name="add_menu" class="button" />
</ins><span class="cx">
</span><span class="cx"> <div class="fix"></div>
</span><span class="cx"> </div>
</span><span class="lines">@@ -307,47 +307,40 @@
</span><span class="cx"> <div class="widgets-holder-wrap" style="display:none;">
</span><span class="cx"> <div class="sidebar-name">
</span><span class="cx"> <div class="sidebar-name-arrow"></div>
</span><del>- <h3>Top Level Menu Descriptions</h3>
</del><ins>+ <h3><?php esc_html_e('Top Level Menu Descriptions'); ?></h3>
</ins><span class="cx"> </div>
</span><span class="cx"> <div class="widget-holder">
</span><del>- <span>Display Descriptions in Top Level Menu?</span>
</del><ins>+ <span><?php _e('Display Descriptions in Top Level Menu?'); ?></span>
</ins><span class="cx">
</span><span class="cx"> <?php
</span><span class="cx">
</span><span class="cx"> //UPDATE and DISPLAY Menu Description Option
</span><del>- if (isset($_POST['menu-descriptions']))
- {
</del><ins>+ if ( isset($_POST['menu-descriptions']) ) {
</ins><span class="cx">
</span><del>- if (isset($_POST['switch_menu'])) {
</del><ins>+ if ( isset($_POST['switch_menu']) ) {
</ins><span class="cx">
</span><del>- }
- else {
</del><ins>+ } else {
</ins><span class="cx"> $menu_options_to_edit = $_POST['menu_id_in_edit'];
</span><span class="cx"> update_option('wp_settings_custom_nav_'.$menu_options_to_edit.'_descriptions',$_POST['menu-descriptions']);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ($menu_id_in_edit > 0)
- {
</del><ins>+ if ( $menu_id_in_edit > 0 )
</ins><span class="cx"> $checkedraw = get_option('wp_settings_custom_nav_'.$menu_id_in_edit.'_descriptions');
</span><del>- }
- else {
</del><ins>+ else
</ins><span class="cx"> $checkedraw = get_option('wp_settings_custom_nav_'.$menu_selected_id.'_descriptions');
</span><del>- }
</del><span class="cx">
</span><span class="cx"> $checked = strtolower($checkedraw);
</span><span class="cx">
</span><del>- if ($advanced_option_descriptions == 'no')
- {
</del><ins>+ if ( $advanced_option_descriptions == 'no' )
</ins><span class="cx"> $checked = 'no';
</span><del>- }
</del><span class="cx">
</span><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> <span class="checkboxes">
</span><del>- <label>Yes</label><input type="radio" name="menu-descriptions" value="yes" <?php if ($checked=='yes') { echo 'checked="checked"'; } ?> />
- <label>No</label><input type="radio" name="menu-descriptions" value="no" <?php if ($checked=='yes') { } else { echo 'checked="checked"'; } ?> />
</del><ins>+ <label><?php _e('Yes'); ?></label><input type="radio" name="menu-descriptions" value="yes" <?php if ($checked=='yes') { echo 'checked="checked"'; } ?> />
+ <label><?php _e('No'); ?></label><input type="radio" name="menu-descriptions" value="no" <?php if ($checked=='yes') { } else { echo 'checked="checked"'; } ?> />
</ins><span class="cx"> </span><!-- /.checkboxes -->
</span><span class="cx"> </form>
</span><span class="cx"> <div class="fix"></div>
</span><span class="lines">@@ -357,7 +350,7 @@
</span><span class="cx"> <div class="widgets-holder-wrap">
</span><span class="cx"> <div class="sidebar-name">
</span><span class="cx"> <div class="sidebar-name-arrow"></div>
</span><del>- <h3>Add an Existing Page</h3>
</del><ins>+ <h3><?php esc_html_e('Add an Existing Page'); ?></h3>
</ins><span class="cx"> </div>
</span><span class="cx"> <div class="widget-holder">
</span><span class="cx">
</span><span class="lines">@@ -382,16 +375,12 @@
</span><span class="cx"> $pages_array = get_pages($pages_args);
</span><span class="cx"> $page_name = '';
</span><span class="cx"> //CHECK if pages exist
</span><del>- if ($pages_array)
- {
- foreach ($pages_array as $post)
- {
</del><ins>+ if ( $pages_array ) {
+ foreach ( $pages_array as $post ) {
</ins><span class="cx"> //Add page name to
</span><span class="cx"> $page_name .= htmlentities($post->post_title).'|';
</span><span class="cx"> }
</span><del>- }
- else
- {
</del><ins>+ } else {
</ins><span class="cx"> $page_name = "No pages available";
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -447,23 +436,22 @@
</span><span class="cx"> <div class="widgets-holder-wrap">
</span><span class="cx"> <div class="sidebar-name">
</span><span class="cx"> <div class="sidebar-name-arrow"></div>
</span><del>- <h3>Add an Existing Category</h3>
</del><ins>+ <h3><?php esc_html_e('Add an Existing Category'); ?></h3>
</ins><span class="cx"> </div>
</span><span class="cx"> <div class="widget-holder">
</span><span class="cx">
</span><span class="cx"> <?php
</span><span class="cx">
</span><del>- //Custom GET categories query
</del><ins>+ // Custom GET categories query
+ // @todo Use API
</ins><span class="cx"> $categories = $wpdb->get_results("SELECT term_id FROM $wpdb->term_taxonomy WHERE taxonomy = 'category' ORDER BY term_id ASC");
</span><span class="cx"> $cat_name = '';
</span><span class="cx"> //CHECK for results
</span><del>- if ($categories)
- {
- foreach($categories as $category)
- {
</del><ins>+ if ( $categories ) {
+ foreach( $categories as $category ) {
</ins><span class="cx"> $cat_id = $category->term_id;
</span><span class="cx">
</span><del>- $cat_args=array(
</del><ins>+ $cat_args = array(
</ins><span class="cx"> 'orderby' => 'name',
</span><span class="cx"> 'include' => $cat_id,
</span><span class="cx"> 'hierarchical' => 1,
</span><span class="lines">@@ -472,15 +460,12 @@
</span><span class="cx">
</span><span class="cx"> $category_names=get_categories($cat_args);
</span><span class="cx">
</span><del>- if (isset($category_names[0]->name))
- {
- //Add category name to data string
</del><ins>+ if ( isset($category_names[0]->name) ) {
+ // Add category name to data string
</ins><span class="cx"> $cat_name .= htmlentities($category_names[0]->name).'|';
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- }
- else
- {
</del><ins>+ } else {
</ins><span class="cx"> $cat_name = "No categories available";
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -509,9 +494,8 @@
</span><span class="cx"> });
</span><span class="cx"> </script>
</span><span class="cx">
</span><ins>+ <input type="text" onfocus="jQuery('#cat-search').attr('value','');" id="cat-search" value="<?php esc_attr_e('Search Categories'); ?>" />
</ins><span class="cx">
</span><del>- <input type="text" onfocus="jQuery('#cat-search').attr('value','');" id="cat-search" value="Search Categories" />
-
</del><span class="cx"> <a id="show-cats" style="cursor:pointer;" onclick="jQuery('#existing-categories').css('display','block');jQuery('#cat-search').attr('value','');jQuery('#existing-categories dt').css('display','block');jQuery('#show-cats').hide();jQuery('#hide-cats').show();">View All</a>
</span><span class="cx"> <a id="hide-cats" style="cursor:pointer;" onclick="jQuery('#existing-categories').css('display','none');jQuery('#cat-search').attr('value','Search Categories');jQuery('#existing-categories dt').css('display','none');jQuery('#show-cats').show();jQuery('#hide-cats').hide();">Hide All</a>
</span><span class="cx">
</span><span class="lines">@@ -536,13 +520,13 @@
</span><span class="cx"> <div class="widgets-holder-wrap">
</span><span class="cx"> <div class="sidebar-name">
</span><span class="cx"> <div class="sidebar-name-arrow"></div>
</span><del>- <h3>Add a Custom Url</h3>
</del><ins>+ <h3><?php esc_html_e('Add a Custom Url'); ?></h3>
</ins><span class="cx"> </div>
</span><span class="cx"> <div class="widget-holder">
</span><span class="cx"> <input id="custom_menu_item_url" type="text" value="http://" />
</span><del>- <label>URL</label><br />
</del><ins>+ <label><?php _e('URL'); ?></label><br />
</ins><span class="cx"> <?php $templatedir = get_bloginfo('url'); ?>
</span><del>- <input type="hidden" id="templatedir" value="<?php echo $templatedir; ?>" />
</del><ins>+ <input type="hidden" id="templatedir" value="<?php echo esc_attr($templatedir); ?>" />
</ins><span class="cx"> <input id="custom_menu_item_name" type="text" value="Menu Item" onfocus="jQuery('#custom_menu_item_name').attr('value','');" />
</span><span class="cx"> <label>Menu Text</label><br />
</span><span class="cx"> <input id="custom_menu_item_description" type="text" value="A description" <?php if ($advanced_option_descriptions == 'no') { ?>style="display:none;"<?php } ?> onfocus="jQuery('#custom_menu_item_description').attr('value','');" />
</span></span></pre>
</div>
</div>
</body>
</html>