Permalink
Browse files

Change all instances of hybrid_get_textdomain() to 'news'.

  • Loading branch information...
1 parent fd89651 commit b67e8bfb4e95c205ac2050c13684c244d99b950d @justintadlock committed Aug 25, 2012
View
@@ -36,12 +36,12 @@
<div id="post-0" class="<?php hybrid_entry_class(); ?>">
- <h1 class="error-404-title entry-title"><?php _e( 'Not Found', hybrid_get_textdomain() ); ?></h1>
+ <h1 class="error-404-title entry-title"><?php _e( 'Not Found', 'news' ); ?></h1>
<div class="entry-content">
<p>
- <?php printf( __( 'You tried going to %1$s, and it doesn\'t exist. All is not lost! You can search for what you\'re looking for.', hybrid_get_textdomain() ), '<code>' . site_url( esc_url( $_SERVER['REQUEST_URI'] ) ) . '</code>' ); ?>
+ <?php printf( __( 'You tried going to %1$s, and it doesn\'t exist. All is not lost! You can search for what you\'re looking for.', 'news' ), '<code>' . site_url( esc_url( $_SERVER['REQUEST_URI'] ) ) . '</code>' ); ?>
</p>
<?php get_search_form(); ?>
View
@@ -29,11 +29,11 @@
<?php do_atomic( 'open_entry' ); // Open loop hook ?>
- <?php echo apply_atomic_shortcode( 'entry_utility', '<div class="entry-utility">' . __( '[entry-print-link] [entry-email-link] [entry-popup-shortlink]', hybrid_get_textdomain() ) . '</div>' ); ?>
+ <?php echo apply_atomic_shortcode( 'entry_utility', '<div class="entry-utility">' . __( '[entry-print-link] [entry-email-link] [entry-popup-shortlink]', 'news' ) . '</div>' ); ?>
<?php echo apply_atomic_shortcode( 'entry_title', '[entry-title]' ); ?>
- <?php echo apply_atomic_shortcode( 'byline', '<div class="byline">' . __( 'By [entry-author] on [entry-published] [entry-terms taxonomy="category" before=" in "] [entry-edit-link before=" | "]', hybrid_get_textdomain() ) . '</div>' ); ?>
+ <?php echo apply_atomic_shortcode( 'byline', '<div class="byline">' . __( 'By [entry-author] on [entry-published] [entry-terms taxonomy="category" before=" in "] [entry-edit-link before=" | "]', 'news' ) . '</div>' ); ?>
<div class="entry-content">
<?php if ( wp_attachment_is_image( get_the_ID() ) ) : ?>
@@ -47,16 +47,16 @@
<?php hybrid_attachment(); ?>
<p class="download">
- <a href="<?php echo wp_get_attachment_url(); ?>" title="<?php the_title_attribute(); ?>" rel="enclosure" type="<?php echo get_post_mime_type(); ?>"><?php printf( __( 'Download &quot;%1$s&quot;', hybrid_get_textdomain() ), the_title( '<span class="fn">', '</span>', false) ); ?></a>
+ <a href="<?php echo wp_get_attachment_url(); ?>" title="<?php the_title_attribute(); ?>" rel="enclosure" type="<?php echo get_post_mime_type(); ?>"><?php printf( __( 'Download &quot;%1$s&quot;', 'news' ), the_title( '<span class="fn">', '</span>', false) ); ?></a>
</p><!-- .download -->
<?php endif; ?>
- <?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', hybrid_get_textdomain() ) ); ?>
- <?php wp_link_pages( array( 'before' => '<p class="page-links">' . __( 'Pages:', hybrid_get_textdomain() ), 'after' => '</p>' ) ); ?>
+ <?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'news' ) ); ?>
+ <?php wp_link_pages( array( 'before' => '<p class="page-links">' . __( 'Pages:', 'news' ), 'after' => '</p>' ) ); ?>
</div><!-- .entry-content -->
- <?php echo apply_atomic_shortcode( 'entry_meta', '<div class="entry-meta">' . __( '<span class="share">Share this on:</span> [entry-mixx-link] [entry-delicious-link] [entry-digg-link] [entry-facebook-link] [entry-twitter-link]', hybrid_get_textdomain() ) . '</div>' ); ?>
+ <?php echo apply_atomic_shortcode( 'entry_meta', '<div class="entry-meta">' . __( '<span class="share">Share this on:</span> [entry-mixx-link] [entry-delicious-link] [entry-digg-link] [entry-facebook-link] [entry-twitter-link]', 'news' ) . '</div>' ); ?>
<?php do_atomic( 'close_loop' ); // Close loop hook ?>
@@ -21,7 +21,7 @@ class News_Widget_Image_Stream extends WP_Widget {
*/
function News_Widget_Image_Stream() {
$this->prefix = hybrid_get_prefix();
- $this->textdomain = hybrid_get_textdomain();
+ $this->textdomain = 'news';
$widget_ops = array( 'classname' => 'image-stream', 'description' => __( 'Displays image thumbnails in a gallery-like format.', $this->textdomain ) );
$control_ops = array( 'width' => 200, 'height' => 350, 'id_base' => "{$this->prefix}-image-stream" );
@@ -21,7 +21,7 @@ class News_Widget_Newsletter extends WP_Widget {
*/
function News_Widget_Newsletter() {
$this->prefix = hybrid_get_prefix();
- $this->textdomain = hybrid_get_textdomain();
+ $this->textdomain = 'news';
$widget_ops = array( 'classname' => 'newsletter', 'description' => __( 'Displays a subscription form for your Google/Feedburner account.', $this->textdomain ) );
$control_ops = array( 'width' => 200, 'height' => 350, 'id_base' => "{$this->prefix}-newsletter" );
@@ -22,7 +22,7 @@ class News_Widget_Popular_Tabs extends WP_Widget {
*/
function News_Widget_Popular_Tabs() {
$this->prefix = hybrid_get_prefix();
- $this->textdomain = hybrid_get_textdomain();
+ $this->textdomain = 'news';
$widget_ops = array( 'classname' => 'popular-tabs', 'description' => __( 'Displays popular posts by number of views and comments in tab format.', $this->textdomain ) );
$control_ops = array( 'width' => 200, 'height' => 350, 'id_base' => "{$this->prefix}-popular-tabs" );
View
@@ -27,7 +27,7 @@
<div class="comment-content comment-text">
<?php if ( '0' == $comment->comment_approved ) : ?>
- <?php echo apply_atomic_shortcode( 'comment_moderation', '<p class="alert moderation">' . __( 'Your comment is awaiting moderation.', hybrid_get_textdomain() ) . '</p>' ); ?>
+ <?php echo apply_atomic_shortcode( 'comment_moderation', '<p class="alert moderation">' . __( 'Your comment is awaiting moderation.', 'news' ) . '</p>' ); ?>
<?php endif; ?>
<?php comment_text( $comment->comment_ID ); ?>
View
@@ -10,7 +10,7 @@
*/
if ( 'comments.php' == basename( $_SERVER['SCRIPT_FILENAME'] ) )
- die( __( 'Please do not load this page directly. Thanks!', hybrid_get_textdomain() ) );
+ die( __( 'Please do not load this page directly. Thanks!', 'news' ) );
if ( post_password_required() || ( !have_comments() && !comments_open() && !pings_open() ) || ( !post_type_supports( get_post_type(), 'comments' ) && !post_type_supports( get_post_type(), 'trackbacks' ) ) )
return;
@@ -26,13 +26,13 @@
<?php if ( get_option( 'page_comments' ) ) : ?>
<div class="comments-nav">
- <span class="page-numbers"><?php printf( __( 'Page %1$s of %2$s', hybrid_get_textdomain() ), news_get_current_comments_page(), get_comment_pages_count() ); ?></span>
+ <span class="page-numbers"><?php printf( __( 'Page %1$s of %2$s', 'news' ), news_get_current_comments_page(), get_comment_pages_count() ); ?></span>
<?php previous_comments_link(); ?>
<?php next_comments_link(); ?>
</div><!-- .comments-nav -->
<?php endif; ?>
- <h3 id="comments-number" class="comments-header"><?php comments_number( __( 'No Responses', hybrid_get_textdomain() ), __( 'One Response', hybrid_get_textdomain() ), __( '% Responses', hybrid_get_textdomain() ) ); ?></h3>
+ <h3 id="comments-number" class="comments-header"><?php comments_number( __( 'No Responses', 'news' ), __( 'One Response', 'news' ), __( '% Responses', 'news' ) ); ?></h3>
<?php do_atomic( 'before_comment_list' ); // Before comment list hook ?>
@@ -47,13 +47,13 @@
<?php if ( pings_open() && !comments_open() ) : ?>
<p class="comments-closed pings-open">
- <?php printf( __( 'Comments are closed, but <a href="%1$s" title="Trackback URL for this post">trackbacks</a> and pingbacks are open.', hybrid_get_textdomain() ), trackback_url( '0' ) ); ?>
+ <?php printf( __( 'Comments are closed, but <a href="%1$s" title="Trackback URL for this post">trackbacks</a> and pingbacks are open.', 'news' ), trackback_url( '0' ) ); ?>
</p><!-- .comments-closed .pings-open -->
<?php elseif ( !comments_open() ) : ?>
<p class="comments-closed">
- <?php _e( 'Comments are closed.', hybrid_get_textdomain() ); ?>
+ <?php _e( 'Comments are closed.', 'news' ); ?>
</p><!-- .comments-closed -->
<?php endif; ?>
View
@@ -242,7 +242,7 @@ function news_get_current_comments_page() {
*/
function news_comment_form_defaults( $args ) {
- $args['label_submit'] = esc_attr__( 'Submit', hybrid_get_textdomain() );
+ $args['label_submit'] = esc_attr__( 'Submit', 'news' );
return $args;
}
@@ -353,7 +353,7 @@ function news_get_post_by_meta( $meta_key = '', $meta_value = '' ) {
*/
function news_register_post_types() {
- $domain = hybrid_get_textdomain();
+ $domain = 'news';
$prefix = hybrid_get_prefix();
/* Labels for the video post type. */
View
@@ -58,7 +58,7 @@ function news_validate_theme_settings( $settings ) {
* @since 0.1.0
*/
function news_create_settings_meta_boxes() {
- add_meta_box( "news-home-template-meta-box", __( 'Home Page Template Settings', hybrid_get_textdomain() ), 'news_home_template_theme_meta_box', 'appearance_page_theme-settings', 'normal', 'low' );
+ add_meta_box( "news-home-template-meta-box", __( 'Home Page Template Settings', 'news' ), 'news_home_template_theme_meta_box', 'appearance_page_theme-settings', 'normal', 'low' );
}
/**
@@ -78,15 +78,15 @@ function news_home_template_theme_meta_box() {
<table class="form-table">
<tr>
- <th><?php _e( 'About:', hybrid_get_textdomain() ); ?></th>
+ <th><?php _e( 'About:', 'news' ); ?></th>
<td>
- <?php _e( 'Settings used on pages that use the "Home" page template. This template must be assigned to a page before its settings take effect.', hybrid_get_textdomain() ); ?>
+ <?php _e( 'Settings used on pages that use the "Home" page template. This template must be assigned to a page before its settings take effect.', 'news' ); ?>
</td>
</tr>
<tr>
- <th><label for="<?php echo hybrid_settings_field_id( 'home_template_categories' ); ?>"><?php _e( 'Category Highlight:', hybrid_get_textdomain() ); ?></label></th>
+ <th><label for="<?php echo hybrid_settings_field_id( 'home_template_categories' ); ?>"><?php _e( 'Category Highlight:', 'news' ); ?></label></th>
<td>
- <label for="<?php echo hybrid_settings_field_id( 'home_template_categories' ); ?>"><?php _e( 'Categories to show blog posts from in the category highlight section. Multiple categories may be chosen by holding the <code>Ctrl</code> key and selecting.', hybrid_get_textdomain() ); ?></label>
+ <label for="<?php echo hybrid_settings_field_id( 'home_template_categories' ); ?>"><?php _e( 'Categories to show blog posts from in the category highlight section. Multiple categories may be chosen by holding the <code>Ctrl</code> key and selecting.', 'news' ); ?></label>
<br />
<select id="<?php echo hybrid_settings_field_id( 'home_template_categories' ); ?>" name="<?php echo hybrid_settings_field_name( 'home_template_categories' ); ?>[]" multiple="multiple" style="height:150px;">
<?php foreach( $categories as $cat ) { ?>
@@ -35,8 +35,8 @@ function news_entry_shortlink_popup_shortcode() {
return '';
$id = 'shortlink-' . get_the_ID();
- $title = sprintf( __( "Shortlink for '%s'", hybrid_get_textdomain() ), get_the_title() );
- $out = '<a class="tips shortlink hide-if-no-js" rel="#' . $id . '" title="' . esc_attr( $title ) . '">' . __( 'Shortlink', hybrid_get_textdomain() ) . '</a>';
+ $title = sprintf( __( "Shortlink for '%s'", 'news' ), get_the_title() );
+ $out = '<a class="tips shortlink hide-if-no-js" rel="#' . $id . '" title="' . esc_attr( $title ) . '">' . __( 'Shortlink', 'news' ) . '</a>';
$out .= ' <div id="' . $id . '" class="tip hide">';
$out .= '<input type="text" value="' . esc_url( $shortlink ) . '" onclick="this.focus(); this.select();" />';
$out .= '</div>';
@@ -50,7 +50,7 @@ function news_entry_shortlink_popup_shortcode() {
* @since 0.1.0
*/
function news_entry_print_link_shortcode() {
- return '<a class="print-link hide-if-no-js" href="#">' . __( 'Print', hybrid_get_textdomain() ) . '</a>';
+ return '<a class="print-link hide-if-no-js" href="#">' . __( 'Print', 'news' ) . '</a>';
}
/**
@@ -60,8 +60,8 @@ function news_entry_print_link_shortcode() {
*/
function news_entry_email_link_shortcode() {
$subject = urlencode( esc_attr( '[' . get_bloginfo( 'name' ) . ']' . the_title_attribute( 'echo=0' ) ) );
- $body = urlencode( esc_attr( sprintf( __( 'Check out this post: %1$s', hybrid_get_textdomain() ), get_permalink( get_the_ID() ) ) ) );
- return '<a class="email-link" href="mailto:?subject=' . $subject . '&amp;body=' . $body . '">' . __( 'Email', hybrid_get_textdomain() ) . '</a>';
+ $body = urlencode( esc_attr( sprintf( __( 'Check out this post: %1$s', 'news' ), get_permalink( get_the_ID() ) ) ) );
+ return '<a class="email-link" href="mailto:?subject=' . $subject . '&amp;body=' . $body . '">' . __( 'Email', 'news' ) . '</a>';
}
/**
@@ -70,7 +70,7 @@ function news_entry_email_link_shortcode() {
* @since 0.1.0
*/
function news_entry_mixx_link_shortcode() {
- return '<a href="http://www.mixx.com" onclick="window.location=\'http://www.mixx.com/submit?page_url=\'+window.location; return false;">' . __( 'Mixx', hybrid_get_textdomain() ) . '</a>';
+ return '<a href="http://www.mixx.com" onclick="window.location=\'http://www.mixx.com/submit?page_url=\'+window.location; return false;">' . __( 'Mixx', 'news' ) . '</a>';
}
/**
@@ -79,7 +79,7 @@ function news_entry_mixx_link_shortcode() {
* @since 0.1.0
*/
function news_entry_delicious_link_shortcode() {
- return '<a href="http://delicious.com/save" onclick="window.open(\'http://delicious.com/save?v=5&amp;noui&amp;jump=close&amp;url=\'+encodeURIComponent(\'' . get_permalink() . '\')+\'&amp;title=\'+encodeURIComponent(\'' . the_title_attribute( 'echo=0' ) . '\'),\'delicious\', \'toolbar=no,width=550,height=550\'); return false;">' . __( 'Delicious', hybrid_get_textdomain() ) . '</a>';
+ return '<a href="http://delicious.com/save" onclick="window.open(\'http://delicious.com/save?v=5&amp;noui&amp;jump=close&amp;url=\'+encodeURIComponent(\'' . get_permalink() . '\')+\'&amp;title=\'+encodeURIComponent(\'' . the_title_attribute( 'echo=0' ) . '\'),\'delicious\', \'toolbar=no,width=550,height=550\'); return false;">' . __( 'Delicious', 'news' ) . '</a>';
}
/**
@@ -91,7 +91,7 @@ function news_entry_delicious_link_shortcode() {
function news_entry_digg_link_shortcode() {
$url = esc_url( 'http://digg.com/submit?phase=2&amp;url=' . urlencode( get_permalink( get_the_ID() ) ) . '&amp;title="' . urlencode( the_title_attribute( 'echo=0' ) ) );
- return '<a href="' . $url . '" title="' . __( 'Digg this entry', hybrid_get_textdomain() ) . '">Digg</a>';
+ return '<a href="' . $url . '" title="' . __( 'Digg this entry', 'news' ) . '">Digg</a>';
}
/**
@@ -104,7 +104,7 @@ function news_entry_digg_link_shortcode() {
function news_entry_facebook_link_shortcode() {
$url = esc_url( 'http://facebook.com/sharer.php?u=' . urlencode( get_permalink( get_the_ID() ) ) . '&amp;t=' . urlencode( the_title_attribute( 'echo=0' ) ) );
- return '<a href="' . $url . '" title="' . __( 'Share this entry on Facebook', hybrid_get_textdomain() ) . '">' . __( 'Facebook', hybrid_get_textdomain() ) . '</a>';
+ return '<a href="' . $url . '" title="' . __( 'Share this entry on Facebook', 'news' ) . '">' . __( 'Facebook', 'news' ) . '</a>';
}
/**
@@ -123,8 +123,8 @@ function news_entry_twitter_link_shortcode() {
else
$shortlink = get_permalink( $post_id );
- $url = esc_url( 'http://twitter.com/home?status=' . urlencode( sprintf( __( 'Currently reading %1$s', hybrid_get_textdomain() ), $shortlink ) ) );
- return '<a href="' . $url . '" title="' . __( 'Share this entry on Twitter', hybrid_get_textdomain() ) . '">' . __( 'Twitter', hybrid_get_textdomain() ) . '</a>';
+ $url = esc_url( 'http://twitter.com/home?status=' . urlencode( sprintf( __( 'Currently reading %1$s', 'news' ), $shortlink ) ) );
+ return '<a href="' . $url . '" title="' . __( 'Share this entry on Twitter', 'news' ) . '">' . __( 'Twitter', 'news' ) . '</a>';
}
/**
@@ -199,7 +199,7 @@ function news_slideshow_shortcode( $attr ) {
if ( !empty( $caption ) ) {
$slideshow .= '<div class="slideshow-caption">';
- $slideshow .= '<a class="slideshow-caption-control">' . __( 'Caption', hybrid_get_textdomain() ) . '</a>';
+ $slideshow .= '<a class="slideshow-caption-control">' . __( 'Caption', 'news' ) . '</a>';
$slideshow .= '<div class="slideshow-caption-text">' . $caption . '</div>';
$slideshow .= '</div>';
}
@@ -211,8 +211,8 @@ function news_slideshow_shortcode( $attr ) {
$slideshow .= '<div class="slideshow-pager"></div>';
$slideshow .= '<div class="slideshow-nav">';
- $slideshow .= '<a class="slider-prev">' . __( 'Previous', hybrid_get_textdomain() ) . '</a>';
- $slideshow .= '<a class="slider-next">' . __( 'Next', hybrid_get_textdomain() ) . '</a>';
+ $slideshow .= '<a class="slider-prev">' . __( 'Previous', 'news' ) . '</a>';
+ $slideshow .= '<a class="slider-next">' . __( 'Next', 'news' ) . '</a>';
$slideshow .= '</div>';
$slideshow .= '</div>';
View
@@ -65,4 +65,4 @@
<?php do_atomic( 'open_container' ); // Open container hook ?>
- <?php if ( current_theme_supports( 'breadcrumb-trail' ) ) breadcrumb_trail( array( 'before' => __( 'Browsing:', hybrid_get_textdomain() ) . ' <span class="sep">/</span>' ) ); ?>
+ <?php if ( current_theme_supports( 'breadcrumb-trail' ) ) breadcrumb_trail( array( 'before' => __( 'Browsing:', 'news' ) . ' <span class="sep">/</span>' ) ); ?>
View
@@ -31,18 +31,18 @@
<?php do_atomic( 'open_entry' ); // Open entry hook ?>
- <?php echo apply_atomic_shortcode( 'entry_utility', '<div class="entry-utility">' . __( '[entry-popup-shortlink]', hybrid_get_textdomain() ) . '</div>' ); ?>
+ <?php echo apply_atomic_shortcode( 'entry_utility', '<div class="entry-utility">' . __( '[entry-popup-shortlink]', 'news' ) . '</div>' ); ?>
<?php echo apply_atomic_shortcode( 'entry_title', '[entry-title]' ); ?>
- <?php echo apply_atomic_shortcode( 'byline', '<div class="byline">' . __( 'By [entry-author] on [entry-published] [entry-terms taxonomy="category" before=" in "] [entry-edit-link before=" | "]', hybrid_get_textdomain() ) . '</div>' ); ?>
+ <?php echo apply_atomic_shortcode( 'byline', '<div class="byline">' . __( 'By [entry-author] on [entry-published] [entry-terms taxonomy="category" before=" in "] [entry-edit-link before=" | "]', 'news' ) . '</div>' ); ?>
<div class="entry-content">
- <?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', hybrid_get_textdomain() ) ); ?>
- <?php wp_link_pages( array( 'before' => '<p class="page-links">' . __( 'Pages:', hybrid_get_textdomain() ), 'after' => '</p>' ) ); ?>
+ <?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'news' ) ); ?>
+ <?php wp_link_pages( array( 'before' => '<p class="page-links">' . __( 'Pages:', 'news' ), 'after' => '</p>' ) ); ?>
</div><!-- .entry-content -->
- <?php echo apply_atomic_shortcode( 'entry_meta', '<div class="entry-meta">' . __( '<span class="share">Share this on:</span> [entry-mixx-link] [entry-delicious-link] [entry-digg-link] [entry-facebook-link] [entry-twitter-link]', hybrid_get_textdomain() ) . '</div>' ); ?>
+ <?php echo apply_atomic_shortcode( 'entry_meta', '<div class="entry-meta">' . __( '<span class="share">Share this on:</span> [entry-mixx-link] [entry-delicious-link] [entry-digg-link] [entry-facebook-link] [entry-twitter-link]', 'news' ) . '</div>' ); ?>
<?php do_atomic( 'close_entry' ); // Close entry hook ?>
Oops, something went wrong.

0 comments on commit b67e8bf

Please sign in to comment.