<!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" />
<title>[758] sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types: WordCamp Post Types: Use actual string for text domain.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://meta.trac.wordpress.org/changeset/758">758</a></dd>
<dt>Author</dt> <dd>iandunn</dd>
<dt>Date</dt> <dd>2014-07-23 18:52:58 +0000 (Wed, 23 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>WordCamp Post Types: Use actual string for text domain.
Variables cannot be used for text domains because gettext runs outside of PHP.
See http://markjaquith.wordpress.com/2011/10/06/translating-wordpress-plugins-and-themes-dont-get-clever/</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswcposttypesincbackcompatphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/inc/back-compat.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswcposttypesincwidgetsphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/inc/widgets.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswcposttypeswcposttypesphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/wc-post-types.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswcposttypesincbackcompatphp"></a>
<div class="modfile"><h4>Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/inc/back-compat.php (757 => 758)</h4>
<pre class="diff"><span>
<span class="info">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/inc/back-compat.php 2014-07-22 18:13:52 UTC (rev 757)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/inc/back-compat.php 2014-07-23 18:52:58 UTC (rev 758)
</span><span class="lines">@@ -6,7 +6,6 @@
</span><span class="cx"> * and hooking its owr callbacks.
</span><span class="cx"> */
</span><span class="cx"> class WordCamp_Post_Types_Plugin_Back_Compat {
</span><del>- protected $textdomain = '';
</del><span class="cx"> protected $stylesheet = '';
</span><span class="cx">
</span><span class="cx"> function __construct() {
</span><span class="lines">@@ -38,8 +37,7 @@
</span><span class="cx"> function wcpt_back_compat_init() {
</span><span class="cx"> global $wcpt_plugin;
</span><span class="cx">
</span><del>- // Keep the textdomain and keep a link to the main plugin object.
- $this->textdomain = $wcpt_plugin->textdomain;
</del><ins>+ // Keep a link to the main plugin object.
</ins><span class="cx"> $this->wcpt =& $wcpt_plugin;
</span><span class="cx">
</span><span class="cx"> add_filter( 'wcb_entry_meta', array( $this, 'wcb_session_entry_meta' ) );
</span><span class="lines">@@ -177,10 +175,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( ! empty( $speakers ) )
</span><del>- $meta['speakers'] = sprintf( __( 'Presented by %s', $this->textdomain ), esc_html( $speakers ) );
</del><ins>+ $meta['speakers'] = sprintf( __( 'Presented by %s', 'wordcamporg' ), esc_html( $speakers ) );
</ins><span class="cx">
</span><span class="cx"> if ( ! empty( $track ) )
</span><del>- $meta['track'] = sprintf( __( '%s Track', $this->textdomain ), esc_html( $track ) );
</del><ins>+ $meta['track'] = sprintf( __( '%s Track', 'wordcamporg' ), esc_html( $track ) );
</ins><span class="cx">
</span><span class="cx"> $track_url = get_term_link( $track, 'wcb_track' );
</span><span class="cx"> if ( ! is_wp_error( $track_url ) )
</span><span class="lines">@@ -318,10 +316,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( ! empty( $speakers ) )
</span><del>- $meta['speakers'] = sprintf( __( 'Presented by %s', $this->textdomain ), esc_html( $speakers ) );
</del><ins>+ $meta['speakers'] = sprintf( __( 'Presented by %s', 'wordcamporg' ), esc_html( $speakers ) );
</ins><span class="cx">
</span><span class="cx"> if ( ! empty( $track ) )
</span><del>- $meta['track'] = sprintf( __( '%s Track', $this->textdomain ), esc_html( $track ) );
</del><ins>+ $meta['track'] = sprintf( __( '%s Track', 'wordcamporg' ), esc_html( $track ) );
</ins><span class="cx">
</span><span class="cx"> $track_url = get_term_link( $track, 'wcb_track' );
</span><span class="cx"> if ( ! is_wp_error( $track_url ) )
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswcposttypesincwidgetsphp"></a>
<div class="modfile"><h4>Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/inc/widgets.php (757 => 758)</h4>
<pre class="diff"><span>
<span class="info">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/inc/widgets.php 2014-07-22 18:13:52 UTC (rev 757)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/inc/widgets.php 2014-07-23 18:52:58 UTC (rev 758)
</span><span class="lines">@@ -11,17 +11,12 @@
</span><span class="cx"> */
</span><span class="cx"> class WCB_Widget_Sponsors extends WP_Widget {
</span><span class="cx">
</span><del>- protected $textdomain = ''; // @see __construct()
-
</del><span class="cx"> function __construct() {
</span><del>- global $wcpt_plugin;
- $this->textdomain = $wcpt_plugin->textdomain;
-
</del><span class="cx"> $widget_ops = array(
</span><span class="cx"> 'classname' => 'wcb_widget_sponsors',
</span><del>- 'description' => __( 'Your WordCamp’s Sponsors', $this->textdomain ),
</del><ins>+ 'description' => __( 'Your WordCamp’s Sponsors', 'wordcamporg' ),
</ins><span class="cx"> );
</span><del>- $this->WP_Widget( 'wcb_sponsors', __( 'Sponsors', $this->textdomain ), $widget_ops );
</del><ins>+ $this->WP_Widget( 'wcb_sponsors', __( 'Sponsors', 'wordcamporg' ), $widget_ops );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function widget( $args, $instance ) {
</span><span class="lines">@@ -86,7 +81,7 @@
</span><span class="cx"> $instance = wp_parse_args( (array) $instance, array( 'title' => '' ) );
</span><span class="cx"> $title = $instance['title'];
</span><span class="cx"> ?>
</span><del>- <p><label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php _e( 'Title:', $this->textdomain ); ?> <input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo esc_attr( $title ); ?>" /></label></p>
</del><ins>+ <p><label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php _e( 'Title:', 'wordcamporg' ); ?> <input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo esc_attr( $title ); ?>" /></label></p>
</ins><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -110,18 +105,14 @@
</span><span class="cx"> */
</span><span class="cx"> class WCPT_Widget_Speakers extends WP_Widget {
</span><span class="cx">
</span><del>- protected $textdomain = ''; // @see __construct()
</del><span class="cx"> protected $cache_time = 3600; // seconds
</span><span class="cx">
</span><span class="cx"> function __construct() {
</span><del>- global $wcpt_plugin;
- $this->textdomain = $wcpt_plugin->textdomain;
-
</del><span class="cx"> $widget_ops = array(
</span><span class="cx"> 'classname' => 'wcpt_widget_speakers',
</span><del>- 'description' => __( 'Your WordCamp’s Speakers', $this->textdomain ),
</del><ins>+ 'description' => __( 'Your WordCamp’s Speakers', 'wordcamporg' ),
</ins><span class="cx"> );
</span><del>- $this->WP_Widget( 'wcpt_speakers', __( 'Speakers', $this->textdomain ), $widget_ops );
</del><ins>+ $this->WP_Widget( 'wcpt_speakers', __( 'Speakers', 'wordcamporg' ), $widget_ops );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function widget( $args, $instance ) {
</span><span class="lines">@@ -159,7 +150,7 @@
</span><span class="cx">
</span><span class="cx"> $speakers_permalink = $wcpt_plugin->get_speakers_permalink();
</span><span class="cx"> if ( ! empty( $speakers_permalink ) )
</span><del>- printf( '<a class="wcpt-speakers-link" href="%s">%s</a>', esc_url( $speakers_permalink ), esc_html( __( 'View all speakers →', $this->textdomain ) ) );
</del><ins>+ printf( '<a class="wcpt-speakers-link" href="%s">%s</a>', esc_url( $speakers_permalink ), esc_html( __( 'View all speakers →', 'wordcamporg' ) ) );
</ins><span class="cx">
</span><span class="cx"> echo $args['after_widget'];
</span><span class="cx">
</span><span class="lines">@@ -177,11 +168,11 @@
</span><span class="cx"> $count = absint( $instance['count'] );
</span><span class="cx"> $random = (bool) $instance['random'];
</span><span class="cx"> ?>
</span><del>- <p><label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php _e( 'Title:', $this->textdomain ); ?> <input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo esc_attr( $title ); ?>" /></label></p>
- <p><label for="<?php echo $this->get_field_id( 'count' ); ?>"><?php _e( 'Number of speakers to show:', $this->textdomain ); ?> <input type="text" size="3" id="<?php echo $this->get_field_id( 'count' ); ?>" name="<?php echo $this->get_field_name( 'count' ); ?>" value="<?php echo esc_attr( $count ); ?>" /></label></p>
</del><ins>+ <p><label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php _e( 'Title:', 'wordcamporg' ); ?> <input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo esc_attr( $title ); ?>" /></label></p>
+ <p><label for="<?php echo $this->get_field_id( 'count' ); ?>"><?php _e( 'Number of speakers to show:', 'wordcamporg' ); ?> <input type="text" size="3" id="<?php echo $this->get_field_id( 'count' ); ?>" name="<?php echo $this->get_field_name( 'count' ); ?>" value="<?php echo esc_attr( $count ); ?>" /></label></p>
</ins><span class="cx"> <p>
</span><span class="cx"> <input class="checkbox" type="checkbox" id="<?php echo $this->get_field_id( 'random' ); ?>" name="<?php echo $this->get_field_name( 'random' ); ?>" <?php checked( $random ); ?> />
</span><del>- <label for="<?php echo $this->get_field_id( 'random' ); ?>"><?php _e( 'Display in random order', $this->textdomain ); ?></label>
</del><ins>+ <label for="<?php echo $this->get_field_id( 'random' ); ?>"><?php _e( 'Display in random order', 'wordcamporg' ); ?></label>
</ins><span class="cx"> </p>
</span><span class="cx">
</span><span class="cx"> <?php
</span><span class="lines">@@ -216,18 +207,14 @@
</span><span class="cx"> */
</span><span class="cx"> class WCPT_Widget_Sessions extends WP_Widget {
</span><span class="cx">
</span><del>- protected $textdomain = ''; // @see __construct()
</del><span class="cx"> protected $cache_time = 3600; // seconds
</span><span class="cx">
</span><span class="cx"> function __construct() {
</span><del>- global $wcpt_plugin;
- $this->textdomain = $wcpt_plugin->textdomain;
-
</del><span class="cx"> $widget_ops = array(
</span><span class="cx"> 'classname' => 'wcpt_widget_sessions',
</span><del>- 'description' => __( 'Show off your WordCamp sessions', $this->textdomain ),
</del><ins>+ 'description' => __( 'Show off your WordCamp sessions', 'wordcamporg' ),
</ins><span class="cx"> );
</span><del>- $this->WP_Widget( 'wcpt_sessions', __( 'Sessions', $this->textdomain ), $widget_ops );
</del><ins>+ $this->WP_Widget( 'wcpt_sessions', __( 'Sessions', 'wordcamporg' ), $widget_ops );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function widget( $args, $instance ) {
</span><span class="lines">@@ -269,7 +256,7 @@
</span><span class="cx">
</span><span class="cx"> $sessions_permalink = $wcpt_plugin->get_sessions_permalink();
</span><span class="cx"> if ( ! empty( $sessions_permalink ) )
</span><del>- printf( '<a class="wcpt-sessions-link" href="%s">%s</a>', esc_url( $sessions_permalink ), esc_html( __( 'View all sessions →', $this->textdomain ) ) );
</del><ins>+ printf( '<a class="wcpt-sessions-link" href="%s">%s</a>', esc_url( $sessions_permalink ), esc_html( __( 'View all sessions →', 'wordcamporg' ) ) );
</ins><span class="cx">
</span><span class="cx"> echo $args['after_widget'];
</span><span class="cx">
</span><span class="lines">@@ -287,11 +274,11 @@
</span><span class="cx"> $count = absint( $instance['count'] );
</span><span class="cx"> $random = (bool) $instance['random'];
</span><span class="cx"> ?>
</span><del>- <p><label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php _e( 'Title:', $this->textdomain ); ?> <input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo esc_attr( $title ); ?>" /></label></p>
- <p><label for="<?php echo $this->get_field_id( 'count' ); ?>"><?php _e( 'Number of speakers to show:', $this->textdomain ); ?> <input type="text" size="3" id="<?php echo $this->get_field_id( 'count' ); ?>" name="<?php echo $this->get_field_name( 'count' ); ?>" value="<?php echo esc_attr( $count ); ?>" /></label></p>
</del><ins>+ <p><label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php _e( 'Title:', 'wordcamporg' ); ?> <input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo esc_attr( $title ); ?>" /></label></p>
+ <p><label for="<?php echo $this->get_field_id( 'count' ); ?>"><?php _e( 'Number of speakers to show:', 'wordcamporg' ); ?> <input type="text" size="3" id="<?php echo $this->get_field_id( 'count' ); ?>" name="<?php echo $this->get_field_name( 'count' ); ?>" value="<?php echo esc_attr( $count ); ?>" /></label></p>
</ins><span class="cx"> <p>
</span><span class="cx"> <input class="checkbox" type="checkbox" id="<?php echo $this->get_field_id( 'random' ); ?>" name="<?php echo $this->get_field_name( 'random' ); ?>" <?php checked( $random ); ?> />
</span><del>- <label for="<?php echo $this->get_field_id( 'random' ); ?>"><?php _e( 'Display in random order', $this->textdomain ); ?></label>
</del><ins>+ <label for="<?php echo $this->get_field_id( 'random' ); ?>"><?php _e( 'Display in random order', 'wordcamporg' ); ?></label>
</ins><span class="cx"> </p>
</span><span class="cx">
</span><span class="cx"> <?php
</span><span class="lines">@@ -325,19 +312,14 @@
</span><span class="cx"> * @see WordCamp_Post_Types_Plugin->shortcode_organizers()
</span><span class="cx"> */
</span><span class="cx"> class WCPT_Widget_Organizers extends WP_Widget {
</span><del>-
- protected $textdomain = ''; // @see __construct()
</del><span class="cx"> protected $cache_time = 3600; // seconds
</span><span class="cx">
</span><span class="cx"> function __construct() {
</span><del>- global $wcpt_plugin;
- $this->textdomain = $wcpt_plugin->textdomain;
-
</del><span class="cx"> $widget_ops = array(
</span><span class="cx"> 'classname' => 'wcpt_widget_organizers',
</span><del>- 'description' => __( 'Display your organizing team in the sidebar', $this->textdomain ),
</del><ins>+ 'description' => __( 'Display your organizing team in the sidebar', 'wordcamporg' ),
</ins><span class="cx"> );
</span><del>- $this->WP_Widget( 'wcpt_organizers', __( 'Organizers', $this->textdomain ), $widget_ops );
</del><ins>+ $this->WP_Widget( 'wcpt_organizers', __( 'Organizers', 'wordcamporg' ), $widget_ops );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function widget( $args, $instance ) {
</span><span class="lines">@@ -375,7 +357,7 @@
</span><span class="cx">
</span><span class="cx"> $organizers_permalink = $wcpt_plugin->get_organizers_permalink();
</span><span class="cx"> if ( ! empty( $organizers_permalink ) )
</span><del>- printf( '<a class="wcpt-organizers-link" href="%s">%s</a>', esc_url( $organizers_permalink ), esc_html( __( 'Organizing team →', $this->textdomain ) ) );
</del><ins>+ printf( '<a class="wcpt-organizers-link" href="%s">%s</a>', esc_url( $organizers_permalink ), esc_html( __( 'Organizing team →', 'wordcamporg' ) ) );
</ins><span class="cx">
</span><span class="cx"> echo $args['after_widget'];
</span><span class="cx">
</span><span class="lines">@@ -393,11 +375,11 @@
</span><span class="cx"> $count = absint( $instance['count'] );
</span><span class="cx"> $random = (bool) $instance['random'];
</span><span class="cx"> ?>
</span><del>- <p><label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php _e( 'Title:', $this->textdomain ); ?> <input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo esc_attr( $title ); ?>" /></label></p>
- <p><label for="<?php echo $this->get_field_id( 'count' ); ?>"><?php _e( 'Number of organizers to show:', $this->textdomain ); ?> <input type="text" size="3" id="<?php echo $this->get_field_id( 'count' ); ?>" name="<?php echo $this->get_field_name( 'count' ); ?>" value="<?php echo esc_attr( $count ); ?>" /></label></p>
</del><ins>+ <p><label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php _e( 'Title:', 'wordcamporg' ); ?> <input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo esc_attr( $title ); ?>" /></label></p>
+ <p><label for="<?php echo $this->get_field_id( 'count' ); ?>"><?php _e( 'Number of organizers to show:', 'wordcamporg' ); ?> <input type="text" size="3" id="<?php echo $this->get_field_id( 'count' ); ?>" name="<?php echo $this->get_field_name( 'count' ); ?>" value="<?php echo esc_attr( $count ); ?>" /></label></p>
</ins><span class="cx"> <p>
</span><span class="cx"> <input class="checkbox" type="checkbox" id="<?php echo $this->get_field_id( 'random' ); ?>" name="<?php echo $this->get_field_name( 'random' ); ?>" <?php checked( $random ); ?> />
</span><del>- <label for="<?php echo $this->get_field_id( 'random' ); ?>"><?php _e( 'Display in random order', $this->textdomain ); ?></label>
</del><ins>+ <label for="<?php echo $this->get_field_id( 'random' ); ?>"><?php _e( 'Display in random order', 'wordcamporg' ); ?></label>
</ins><span class="cx"> </p>
</span><span class="cx">
</span><span class="cx"> <?php
</span><span class="lines">@@ -420,4 +402,4 @@
</span><span class="cx"> delete_transient( $transient_key );
</span><span class="cx"> return $instance;
</span><span class="cx"> }
</span><del>-}
</del><span class="cx">\ No newline at end of file
</span><ins>+}
</ins></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswcposttypeswcposttypesphp"></a>
<div class="modfile"><h4>Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/wc-post-types.php (757 => 758)</h4>
<pre class="diff"><span>
<span class="info">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/wc-post-types.php 2014-07-22 18:13:52 UTC (rev 757)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/wc-post-types.php 2014-07-23 18:52:58 UTC (rev 758)
</span><span class="lines">@@ -7,7 +7,6 @@
</span><span class="cx"> require( 'inc/back-compat.php' );
</span><span class="cx">
</span><span class="cx"> class WordCamp_Post_Types_Plugin {
</span><del>- public $textdomain = 'wordcampbase';
</del><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Fired when plugin file is loaded.
</span><span class="lines">@@ -63,7 +62,7 @@
</span><span class="cx"> * Runs during admin_menu
</span><span class="cx"> */
</span><span class="cx"> function admin_menu() {
</span><del>- $page = add_submenu_page( 'edit.php?post_type=wcb_sponsor', __( 'Order Sponsor Levels', $this->textdomain ), __( 'Order Sponsor Levels', $this->textdomain ), 'edit_posts', 'sponsor_levels', array( $this, 'render_order_sponsor_levels' ) );
</del><ins>+ $page = add_submenu_page( 'edit.php?post_type=wcb_sponsor', __( 'Order Sponsor Levels', 'wordcamporg' ), __( 'Order Sponsor Levels', 'wordcamporg' ), 'edit_posts', 'sponsor_levels', array( $this, 'render_order_sponsor_levels' ) );
</ins><span class="cx">
</span><span class="cx"> add_action( "admin_print_scripts-$page", array( $this, 'enqueue_order_sponsor_levels_scripts' ) );
</span><span class="cx"> }
</span><span class="lines">@@ -87,16 +86,16 @@
</span><span class="cx"> ?>
</span><span class="cx"> <div class="wrap">
</span><span class="cx"> <?php screen_icon(); ?>
</span><del>- <h2><?php _e( 'Order Sponsor Levels', $this->textdomain ); ?></h2>
</del><ins>+ <h2><?php _e( 'Order Sponsor Levels', 'wordcamporg' ); ?></h2>
</ins><span class="cx">
</span><span class="cx"> <?php if ( false !== $_REQUEST['updated'] ) : ?>
</span><del>- <div class="updated fade"><p><strong><?php _e( 'Options saved', $this->textdomain ); ?></strong></p></div>
</del><ins>+ <div class="updated fade"><p><strong><?php _e( 'Options saved', 'wordcamporg' ); ?></strong></p></div>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> <form method="post" action="options.php">
</span><span class="cx"> <?php settings_fields( 'wcb_sponsor_options' ); ?>
</span><span class="cx"> <div class="description sponsor-order-instructions">
</span><del>- <?php _e( 'Change the order of sponsor levels are displayed in the sponsors page template.', $this->textdomain ); ?>
</del><ins>+ <?php _e( 'Change the order of sponsor levels are displayed in the sponsors page template.', 'wordcamporg' ); ?>
</ins><span class="cx"> </div>
</span><span class="cx"> <ul class="sponsor-order">
</span><span class="cx"> <?php foreach( $levels as $term ): ?>
</span><span class="lines">@@ -107,7 +106,7 @@
</span><span class="cx"> <?php endforeach; ?>
</span><span class="cx"> </ul>
</span><span class="cx"> <p class="submit">
</span><del>- <input type="submit" class="button-primary" value="<?php _e( 'Save Options', $this->textdomain ); ?>" />
</del><ins>+ <input type="submit" class="button-primary" value="<?php _e( 'Save Options', 'wordcamporg' ); ?>" />
</ins><span class="cx"> </p>
</span><span class="cx"> </form>
</span><span class="cx"> </div>
</span><span class="lines">@@ -852,11 +851,11 @@
</span><span class="cx">
</span><span class="cx"> // Add speakers and tracks to session meta.
</span><span class="cx"> if ( ! empty( $speakers_names ) && ! empty( $tracks_names ) )
</span><del>- $session_meta .= sprintf( __( 'Presented by %1$s in %2$s.', $this->textdomain ), implode( ', ', $speakers_names ), implode( ', ', $tracks_names ) );
</del><ins>+ $session_meta .= sprintf( __( 'Presented by %1$s in %2$s.', 'wordcamporg' ), implode( ', ', $speakers_names ), implode( ', ', $tracks_names ) );
</ins><span class="cx"> elseif ( ! empty( $speakers_names ) )
</span><del>- $session_meta .= sprintf( __( 'Presented by %s.', $this->textdomain ), implode( ', ', $speakers_names ) );
</del><ins>+ $session_meta .= sprintf( __( 'Presented by %s.', 'wordcamporg' ), implode( ', ', $speakers_names ) );
</ins><span class="cx"> elseif ( ! empty( $tracks_names ) )
</span><del>- $session_meta .= sprintf( __( 'Presented in %s.', $this->textdomain ), implode( ', ', $tracks_names ) );
</del><ins>+ $session_meta .= sprintf( __( 'Presented in %s.', 'wordcamporg' ), implode( ', ', $tracks_names ) );
</ins><span class="cx">
</span><span class="cx"> if ( ! empty( $session_meta ) )
</span><span class="cx"> $session_meta = sprintf( '<p class="wcpt-session-meta">%s</p>', $session_meta );
</span><span class="lines">@@ -956,10 +955,10 @@
</span><span class="cx"> * Fired during add_meta_boxes, adds extra meta boxes to our custom post types.
</span><span class="cx"> */
</span><span class="cx"> function add_meta_boxes() {
</span><del>- add_meta_box( 'speaker-info', __( 'Speaker Info', $this->textdomain ), array( $this, 'metabox_speaker_info' ), 'wcb_speaker', 'side' );
- add_meta_box( 'organizer-info', __( 'Organizer Info', $this->textdomain ), array( $this, 'metabox_organizer_info' ), 'wcb_organizer', 'side' );
- add_meta_box( 'speakers-list', __( 'Speakers', $this->textdomain ), array( $this, 'metabox_speakers_list' ), 'wcb_session', 'side' );
- add_meta_box( 'session-info', __( 'Session Info', $this->textdomain ), array( $this, 'metabox_session_info' ), 'wcb_session', 'side' );
</del><ins>+ add_meta_box( 'speaker-info', __( 'Speaker Info', 'wordcamporg' ), array( $this, 'metabox_speaker_info' ), 'wcb_speaker', 'side' );
+ add_meta_box( 'organizer-info', __( 'Organizer Info', 'wordcamporg' ), array( $this, 'metabox_organizer_info' ), 'wcb_organizer', 'side' );
+ add_meta_box( 'speakers-list', __( 'Speakers', 'wordcamporg' ), array( $this, 'metabox_speakers_list' ), 'wcb_session', 'side' );
+ add_meta_box( 'session-info', __( 'Session Info', 'wordcamporg' ), array( $this, 'metabox_session_info' ), 'wcb_session', 'side' );
</ins><span class="cx"> add_meta_box( 'sponsor-info', __( 'Sponsor Info', 'wordcampbase' ), array( $this, 'metabox_sponsor_info' ), 'wcb_sponsor', 'side' );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -978,12 +977,12 @@
</span><span class="cx"> ?>
</span><span class="cx"> <?php wp_nonce_field( 'edit-speaker-info', 'wcpt-meta-speaker-info' ); ?>
</span><span class="cx"> <p>
</span><del>- <label for="wcpt-gravatar-email"><?php _e( 'Gravatar Email:', $this->textdomain ); ?></label>
</del><ins>+ <label for="wcpt-gravatar-email"><?php _e( 'Gravatar Email:', 'wordcamporg' ); ?></label>
</ins><span class="cx"> <input type="text" class="widefat" id="wcpt-gravatar-email" name="wcpt-gravatar-email" value="<?php echo esc_attr( $email ); ?>" />
</span><span class="cx"> </p>
</span><span class="cx">
</span><span class="cx"> <p>
</span><del>- <label for="wcpt-wporg-username"><?php _e( 'WordPress.org Username:', $this->textdomain ); ?></label>
</del><ins>+ <label for="wcpt-wporg-username"><?php _e( 'WordPress.org Username:', 'wordcamporg' ); ?></label>
</ins><span class="cx"> <input type="text" class="widefat" id="wcpt-wporg-username" name="wcpt-wporg-username" value="<?php echo esc_attr( $wporg_username ); ?>" />
</span><span class="cx"> </p>
</span><span class="cx"> <?php
</span><span class="lines">@@ -1003,7 +1002,7 @@
</span><span class="cx"> ?>
</span><span class="cx"> <?php wp_nonce_field( 'edit-organizer-info', 'wcpt-meta-organizer-info' ); ?>
</span><span class="cx"> <p>
</span><del>- <label for="wcpt-wporg-username"><?php _e( 'WordPress.org Username:', $this->textdomain ); ?></label>
</del><ins>+ <label for="wcpt-wporg-username"><?php _e( 'WordPress.org Username:', 'wordcamporg' ); ?></label>
</ins><span class="cx"> <input type="text" class="widefat" id="wcpt-wporg-username" name="wcpt-wporg-username" value="<?php echo esc_attr( $wporg_username ); ?>" />
</span><span class="cx"> </p>
</span><span class="cx"> <?php
</span><span class="lines">@@ -1032,7 +1031,7 @@
</span><span class="cx"> <?php wp_nonce_field( 'edit-speakers-list', 'wcpt-meta-speakers-list-nonce' ); ?>
</span><span class="cx"> <!--<input type="text" class="text" id="wcpt-speakers-list" name="wcpt-speakers-list" value="<?php echo esc_attr( $speakers ); ?>" />-->
</span><span class="cx"> <textarea class="large-text" placeholder="Start typing a name" id="wcpt-speakers-list" name="wcpt-speakers-list"><?php echo esc_textarea( $speakers ); ?></textarea>
</span><del>- <p class="description"><?php _e( 'A speaker entry must exist first. Separate multiple speakers with commas.', $this->textdomain ); ?></p>
</del><ins>+ <p class="description"><?php _e( 'A speaker entry must exist first. Separate multiple speakers with commas.', 'wordcamporg' ); ?></p>
</ins><span class="cx"> <script>
</span><span class="cx"> jQuery(document).ready( function($) {
</span><span class="cx"> var availableSpeakers = [ <?php
</span><span class="lines">@@ -1086,15 +1085,15 @@
</span><span class="cx"> ?>
</span><span class="cx"> <?php wp_nonce_field( 'edit-session-info', 'wcpt-meta-session-info' ); ?>
</span><span class="cx"> <p>
</span><del>- <label for="wcpt-session-time"><?php _e( 'When:', $this->textdomain ); ?></label>
</del><ins>+ <label for="wcpt-session-time"><?php _e( 'When:', 'wordcamporg' ); ?></label>
</ins><span class="cx"> <input type="text" class="widefat" id="wcpt-session-time" name="wcpt-session-time" value="<?php echo esc_attr( $session_time ); ?>" />
</span><span class="cx"> <span style="display: block; margin-top: 4px;" class="description">For example: <?php echo date( 'Y-m-d H:i:s' ); ?></span>
</span><span class="cx"> </p>
</span><span class="cx"> <p>
</span><del>- <label for="wcpt-session-type"><?php _e( 'Type:', $this->textdomain ); ?></label>
</del><ins>+ <label for="wcpt-session-type"><?php _e( 'Type:', 'wordcamporg' ); ?></label>
</ins><span class="cx"> <select id="wcpt-session-type" name="wcpt-session-type">
</span><del>- <option value="session" <?php selected( $session_type, 'session' ); ?>><?php _e( 'Regular Session', $this->textdomain ); ?></option>
- <option value="custom" <?php selected( $session_type, 'custom' ); ?>><?php _e( 'Break, Lunch, etc.', $this->textdomain ); ?></option>
</del><ins>+ <option value="session" <?php selected( $session_type, 'session' ); ?>><?php _e( 'Regular Session', 'wordcamporg' ); ?></option>
+ <option value="custom" <?php selected( $session_type, 'custom' ); ?>><?php _e( 'Break, Lunch, etc.', 'wordcamporg' ); ?></option>
</ins><span class="cx"> </select>
</span><span class="cx"> </p>
</span><span class="cx"> <?php
</span><span class="lines">@@ -1281,19 +1280,19 @@
</span><span class="cx"> function register_post_types() {
</span><span class="cx"> // Speaker post type labels.
</span><span class="cx"> $labels = array(
</span><del>- 'name' => __( 'Speakers', $this->textdomain ),
- 'singular_name' => __( 'Speaker', $this->textdomain ),
- 'add_new' => __( 'Add New', $this->textdomain ),
- 'add_new_item' => __( 'Create New Speaker', $this->textdomain ),
- 'edit' => __( 'Edit', $this->textdomain ),
- 'edit_item' => __( 'Edit Speaker', $this->textdomain ),
- 'new_item' => __( 'New Speaker', $this->textdomain ),
- 'view' => __( 'View Speaker', $this->textdomain ),
- 'view_item' => __( 'View Speaker', $this->textdomain ),
- 'search_items' => __( 'Search Speakers', $this->textdomain ),
- 'not_found' => __( 'No speakers found', $this->textdomain ),
- 'not_found_in_trash' => __( 'No speakers found in Trash', $this->textdomain ),
- 'parent_item_colon' => __( 'Parent Speaker:', $this->textdomain ),
</del><ins>+ 'name' => __( 'Speakers', 'wordcamporg' ),
+ 'singular_name' => __( 'Speaker', 'wordcamporg' ),
+ 'add_new' => __( 'Add New', 'wordcamporg' ),
+ 'add_new_item' => __( 'Create New Speaker', 'wordcamporg' ),
+ 'edit' => __( 'Edit', 'wordcamporg' ),
+ 'edit_item' => __( 'Edit Speaker', 'wordcamporg' ),
+ 'new_item' => __( 'New Speaker', 'wordcamporg' ),
+ 'view' => __( 'View Speaker', 'wordcamporg' ),
+ 'view_item' => __( 'View Speaker', 'wordcamporg' ),
+ 'search_items' => __( 'Search Speakers', 'wordcamporg' ),
+ 'not_found' => __( 'No speakers found', 'wordcamporg' ),
+ 'not_found_in_trash' => __( 'No speakers found in Trash', 'wordcamporg' ),
+ 'parent_item_colon' => __( 'Parent Speaker:', 'wordcamporg' ),
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> // Register speaker post type.
</span><span class="lines">@@ -1313,19 +1312,19 @@
</span><span class="cx">
</span><span class="cx"> // Session post type labels.
</span><span class="cx"> $labels = array(
</span><del>- 'name' => __( 'Sessions', $this->textdomain ),
- 'singular_name' => __( 'Session', $this->textdomain ),
- 'add_new' => __( 'Add New', $this->textdomain ),
- 'add_new_item' => __( 'Create New Session', $this->textdomain ),
- 'edit' => __( 'Edit', $this->textdomain ),
- 'edit_item' => __( 'Edit Session', $this->textdomain ),
- 'new_item' => __( 'New Session', $this->textdomain ),
- 'view' => __( 'View Session', $this->textdomain ),
- 'view_item' => __( 'View Session', $this->textdomain ),
- 'search_items' => __( 'Search Sessions', $this->textdomain ),
- 'not_found' => __( 'No sessions found', $this->textdomain ),
- 'not_found_in_trash' => __( 'No sessions found in Trash', $this->textdomain ),
- 'parent_item_colon' => __( 'Parent Session:', $this->textdomain ),
</del><ins>+ 'name' => __( 'Sessions', 'wordcamporg' ),
+ 'singular_name' => __( 'Session', 'wordcamporg' ),
+ 'add_new' => __( 'Add New', 'wordcamporg' ),
+ 'add_new_item' => __( 'Create New Session', 'wordcamporg' ),
+ 'edit' => __( 'Edit', 'wordcamporg' ),
+ 'edit_item' => __( 'Edit Session', 'wordcamporg' ),
+ 'new_item' => __( 'New Session', 'wordcamporg' ),
+ 'view' => __( 'View Session', 'wordcamporg' ),
+ 'view_item' => __( 'View Session', 'wordcamporg' ),
+ 'search_items' => __( 'Search Sessions', 'wordcamporg' ),
+ 'not_found' => __( 'No sessions found', 'wordcamporg' ),
+ 'not_found_in_trash' => __( 'No sessions found in Trash', 'wordcamporg' ),
+ 'parent_item_colon' => __( 'Parent Session:', 'wordcamporg' ),
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> // Register session post type.
</span><span class="lines">@@ -1345,19 +1344,19 @@
</span><span class="cx">
</span><span class="cx"> // Sponsor post type labels.
</span><span class="cx"> $labels = array(
</span><del>- 'name' => __( 'Sponsors', $this->textdomain ),
- 'singular_name' => __( 'Sponsor', $this->textdomain ),
- 'add_new' => __( 'Add New', $this->textdomain ),
- 'add_new_item' => __( 'Create New Sponsor', $this->textdomain ),
- 'edit' => __( 'Edit', $this->textdomain ),
- 'edit_item' => __( 'Edit Sponsor', $this->textdomain ),
- 'new_item' => __( 'New Sponsor', $this->textdomain ),
- 'view' => __( 'View Sponsor', $this->textdomain ),
- 'view_item' => __( 'View Sponsor', $this->textdomain ),
- 'search_items' => __( 'Search Sponsors', $this->textdomain ),
- 'not_found' => __( 'No sponsors found', $this->textdomain ),
- 'not_found_in_trash' => __( 'No sponsors found in Trash', $this->textdomain ),
- 'parent_item_colon' => __( 'Parent Sponsor:', $this->textdomain ),
</del><ins>+ 'name' => __( 'Sponsors', 'wordcamporg' ),
+ 'singular_name' => __( 'Sponsor', 'wordcamporg' ),
+ 'add_new' => __( 'Add New', 'wordcamporg' ),
+ 'add_new_item' => __( 'Create New Sponsor', 'wordcamporg' ),
+ 'edit' => __( 'Edit', 'wordcamporg' ),
+ 'edit_item' => __( 'Edit Sponsor', 'wordcamporg' ),
+ 'new_item' => __( 'New Sponsor', 'wordcamporg' ),
+ 'view' => __( 'View Sponsor', 'wordcamporg' ),
+ 'view_item' => __( 'View Sponsor', 'wordcamporg' ),
+ 'search_items' => __( 'Search Sponsors', 'wordcamporg' ),
+ 'not_found' => __( 'No sponsors found', 'wordcamporg' ),
+ 'not_found_in_trash' => __( 'No sponsors found in Trash', 'wordcamporg' ),
+ 'parent_item_colon' => __( 'Parent Sponsor:', 'wordcamporg' ),
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> // Register sponsor post type.
</span><span class="lines">@@ -1377,19 +1376,19 @@
</span><span class="cx">
</span><span class="cx"> // Organizer post type labels.
</span><span class="cx"> $labels = array(
</span><del>- 'name' => __( 'Organizers', $this->textdomain ),
- 'singular_name' => __( 'Organizer', $this->textdomain ),
- 'add_new' => __( 'Add New', $this->textdomain ),
- 'add_new_item' => __( 'Create New Organizer', $this->textdomain ),
- 'edit' => __( 'Edit', $this->textdomain ),
- 'edit_item' => __( 'Edit Organizer', $this->textdomain ),
- 'new_item' => __( 'New Organizer', $this->textdomain ),
- 'view' => __( 'View Organizer', $this->textdomain ),
- 'view_item' => __( 'View Organizer', $this->textdomain ),
- 'search_items' => __( 'Search Organizers', $this->textdomain ),
- 'not_found' => __( 'No organizers found', $this->textdomain ),
- 'not_found_in_trash' => __( 'No organizers found in Trash', $this->textdomain ),
- 'parent_item_colon' => __( 'Parent Organizer:', $this->textdomain ),
</del><ins>+ 'name' => __( 'Organizers', 'wordcamporg' ),
+ 'singular_name' => __( 'Organizer', 'wordcamporg' ),
+ 'add_new' => __( 'Add New', 'wordcamporg' ),
+ 'add_new_item' => __( 'Create New Organizer', 'wordcamporg' ),
+ 'edit' => __( 'Edit', 'wordcamporg' ),
+ 'edit_item' => __( 'Edit Organizer', 'wordcamporg' ),
+ 'new_item' => __( 'New Organizer', 'wordcamporg' ),
+ 'view' => __( 'View Organizer', 'wordcamporg' ),
+ 'view_item' => __( 'View Organizer', 'wordcamporg' ),
+ 'search_items' => __( 'Search Organizers', 'wordcamporg' ),
+ 'not_found' => __( 'No organizers found', 'wordcamporg' ),
+ 'not_found_in_trash' => __( 'No organizers found in Trash', 'wordcamporg' ),
+ 'parent_item_colon' => __( 'Parent Organizer:', 'wordcamporg' ),
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> // Register organizer post type.
</span><span class="lines">@@ -1414,15 +1413,15 @@
</span><span class="cx"> function register_taxonomies() {
</span><span class="cx"> // Labels for tracks.
</span><span class="cx"> $labels = array(
</span><del>- 'name' => __( 'Tracks', $this->textdomain ),
- 'singular_name' => __( 'Track', $this->textdomain ),
- 'search_items' => __( 'Search Tracks', $this->textdomain ),
- 'popular_items' => __( 'Popular Tracks',$this->textdomain ),
- 'all_items' => __( 'All Tracks', $this->textdomain ),
- 'edit_item' => __( 'Edit Track', $this->textdomain ),
- 'update_item' => __( 'Update Track', $this->textdomain ),
- 'add_new_item' => __( 'Add Track', $this->textdomain ),
- 'new_item_name' => __( 'New Track', $this->textdomain ),
</del><ins>+ 'name' => __( 'Tracks', 'wordcamporg' ),
+ 'singular_name' => __( 'Track', 'wordcamporg' ),
+ 'search_items' => __( 'Search Tracks', 'wordcamporg' ),
+ 'popular_items' => __( 'Popular Tracks','wordcamporg' ),
+ 'all_items' => __( 'All Tracks', 'wordcamporg' ),
+ 'edit_item' => __( 'Edit Track', 'wordcamporg' ),
+ 'update_item' => __( 'Update Track', 'wordcamporg' ),
+ 'add_new_item' => __( 'Add Track', 'wordcamporg' ),
+ 'new_item_name' => __( 'New Track', 'wordcamporg' ),
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> // Register the Tracks taxonomy.
</span><span class="lines">@@ -1437,15 +1436,15 @@
</span><span class="cx">
</span><span class="cx"> // Labels for sponsor levels.
</span><span class="cx"> $labels = array(
</span><del>- 'name' => __( 'Sponsor Levels', $this->textdomain ),
- 'singular_name' => __( 'Sponsor Level', $this->textdomain ),
- 'search_items' => __( 'Search Sponsor Levels', $this->textdomain ),
- 'popular_items' => __( 'Popular Sponsor Levels', $this->textdomain ),
- 'all_items' => __( 'All Sponsor Levels', $this->textdomain ),
- 'edit_item' => __( 'Edit Sponsor Level', $this->textdomain ),
- 'update_item' => __( 'Update Sponsor Level', $this->textdomain ),
- 'add_new_item' => __( 'Add Sponsor Level', $this->textdomain ),
- 'new_item_name' => __( 'New Sponsor Level', $this->textdomain ),
</del><ins>+ 'name' => __( 'Sponsor Levels', 'wordcamporg' ),
+ 'singular_name' => __( 'Sponsor Level', 'wordcamporg' ),
+ 'search_items' => __( 'Search Sponsor Levels', 'wordcamporg' ),
+ 'popular_items' => __( 'Popular Sponsor Levels', 'wordcamporg' ),
+ 'all_items' => __( 'All Sponsor Levels', 'wordcamporg' ),
+ 'edit_item' => __( 'Edit Sponsor Level', 'wordcamporg' ),
+ 'update_item' => __( 'Update Sponsor Level', 'wordcamporg' ),
+ 'add_new_item' => __( 'Add Sponsor Level', 'wordcamporg' ),
+ 'new_item_name' => __( 'New Sponsor Level', 'wordcamporg' ),
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> // Register sponsor level taxonomy
</span><span class="lines">@@ -1472,14 +1471,14 @@
</span><span class="cx"> switch ( $current_filter ) {
</span><span class="cx"> case 'manage_wcb_organizer_posts_columns':
</span><span class="cx"> // Insert at offset 1, that's right after the checkbox.
</span><del>- $columns = array_slice( $columns, 0, 1, true ) + array( 'wcb_organizer_avatar' => __( 'Avatar', $this->textdomain ) ) + array_slice( $columns, 1, null, true );
</del><ins>+ $columns = array_slice( $columns, 0, 1, true ) + array( 'wcb_organizer_avatar' => __( 'Avatar', 'wordcamporg' ) ) + array_slice( $columns, 1, null, true );
</ins><span class="cx"> break;
</span><span class="cx"> case 'manage_wcb_speaker_posts_columns':
</span><del>- $columns = array_slice( $columns, 0, 1, true ) + array( 'wcb_speaker_avatar' => __( 'Avatar', $this->textdomain ) ) + array_slice( $columns, 1, null, true );
</del><ins>+ $columns = array_slice( $columns, 0, 1, true ) + array( 'wcb_speaker_avatar' => __( 'Avatar', 'wordcamporg' ) ) + array_slice( $columns, 1, null, true );
</ins><span class="cx"> break;
</span><span class="cx"> case 'manage_wcb_session_posts_columns':
</span><del>- $columns = array_slice( $columns, 0, 2, true ) + array( 'wcb_session_speakers' => __( 'Speakers', $this->textdomain ) ) + array_slice( $columns, 2, null, true );
- $columns = array_slice( $columns, 0, 1, true ) + array( 'wcb_session_time' => __( 'Time', $this->textdomain ) ) + array_slice( $columns, 1, null, true );
</del><ins>+ $columns = array_slice( $columns, 0, 2, true ) + array( 'wcb_session_speakers' => __( 'Speakers', 'wordcamporg' ) ) + array_slice( $columns, 2, null, true );
+ $columns = array_slice( $columns, 0, 1, true ) + array( 'wcb_session_time' => __( 'Time', 'wordcamporg' ) ) + array_slice( $columns, 1, null, true );
</ins><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="cx"> }
</span><span class="lines">@@ -1555,9 +1554,9 @@
</span><span class="cx"> $session_type = 'session';
</span><span class="cx">
</span><span class="cx"> if ( 'session' == $session_type )
</span><del>- $states['wcpt-session-type'] = __( 'Session', $this->textdomain );
</del><ins>+ $states['wcpt-session-type'] = __( 'Session', 'wordcamporg' );
</ins><span class="cx"> elseif ( 'custom' == $session_type )
</span><del>- $states['wcpt-session-type'] = __( 'Custom', $this->textdomain );
</del><ins>+ $states['wcpt-session-type'] = __( 'Custom', 'wordcamporg' );
</ins><span class="cx">
</span><span class="cx"> return $states;
</span><span class="cx"> }
</span><span class="lines">@@ -1577,3 +1576,39 @@
</span><span class="cx">
</span><span class="cx"> // Load the plugin class.
</span><span class="cx"> $GLOBALS['wcpt_plugin'] = new WordCamp_Post_Types_Plugin;
</span><ins>+
+
+/*
+$track_slugs = 'talks,workshops';
+$transient_key = 'wcpt_track_speaker_ids_' . substr( md5( $track_slugs ), 0, 22 ); // discard trailing hash characters to stay within transient limit
+
+if ( ! $speaker_ids = get_transient( $transient_key ) ) {
+ $speaker_ids = array();
+ $track_sessions = get_posts( array(
+ 'post_type' => 'wcb_session',
+ 'numberposts' => -1,
+ 'tax_query' => array(
+ array(
+ 'taxonomy' => 'wcb_track',
+ 'field' => 'slug',
+ 'terms' => explode( ',', $track_slugs ),
+ ),
+ ),
+ ) );
+
+ foreach ( $track_sessions as $session ) {
+ $session_speaker_ids = get_post_meta( $session->ID, '_wcpt_speaker_id' );
+ $speaker_ids = array_merge( $speaker_ids, $session_speaker_ids );
+ }
+
+ //set_transient( $transient_key, $speaker_ids, HOUR_IN_SECONDS );
+}
+
+$speakers = get_posts( array(
+ 'post_type' => 'wcb_speaker',
+ 'numberposts' => -1,
+ 'post__in' => $speaker_ids,
+) );
+
+var_dump( $track_slugs, $transient_key, $track_sessions, $speaker_ids, $speakers ); wp_die('');
+*/
</ins></span></pre>
</div>
</div>
</body>
</html>