Permalink
Browse files

Switch all calls of hybrid_get_textdomain() to 'hybrid'.

  • Loading branch information...
1 parent f962cda commit 6d6862629d03852785647cfbf1d34c8476aa887f @justintadlock committed Aug 23, 2012
View
@@ -30,12 +30,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', 'hybrid' ); ?></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>' . home_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.', 'hybrid' ), '<code>' . home_url( esc_url( $_SERVER['REQUEST_URI'] ) ) . '</code>' ); ?>
</p>
<?php get_search_form(); // Loads the searchform.php template. ?>
View
@@ -37,14 +37,14 @@
<?php hybrid_attachment(); // Function for handling non-image attachments. ?>
<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;', 'hybrid' ), the_title( '<span class="fn">', '</span>', false) ); ?></a>
</p><!-- .download -->
<?php endif; ?>
- <?php the_content( sprintf( __( 'Continue reading %1$s', hybrid_get_textdomain() ), the_title( ' "', '"', false ) ) ); ?>
+ <?php the_content( sprintf( __( 'Continue reading %1$s', 'hybrid' ), the_title( ' "', '"', false ) ) ); ?>
- <?php wp_link_pages( array( 'before' => '<p class="page-links pages">' . __( 'Pages:', hybrid_get_textdomain() ), 'after' => '</p>' ) ); ?>
+ <?php wp_link_pages( array( 'before' => '<p class="page-links pages">' . __( 'Pages:', 'hybrid' ), 'after' => '</p>' ) ); ?>
</div><!-- .entry-content -->
View
@@ -19,7 +19,7 @@
<div class="comment-text">
<?php if ( '0' == $comment->comment_approved ) : ?>
- <p class="alert moderation"><?php _e( 'Your comment is awaiting moderation.', hybrid_get_textdomain() ); ?></p>
+ <p class="alert moderation"><?php _e( 'Your comment is awaiting moderation.', 'hybrid' ); ?></p>
<?php endif; ?>
<?php comment_text( $comment->comment_ID ); ?>
View
@@ -11,7 +11,7 @@
/* Kill the page if trying to access this template directly. */
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!', 'hybrid' ) );
/* If a post password is required or no comments are given and comments/pings are closed, return. */
if ( post_password_required() || ( !have_comments() && !comments_open() && !pings_open() ) )
@@ -24,7 +24,7 @@
<div id="comments">
- <h3 id="comments-number" class="comments-header"><?php comments_number( sprintf( __( 'No responses to %1$s', hybrid_get_textdomain() ), the_title( '&#8220;', '&#8221;', false ) ), sprintf( __( 'One response to %1$s', hybrid_get_textdomain() ), the_title( '&#8220;', '&#8221;', false ) ), sprintf( __( '%1$s responses to %2$s', hybrid_get_textdomain() ), '%', the_title( '&#8220;', '&#8221;', false ) ) ); ?></h3>
+ <h3 id="comments-number" class="comments-header"><?php comments_number( sprintf( __( 'No responses to %1$s', 'hybrid' ), the_title( '&#8220;', '&#8221;', false ) ), sprintf( __( 'One response to %1$s', 'hybrid' ), the_title( '&#8220;', '&#8221;', false ) ), sprintf( __( '%1$s responses to %2$s', 'hybrid' ), '%', the_title( '&#8220;', '&#8221;', false ) ) ); ?></h3>
<?php do_atomic( 'before_comment_list' ); // Before comment list hook ?>
@@ -47,7 +47,7 @@
<?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.', 'hybrid' ), trackback_url( '0' ) ); ?>
</p><!-- .comments-closed .pings-open -->
<?php endif; ?>
View
@@ -134,8 +134,8 @@ function hybrid_theme_register_sidebars() {
register_sidebar(
array(
'id' => 'widgets-template',
- 'name' => __( 'Widgets Template', hybrid_get_textdomain() ),
- 'description' => __( 'Used as the content of the Widgets page template.', hybrid_get_textdomain() ),
+ 'name' => __( 'Widgets Template', 'hybrid' ),
+ 'description' => __( 'Used as the content of the Widgets page template.', 'hybrid' ),
'before_widget' => '<div id="%1$s" class="widget %2$s widget-%2$s"><div class="widget-inside">',
'after_widget' => '</div></div>',
'before_title' => '<h3 class="widget-title">',
@@ -147,8 +147,8 @@ function hybrid_theme_register_sidebars() {
register_sidebar(
array(
'id' => 'error-404-template',
- 'name' => __( '404 Template', hybrid_get_textdomain() ),
- 'description' => __( 'Replaces the default 404 error page content.', hybrid_get_textdomain() ),
+ 'name' => __( '404 Template', 'hybrid' ),
+ 'description' => __( 'Replaces the default 404 error page content.', 'hybrid' ),
'before_widget' => '<div id="%1$s" class="widget %2$s widget-%2$s"><div class="widget-inside">',
'after_widget' => '</div></div>',
'before_title' => '<h3 class="widget-title">',
@@ -224,7 +224,7 @@ function hybrid_byline() {
$byline = '';
if ( 'post' == get_post_type() && 'link_category' !== get_query_var( 'taxonomy' ) )
- $byline = '<p class="byline">' . __( 'By [entry-author] on [entry-published] [entry-edit-link before=" | "]', hybrid_get_textdomain() ) . '</p>';
+ $byline = '<p class="byline">' . __( 'By [entry-author] on [entry-published] [entry-edit-link before=" | "]', 'hybrid' ) . '</p>';
echo apply_atomic_shortcode( 'byline', $byline );
}
@@ -239,7 +239,7 @@ function hybrid_entry_meta() {
$meta = '';
if ( 'post' == get_post_type() )
- $meta = '<p class="entry-meta">' . __( '[entry-terms taxonomy="category" before="Posted in "] [entry-terms taxonomy="post_tag" before="| Tagged "] [entry-comments-link before="| "]', hybrid_get_textdomain() ) . '</p>';
+ $meta = '<p class="entry-meta">' . __( '[entry-terms taxonomy="category" before="Posted in "] [entry-terms taxonomy="post_tag" before="| Tagged "] [entry-comments-link before="| "]', 'hybrid' ) . '</p>';
elseif ( is_page() && current_user_can( 'edit_page', get_the_ID() ) )
$meta = '<p class="entry-meta">[entry-edit-link]</p>';
View
@@ -25,8 +25,8 @@
<?php do_atomic( 'before_entry' ); // hybrid_before_entry ?>
<div class="entry-content">
- <?php the_content( sprintf( __( 'Continue reading %1$s', hybrid_get_textdomain() ), the_title( ' "', '"', false ) ) ); ?>
- <?php wp_link_pages( array( 'before' => '<p class="page-links pages">' . __( 'Pages:', hybrid_get_textdomain() ), 'after' => '</p>' ) ); ?>
+ <?php the_content( sprintf( __( 'Continue reading %1$s', 'hybrid' ), the_title( ' "', '"', false ) ) ); ?>
+ <?php wp_link_pages( array( 'before' => '<p class="page-links pages">' . __( 'Pages:', 'hybrid' ), 'after' => '</p>' ) ); ?>
</div><!-- .entry-content -->
<?php do_atomic( 'after_entry' ); // hybrid_after_entry ?>
View
@@ -13,7 +13,7 @@
<div class="entry-content">
<p class="no-data">
- <?php _e( 'Apologies, but no results were found.', hybrid_get_textdomain() ); ?>
+ <?php _e( 'Apologies, but no results were found.', 'hybrid' ); ?>
</p><!-- .no-data -->
</div><!-- .entry-content -->
View
@@ -80,7 +80,7 @@
<div class="loop-description search-description">
<p>
- <?php printf( __( 'You are browsing the search results for &quot;%1$s&quot;', hybrid_get_textdomain() ), esc_attr( get_search_query() ) ); ?>
+ <?php printf( __( 'You are browsing the search results for &quot;%1$s&quot;', 'hybrid' ), esc_attr( get_search_query() ) ); ?>
</p>
</div><!-- .loop-description -->
@@ -89,11 +89,11 @@
<?php elseif ( is_date() ) : ?>
<div class="loop-meta archive-info date-info">
- <h1 class="loop-title archive-title date-title"><?php _e( 'Archives by date', hybrid_get_textdomain() ); ?></h1>
+ <h1 class="loop-title archive-title date-title"><?php _e( 'Archives by date', 'hybrid' ); ?></h1>
<div class="loop-description archive-description date-description">
<p>
- <?php _e( 'You are browsing the site archives by date.', hybrid_get_textdomain() ); ?>
+ <?php _e( 'You are browsing the site archives by date.', 'hybrid' ); ?>
</p>
</div><!-- .loop-description -->
@@ -117,11 +117,11 @@
<div class="loop-meta archive-info">
- <h1 class="loop-title archive-title"><?php _e( 'Archives', hybrid_get_textdomain() ); ?></h1>
+ <h1 class="loop-title archive-title"><?php _e( 'Archives', 'hybrid' ); ?></h1>
<div class="loop-description archive-description">
<p>
- <?php _e( 'You are browsing the site archives.', hybrid_get_textdomain() ); ?>
+ <?php _e( 'You are browsing the site archives.', 'hybrid' ); ?>
</p>
</div><!-- .loop-description -->
View
@@ -14,21 +14,21 @@
<?php if ( is_attachment() ) : ?>
<div class="navigation-links">
- <?php previous_post_link( '%link', '<span class="previous">' . __( '&laquo; Return to entry', hybrid_get_textdomain() ) . '</span>' ); ?>
+ <?php previous_post_link( '%link', '<span class="previous">' . __( '&laquo; Return to entry', 'hybrid' ) . '</span>' ); ?>
</div>
<?php elseif ( is_singular( 'post' ) ) : ?>
<div class="navigation-links">
- <?php previous_post_link( '%link', '<span class="previous">' . __( '&laquo; Previous', hybrid_get_textdomain() ) . '</span>' ); ?>
- <?php next_post_link( '%link', '<span class="next">' . __( 'Next &raquo;', hybrid_get_textdomain() ) . '</span>' ); ?>
+ <?php previous_post_link( '%link', '<span class="previous">' . __( '&laquo; Previous', 'hybrid' ) . '</span>' ); ?>
+ <?php next_post_link( '%link', '<span class="next">' . __( 'Next &raquo;', 'hybrid' ) . '</span>' ); ?>
</div><!-- .navigation-links -->
<?php elseif ( !is_singular() && function_exists( 'wp_pagenavi' ) ) : wp_pagenavi(); ?>
<?php elseif ( !is_singular() && current_theme_supports( 'loop-pagination' ) ) : loop_pagination(); ?>
- <?php elseif ( !is_singular() && $nav = get_posts_nav_link( array( 'sep' => '', 'prelabel' => '<span class="previous">' . __( '&laquo; Previous', hybrid_get_textdomain() ) . '</span>', 'nxtlabel' => '<span class="next">' . __( 'Next &raquo;', hybrid_get_textdomain() ) . '</span>' ) ) ) : ?>
+ <?php elseif ( !is_singular() && $nav = get_posts_nav_link( array( 'sep' => '', 'prelabel' => '<span class="previous">' . __( '&laquo; Previous', 'hybrid' ) . '</span>', 'nxtlabel' => '<span class="next">' . __( 'Next &raquo;', 'hybrid' ) . '</span>' ) ) ) : ?>
<div class="navigation-links">
<?php echo $nav; ?>
View
@@ -34,21 +34,21 @@
<?php else : ?>
- <h2><?php _e( 'Archives by category', hybrid_get_textdomain() ); ?></h2>
+ <h2><?php _e( 'Archives by category', 'hybrid' ); ?></h2>
<ul class="xoxo category-archives">
- <?php wp_list_categories( array( 'feed' => __( 'RSS', hybrid_get_textdomain() ), 'show_count' => true, 'use_desc_for_title' => false, 'title_li' => false ) ); ?>
+ <?php wp_list_categories( array( 'feed' => __( 'RSS', 'hybrid' ), 'show_count' => true, 'use_desc_for_title' => false, 'title_li' => false ) ); ?>
</ul><!-- .xoxo .category-archives -->
- <h2><?php _e( 'Archives by month', hybrid_get_textdomain() ); ?></h2>
+ <h2><?php _e( 'Archives by month', 'hybrid' ); ?></h2>
<ul class="xoxo monthly-archives">
<?php wp_get_archives( array( 'show_post_count' => true, 'type' => 'monthly' ) ); ?>
</ul><!-- .xoxo .monthly-archives -->
<?php endif; ?>
- <?php wp_link_pages( array( 'before' => '<p class="page-links pages">' . __( 'Pages:', hybrid_get_textdomain() ), 'after' => '</p>' ) ); ?>
+ <?php wp_link_pages( array( 'before' => '<p class="page-links pages">' . __( 'Pages:', 'hybrid' ), 'after' => '</p>' ) ); ?>
</div><!-- .entry-content -->
View
@@ -53,7 +53,7 @@
<?php endforeach; ?>
- <?php wp_link_pages( array( 'before' => '<p class="page-links pages">' . __( 'Pages:', hybrid_get_textdomain() ), 'after' => '</p>' ) ); ?>
+ <?php wp_link_pages( array( 'before' => '<p class="page-links pages">' . __( 'Pages:', 'hybrid' ), 'after' => '</p>' ) ); ?>
</div><!-- .entry-content -->
View
@@ -38,31 +38,31 @@
<ul class="xoxo clear">
<?php if ( get_the_author_meta( 'nickname' ) ) : ?>
- <li><strong><?php _e( 'Nickname:', hybrid_get_textdomain() ); ?></strong> <span class="nickname"><?php the_author_meta( 'nickname' ); ?></span></li>
+ <li><strong><?php _e( 'Nickname:', 'hybrid' ); ?></strong> <span class="nickname"><?php the_author_meta( 'nickname' ); ?></span></li>
<?php endif; ?>
<?php if ( get_the_author_meta( 'user_url' ) ) : ?>
- <li><strong><?php _e( 'Website:', hybrid_get_textdomain() ); ?></strong> <a class="url" href="<?php the_author_meta( 'user_url' ); ?>" title="<?php the_author_meta( 'user_url' ); ?>"><?php the_author_meta( 'user_url' ); ?></a></li>
+ <li><strong><?php _e( 'Website:', 'hybrid' ); ?></strong> <a class="url" href="<?php the_author_meta( 'user_url' ); ?>" title="<?php the_author_meta( 'user_url' ); ?>"><?php the_author_meta( 'user_url' ); ?></a></li>
<?php endif; ?>
<?php if ( get_the_author_meta( 'aim' ) ) : ?>
- <li><strong><?php _e( 'AIM:', hybrid_get_textdomain() ); ?></strong> <a class="url" href="aim:goim?screenname=<?php the_author_meta( 'aim' ); ?>" title="<?php printf( __( 'IM with %1$s', hybrid_get_textdomain() ), get_the_author_meta( 'aim' ) ); ?>"><?php the_author_meta( 'aim' ); ?></a></li>
+ <li><strong><?php _e( 'AIM:', 'hybrid' ); ?></strong> <a class="url" href="aim:goim?screenname=<?php the_author_meta( 'aim' ); ?>" title="<?php printf( __( 'IM with %1$s', 'hybrid' ), get_the_author_meta( 'aim' ) ); ?>"><?php the_author_meta( 'aim' ); ?></a></li>
<?php endif; ?>
<?php if ( get_the_author_meta( 'jabber' ) ) : ?>
- <li><strong><?php _e( 'Jabber:', hybrid_get_textdomain() ); ?></strong> <a class="url" href="xmpp:<?php the_author_meta( 'jabber' ); ?>@jabberservice.com" title="<?php printf( __( 'IM with %1$s', hybrid_get_textdomain() ), get_the_author_meta( 'jabber' ) ); ?>"><?php the_author_meta( 'jabber' ); ?></a></li>
+ <li><strong><?php _e( 'Jabber:', 'hybrid' ); ?></strong> <a class="url" href="xmpp:<?php the_author_meta( 'jabber' ); ?>@jabberservice.com" title="<?php printf( __( 'IM with %1$s', 'hybrid' ), get_the_author_meta( 'jabber' ) ); ?>"><?php the_author_meta( 'jabber' ); ?></a></li>
<?php endif; ?>
<?php if ( get_the_author_meta( 'yim' ) ) : ?>
- <li><strong><?php _e( 'Yahoo:', hybrid_get_textdomain() ); ?></strong> <a class="url" href="ymsgr:sendIM?<?php the_author_meta( 'yim' ); ?>" title="<?php printf( __( 'IM with %1$s', hybrid_get_textdomain() ), get_the_author_meta( 'yim' ) ); ?>"><?php the_author_meta( 'yim' ); ?></a></li>
+ <li><strong><?php _e( 'Yahoo:', 'hybrid' ); ?></strong> <a class="url" href="ymsgr:sendIM?<?php the_author_meta( 'yim' ); ?>" title="<?php printf( __( 'IM with %1$s', 'hybrid' ), get_the_author_meta( 'yim' ) ); ?>"><?php the_author_meta( 'yim' ); ?></a></li>
<?php endif; ?>
</ul><!-- .xoxo -->
</div><!-- .author-profile .vcard -->
<?php the_content(); ?>
- <?php wp_link_pages( array( 'before' => '<p class="page-links pages">' . __( 'Pages:', hybrid_get_textdomain() ), 'after' => '</p>' ) ); ?>
+ <?php wp_link_pages( array( 'before' => '<p class="page-links pages">' . __( 'Pages:', 'hybrid' ), 'after' => '</p>' ) ); ?>
</div><!-- .entry-content -->
View
@@ -30,8 +30,8 @@
<?php do_atomic( 'before_entry' ); // hybrid_before_entry ?>
<div class="entry-content">
- <?php the_content( sprintf( __( 'Continue reading %1$s', hybrid_get_textdomain() ), the_title( ' "', '"', false ) ) ); ?>
- <?php wp_link_pages( array( 'before' => '<p class="page-links pages">' . __( 'Pages:', hybrid_get_textdomain() ), 'after' => '</p>' ) ); ?>
+ <?php the_content( sprintf( __( 'Continue reading %1$s', 'hybrid' ), the_title( ' "', '"', false ) ) ); ?>
+ <?php wp_link_pages( array( 'before' => '<p class="page-links pages">' . __( 'Pages:', 'hybrid' ), 'after' => '</p>' ) ); ?>
</div><!-- .entry-content -->
<?php do_atomic( 'after_entry' ); // hybrid_after_entry ?>
View
@@ -41,7 +41,7 @@
); ?>
<?php wp_list_bookmarks( $args ); ?>
- <?php wp_link_pages( array( 'before' => '<p class="page-links pages">' . __( 'Pages:', hybrid_get_textdomain() ), 'after' => '</p>' ) ); ?>
+ <?php wp_link_pages( array( 'before' => '<p class="page-links pages">' . __( 'Pages:', 'hybrid' ), 'after' => '</p>' ) ); ?>
</div><!-- .entry-content -->
View
@@ -28,10 +28,10 @@
<?php the_content(); ?>
<ul class="xoxo category-archives">
- <?php wp_list_categories( array( 'feed' => __( 'RSS', hybrid_get_textdomain() ), 'show_count' => true, 'use_desc_for_title' => false, 'title_li' => false ) ); ?>
+ <?php wp_list_categories( array( 'feed' => __( 'RSS', 'hybrid' ), 'show_count' => true, 'use_desc_for_title' => false, 'title_li' => false ) ); ?>
</ul><!-- .xoxo .category-archives -->
- <?php wp_link_pages( array( 'before' => '<p class="page-links pages">' . __( 'Pages:', hybrid_get_textdomain() ), 'after' => '</p>' ) ); ?>
+ <?php wp_link_pages( array( 'before' => '<p class="page-links pages">' . __( 'Pages:', 'hybrid' ), 'after' => '</p>' ) ); ?>
</div><!-- .entry-content -->
View
@@ -30,7 +30,7 @@
<?php wp_get_archives( array( 'type' => 'daily', 'show_post_count' => true ) ); ?>
</ul><!-- .xoxo .daily-archives -->
- <?php wp_link_pages( array( 'before' => '<p class="page-links pages">' . __( 'Pages:', hybrid_get_textdomain() ), 'after' => '</p>' ) ); ?>
+ <?php wp_link_pages( array( 'before' => '<p class="page-links pages">' . __( 'Pages:', 'hybrid' ), 'after' => '</p>' ) ); ?>
</div><!-- .entry-content -->
View
@@ -27,7 +27,7 @@
<div class="entry-content">
<?php the_content(); ?>
- <?php wp_link_pages( array( 'before' => '<p class="page-links pages">' . __( 'Pages:', hybrid_get_textdomain() ), 'after' => '</p>' ) ); ?>
+ <?php wp_link_pages( array( 'before' => '<p class="page-links pages">' . __( 'Pages:', 'hybrid' ), 'after' => '</p>' ) ); ?>
</div><!-- .entry-content -->
<?php do_atomic( 'after_entry' ); // hybrid_after_entry ?>
@@ -49,9 +49,9 @@
<div class="entry-content">
<p class="alert">
- <?php printf( __( 'You must be <a href="%1$s" title="Log in">logged in</a> to view the content of this page.', hybrid_get_textdomain() ), wp_login_url( get_permalink() ) ); ?>
+ <?php printf( __( 'You must be <a href="%1$s" title="Log in">logged in</a> to view the content of this page.', 'hybrid' ), wp_login_url( get_permalink() ) ); ?>
- <?php if ( get_option( 'users_can_register' ) ) printf( __( 'If you\'re not currently a member, please take a moment to <a href="%1$s" title="Register">register</a>.', hybrid_get_textdomain() ), site_url( 'wp-login.php?action=register', 'login' ) ); ?>
+ <?php if ( get_option( 'users_can_register' ) ) printf( __( 'If you\'re not currently a member, please take a moment to <a href="%1$s" title="Register">register</a>.', 'hybrid' ), site_url( 'wp-login.php?action=register', 'login' ) ); ?>
</p><!-- .alert -->
</div><!-- .entry-content -->
Oops, something went wrong.

0 comments on commit 6d68626

Please sign in to comment.