<!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>[16191] trunk: Translate and prettify post formats for display.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16191">16191</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2010-11-04 18:33:50 +0000 (Thu, 04 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Translate and prettify post formats for display. Also, filterable by themes/plugins to add new ones. see <a href="http://trac.wordpress.org/ticket/14746">#14746</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesmetaboxesphp">trunk/wp-admin/includes/meta-boxes.php</a></li>
<li><a href="#trunkwpincludespostphp">trunk/wp-includes/post.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesmetaboxesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/meta-boxes.php (16190 => 16191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/meta-boxes.php        2010-11-04 18:28:58 UTC (rev 16190)
+++ trunk/wp-admin/includes/meta-boxes.php        2010-11-04 18:33:50 UTC (rev 16191)
</span><span class="lines">@@ -158,11 +158,13 @@
</span><span class="cx"> if ( 'post' == $post->post_type && current_theme_supports( 'post-formats' ) ) :
</span><span class="cx"> $post_formats = get_theme_support( 'post-formats' );
</span><span class="cx">
</span><ins>+$post_formats_display = get_post_format_strings();
+
</ins><span class="cx"> if ( is_array( $post_formats[0] ) ) :
</span><span class="cx">         $post_format = get_post_format( $post->ID );
</span><span class="cx">         if ( !$post_format )
</span><span class="cx">                 $post_format = '0';
</span><del>-        $post_format_display = ( $post_format ) ? $post_format : __('Default');
</del><ins>+        $post_format_display = $post_formats_display[$post_format];
</ins><span class="cx"> ?>
</span><span class="cx"> <div class="misc-pub-section" id="post-formats"><label for="post-format"><?php _e( 'Format:' ); ?></label>
</span><span class="cx">
</span><span class="lines">@@ -173,7 +175,7 @@
</span><span class="cx"> <select id="post-format" name="post_format">
</span><span class="cx">         <option value="0" <?php selected( $post_format, '0' ); ?>><?php _e('Default'); ?></option>
</span><span class="cx">         <?php foreach ( $post_formats[0] as $format ) : ?>
</span><del>-        <option value="<?php echo esc_attr( $format ); ?>" <?php selected( $post_format, $format ); ?>><?php echo esc_html( $format ); ?></option>
</del><ins>+        <option value="<?php echo esc_attr( $format ); ?>" <?php selected( $post_format, $format ); ?>><?php echo esc_html( $post_formats_display[$format] ); ?></option>
</ins><span class="cx">         <?php endforeach; ?>
</span><span class="cx"> </select>
</span><span class="cx">          <a href="#post-formats" class="save-post-format hide-if-no-js button"><?php _e('OK'); ?></a>
</span></span></pre></div>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (16190 => 16191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php        2010-11-04 18:28:58 UTC (rev 16190)
+++ trunk/wp-includes/post.php        2010-11-04 18:33:50 UTC (rev 16191)
</span><span class="lines">@@ -5212,4 +5212,24 @@
</span><span class="cx">         endif;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * Returns an array of post format slugs to their translated and pretty display versions
+ *
+ * @return array The array of translations
+ */
+function get_post_format_strings() {
+        $strings = array(
+                '0' => _x( 'Default', 'Post format' ),
+                'aside' => _x( 'Aside', 'Post format' ),
+                'chat' => _x( 'Chat', 'Post format' ),
+                'gallery' => _x( 'Gallery', 'Post format' ),
+                'link' => _x( 'Link', 'Post format' ),
+                'image' => _x( 'Image', 'Post format' ),
+                'quote' => _x( 'Quote', 'Post format' ),
+                'status' => _x( 'Status', 'Post format' ),
+                'video' => _x( 'Video', 'Post format' )
+        );
+        return apply_filters( 'post_format_strings', $strings );
+}
+
</ins><span class="cx"> ?>
</span></span></pre>
</div>
</div>
</body>
</html>