diff --git a/src/wp-content/themes/twentytwelve/404.php b/src/wp-content/themes/twentytwelve/404.php
index 8b039ecee4..75e6479d09 100644
|
a
|
b
|
get_header(); ?>
|
| 14 | 14 | |
| 15 | 15 | <article id="post-0" class="post error404 no-results not-found"> |
| 16 | 16 | <header class="entry-header"> |
| 17 | | <h1 class="entry-title"><?php _e( 'This is somewhat embarrassing, isn’t it?', 'twentytwelve' ); ?></h1> |
| | 17 | <h1 class="entry-title"><?php esc_html_e( 'This is somewhat embarrassing, isn’t it?', 'twentytwelve' ); ?></h1> |
| 18 | 18 | </header> |
| 19 | 19 | |
| 20 | 20 | <div class="entry-content"> |
| 21 | | <p><?php _e( 'It seems we can’t find what you’re looking for. Perhaps searching can help.', 'twentytwelve' ); ?></p> |
| | 21 | <p><?php esc_html_e( 'It seems we can’t find what you’re looking for. Perhaps searching can help.', 'twentytwelve' ); ?></p> |
| 22 | 22 | <?php get_search_form(); ?> |
| 23 | 23 | </div><!-- .entry-content --> |
| 24 | 24 | </article><!-- #post-0 --> |
diff --git a/src/wp-content/themes/twentytwelve/comments.php b/src/wp-content/themes/twentytwelve/comments.php
index a7aa3f21a5..c810d7cca2 100644
|
a
|
b
|
if ( post_password_required() ) {
|
| 59 | 59 | |
| 60 | 60 | <?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // Are there comments to navigate through? ?> |
| 61 | 61 | <nav id="comment-nav-below" class="navigation"> |
| 62 | | <h1 class="assistive-text section-heading"><?php _e( 'Comment navigation', 'twentytwelve' ); ?></h1> |
| | 62 | <h1 class="assistive-text section-heading"><?php esc_html_e( 'Comment navigation', 'twentytwelve' ); ?></h1> |
| 63 | 63 | <div class="nav-previous"><?php previous_comments_link( __( '← Older Comments', 'twentytwelve' ) ); ?></div> |
| 64 | 64 | <div class="nav-next"><?php next_comments_link( __( 'Newer Comments →', 'twentytwelve' ) ); ?></div> |
| 65 | 65 | </nav> |
| … |
… |
if ( post_password_required() ) {
|
| 72 | 72 | */ |
| 73 | 73 | if ( ! comments_open() && get_comments_number() ) : |
| 74 | 74 | ?> |
| 75 | | <p class="nocomments"><?php _e( 'Comments are closed.', 'twentytwelve' ); ?></p> |
| | 75 | <p class="nocomments"><?php esc_html_e( 'Comments are closed.', 'twentytwelve' ); ?></p> |
| 76 | 76 | <?php endif; ?> |
| 77 | 77 | |
| 78 | | <?php endif; // have_comments() ?> |
| | 78 | <?php endif; ?> |
| 79 | 79 | |
| 80 | 80 | <?php comment_form(); ?> |
| 81 | 81 | |
diff --git a/src/wp-content/themes/twentytwelve/content-aside.php b/src/wp-content/themes/twentytwelve/content-aside.php
index 52990b2bff..205a49ba63 100644
|
a
|
b
|
$post_title = sprintf( __( 'Permalink to %s', 'twentytwelve' ), the_title_attrib
|
| 25 | 25 | <div class="comments-link"> |
| 26 | 26 | <?php comments_popup_link( '<span class="leave-reply">' . __( 'Leave a reply', 'twentytwelve' ) . '</span>', __( '1 Reply', 'twentytwelve' ), __( '% Replies', 'twentytwelve' ) ); ?> |
| 27 | 27 | </div><!-- .comments-link --> |
| 28 | | <?php endif; // comments_open() ?> |
| | 28 | <?php endif; ?> |
| 29 | 29 | <?php edit_post_link( __( 'Edit', 'twentytwelve' ), '<span class="edit-link">', '</span>' ); ?> |
| 30 | 30 | </footer><!-- .entry-meta --> |
| 31 | 31 | </article><!-- #post --> |
diff --git a/src/wp-content/themes/twentytwelve/content-image.php b/src/wp-content/themes/twentytwelve/content-image.php
index a683b83cfc..01a9faa116 100644
|
a
|
b
|
|
| 22 | 22 | <div class="comments-link"> |
| 23 | 23 | <?php comments_popup_link( '<span class="leave-reply">' . __( 'Leave a reply', 'twentytwelve' ) . '</span>', __( '1 Reply', 'twentytwelve' ), __( '% Replies', 'twentytwelve' ) ); ?> |
| 24 | 24 | </div><!-- .comments-link --> |
| 25 | | <?php endif; // comments_open() ?> |
| | 25 | <?php endif; ?> |
| 26 | 26 | <?php edit_post_link( __( 'Edit', 'twentytwelve' ), '<span class="edit-link">', '</span>' ); ?> |
| 27 | 27 | </footer><!-- .entry-meta --> |
| 28 | 28 | </article><!-- #post --> |
diff --git a/src/wp-content/themes/twentytwelve/content-link.php b/src/wp-content/themes/twentytwelve/content-link.php
index 743cef91ee..ee95c51f0d 100644
|
a
|
b
|
$post_title = sprintf( __( 'Permalink to %s', 'twentytwelve' ), the_title_attrib
|
| 12 | 12 | ?> |
| 13 | 13 | |
| 14 | 14 | <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>> |
| 15 | | <header><?php _e( 'Link', 'twentytwelve' ); ?></header> |
| | 15 | <header><?php esc_html_e( 'Link', 'twentytwelve' ); ?></header> |
| 16 | 16 | <div class="entry-content"> |
| 17 | 17 | <?php the_content( __( 'Continue reading <span class="meta-nav">→</span>', 'twentytwelve' ) ); ?> |
| 18 | 18 | </div><!-- .entry-content --> |
| … |
… |
$post_title = sprintf( __( 'Permalink to %s', 'twentytwelve' ), the_title_attrib
|
| 23 | 23 | <div class="comments-link"> |
| 24 | 24 | <?php comments_popup_link( '<span class="leave-reply">' . __( 'Leave a reply', 'twentytwelve' ) . '</span>', __( '1 Reply', 'twentytwelve' ), __( '% Replies', 'twentytwelve' ) ); ?> |
| 25 | 25 | </div><!-- .comments-link --> |
| 26 | | <?php endif; // comments_open() ?> |
| | 26 | <?php endif; ?> |
| 27 | 27 | <?php edit_post_link( __( 'Edit', 'twentytwelve' ), '<span class="edit-link">', '</span>' ); ?> |
| 28 | 28 | </footer><!-- .entry-meta --> |
| 29 | 29 | </article><!-- #post --> |
diff --git a/src/wp-content/themes/twentytwelve/content-none.php b/src/wp-content/themes/twentytwelve/content-none.php
index b7757821c6..aa6de55d24 100644
|
a
|
b
|
|
| 10 | 10 | |
| 11 | 11 | <article id="post-0" class="post no-results not-found"> |
| 12 | 12 | <header class="entry-header"> |
| 13 | | <h1 class="entry-title"><?php _e( 'Nothing Found', 'twentytwelve' ); ?></h1> |
| | 13 | <h1 class="entry-title"><?php esc_html_e( 'Nothing Found', 'twentytwelve' ); ?></h1> |
| 14 | 14 | </header> |
| 15 | 15 | |
| 16 | 16 | <div class="entry-content"> |
| 17 | | <p><?php _e( 'Apologies, but no results were found. Perhaps searching will help find a related post.', 'twentytwelve' ); ?></p> |
| | 17 | <p><?php esc_html_e( 'Apologies, but no results were found. Perhaps searching will help find a related post.', 'twentytwelve' ); ?></p> |
| 18 | 18 | <?php get_search_form(); ?> |
| 19 | 19 | </div><!-- .entry-content --> |
| 20 | 20 | </article><!-- #post-0 --> |
diff --git a/src/wp-content/themes/twentytwelve/content-quote.php b/src/wp-content/themes/twentytwelve/content-quote.php
index e599444852..4112cee376 100644
|
a
|
b
|
$post_title = sprintf( __( 'Permalink to %s', 'twentytwelve' ), the_title_attrib
|
| 22 | 22 | <div class="comments-link"> |
| 23 | 23 | <?php comments_popup_link( '<span class="leave-reply">' . __( 'Leave a reply', 'twentytwelve' ) . '</span>', __( '1 Reply', 'twentytwelve' ), __( '% Replies', 'twentytwelve' ) ); ?> |
| 24 | 24 | </div><!-- .comments-link --> |
| 25 | | <?php endif; // comments_open() ?> |
| | 25 | <?php endif; ?> |
| 26 | 26 | <?php edit_post_link( __( 'Edit', 'twentytwelve' ), '<span class="edit-link">', '</span>' ); ?> |
| 27 | 27 | </footer><!-- .entry-meta --> |
| 28 | 28 | </article><!-- #post --> |
diff --git a/src/wp-content/themes/twentytwelve/content-status.php b/src/wp-content/themes/twentytwelve/content-status.php
index 8e62944203..d07623cba1 100644
|
a
|
b
|
$post_title = sprintf( __( 'Permalink to %s', 'twentytwelve' ), the_title_attrib
|
| 39 | 39 | <div class="comments-link"> |
| 40 | 40 | <?php comments_popup_link( '<span class="leave-reply">' . __( 'Leave a reply', 'twentytwelve' ) . '</span>', __( '1 Reply', 'twentytwelve' ), __( '% Replies', 'twentytwelve' ) ); ?> |
| 41 | 41 | </div><!-- .comments-link --> |
| 42 | | <?php endif; // comments_open() ?> |
| | 42 | <?php endif; ?> |
| 43 | 43 | <?php edit_post_link( __( 'Edit', 'twentytwelve' ), '<span class="edit-link">', '</span>' ); ?> |
| 44 | 44 | </footer><!-- .entry-meta --> |
| 45 | 45 | </article><!-- #post --> |
diff --git a/src/wp-content/themes/twentytwelve/content.php b/src/wp-content/themes/twentytwelve/content.php
index 102f0f814d..54bfc0cf1c 100644
|
a
|
b
|
|
| 13 | 13 | <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>> |
| 14 | 14 | <?php if ( is_sticky() && is_home() && ! is_paged() ) : ?> |
| 15 | 15 | <div class="featured-post"> |
| 16 | | <?php _e( 'Featured post', 'twentytwelve' ); ?> |
| | 16 | <?php esc_html_e( 'Featured post', 'twentytwelve' ); ?> |
| 17 | 17 | </div> |
| 18 | 18 | <?php endif; ?> |
| 19 | 19 | <header class="entry-header"> |
| … |
… |
|
| 29 | 29 | <h1 class="entry-title"> |
| 30 | 30 | <a href="<?php the_permalink(); ?>" rel="bookmark"><?php the_title(); ?></a> |
| 31 | 31 | </h1> |
| 32 | | <?php endif; // is_single() ?> |
| | 32 | <?php endif; ?> |
| 33 | 33 | <?php if ( comments_open() ) : ?> |
| 34 | 34 | <div class="comments-link"> |
| 35 | 35 | <?php comments_popup_link( '<span class="leave-reply">' . __( 'Leave a reply', 'twentytwelve' ) . '</span>', __( '1 Reply', 'twentytwelve' ), __( '% Replies', 'twentytwelve' ) ); ?> |
| 36 | 36 | </div><!-- .comments-link --> |
| 37 | | <?php endif; // comments_open() ?> |
| | 37 | <?php endif; ?> |
| 38 | 38 | </header><!-- .entry-header --> |
| 39 | 39 | |
| 40 | 40 | <?php if ( is_search() ) : // Only display excerpts for search. ?> |
diff --git a/src/wp-content/themes/twentytwelve/functions.php b/src/wp-content/themes/twentytwelve/functions.php
index de535ac5f2..49c60527d1 100644
|
a
|
b
|
if ( ! function_exists( 'twentytwelve_content_nav' ) ) :
|
| 394 | 394 | |
| 395 | 395 | if ( $wp_query->max_num_pages > 1 ) : ?> |
| 396 | 396 | <nav id="<?php echo esc_attr( $html_id ); ?>" class="navigation"> |
| 397 | | <h3 class="assistive-text"><?php _e( 'Post navigation', 'twentytwelve' ); ?></h3> |
| | 397 | <h3 class="assistive-text"><?php esc_html_e( 'Post navigation', 'twentytwelve' ); ?></h3> |
| 398 | 398 | <div class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav">←</span> Older posts', 'twentytwelve' ) ); ?></div> |
| 399 | 399 | <div class="nav-next"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav">→</span>', 'twentytwelve' ) ); ?></div> |
| 400 | 400 | </nav><!-- .navigation --> |
| … |
… |
if ( ! function_exists( 'twentytwelve_comment' ) ) :
|
| 424 | 424 | // Display trackbacks differently than normal comments. |
| 425 | 425 | ?> |
| 426 | 426 | <li <?php comment_class(); ?> id="comment-<?php comment_ID(); ?>"> |
| 427 | | <p><?php _e( 'Pingback:', 'twentytwelve' ); ?> <?php comment_author_link(); ?> <?php edit_comment_link( __( '(Edit)', 'twentytwelve' ), '<span class="edit-link">', '</span>' ); ?></p> |
| | 427 | <p><?php esc_html_e( 'Pingback:', 'twentytwelve' ); ?> <?php comment_author_link(); ?> <?php edit_comment_link( __( '(Edit)', 'twentytwelve' ), '<span class="edit-link">', '</span>' ); ?></p> |
| 428 | 428 | <?php |
| 429 | 429 | break; |
| 430 | 430 | default: |
| … |
… |
if ( ! function_exists( 'twentytwelve_comment' ) ) :
|
| 440 | 440 | '<cite><b class="fn">%1$s</b> %2$s</cite>', |
| 441 | 441 | get_comment_author_link(), |
| 442 | 442 | // If current post author is also comment author, make it known visually. |
| 443 | | ( $comment->user_id === $post->post_author ) ? '<span>' . __( 'Post author', 'twentytwelve' ) . '</span>' : '' |
| | 443 | ( $comment->user_id === $post->post_author ) ? '<span>' . esc_html_e( 'Post author', 'twentytwelve' ) . '</span>' : '' |
| 444 | 444 | ); |
| 445 | 445 | printf( |
| 446 | 446 | '<a href="%1$s"><time datetime="%2$s">%3$s</time></a>', |
diff --git a/src/wp-content/themes/twentytwelve/header.php b/src/wp-content/themes/twentytwelve/header.php
index 0d4cf9441a..5f47f8f149 100644
|
a
|
b
|
|
| 41 | 41 | </hgroup> |
| 42 | 42 | |
| 43 | 43 | <nav id="site-navigation" class="main-navigation"> |
| 44 | | <button class="menu-toggle"><?php _e( 'Menu', 'twentytwelve' ); ?></button> |
| 45 | | <a class="assistive-text" href="#content"><?php _e( 'Skip to content', 'twentytwelve' ); ?></a> |
| | 44 | <button class="menu-toggle"><?php esc_html_e( 'Menu', 'twentytwelve' ); ?></button> |
| | 45 | <a class="assistive-text" href="#content"><?php esc_html_e( 'Skip to content', 'twentytwelve' ); ?></a> |
| 46 | 46 | <?php |
| 47 | 47 | wp_nav_menu( |
| 48 | 48 | array( |
diff --git a/src/wp-content/themes/twentytwelve/index.php b/src/wp-content/themes/twentytwelve/index.php
index 98649a8413..e6b523ec45 100644
|
a
|
b
|
get_header(); ?>
|
| 39 | 39 | // Show a different message to a logged-in user who can add posts. |
| 40 | 40 | ?> |
| 41 | 41 | <header class="entry-header"> |
| 42 | | <h1 class="entry-title"><?php _e( 'No posts to display', 'twentytwelve' ); ?></h1> |
| | 42 | <h1 class="entry-title"><?php esc_html_e( 'No posts to display', 'twentytwelve' ); ?></h1> |
| 43 | 43 | </header> |
| 44 | 44 | |
| 45 | 45 | <div class="entry-content"> |
| … |
… |
get_header(); ?>
|
| 56 | 56 | // Show the default message to everyone else. |
| 57 | 57 | ?> |
| 58 | 58 | <header class="entry-header"> |
| 59 | | <h1 class="entry-title"><?php _e( 'Nothing Found', 'twentytwelve' ); ?></h1> |
| | 59 | <h1 class="entry-title"><?php esc_html_e( 'Nothing Found', 'twentytwelve' ); ?></h1> |
| 60 | 60 | </header> |
| 61 | 61 | |
| 62 | 62 | <div class="entry-content"> |
| 63 | | <p><?php _e( 'Apologies, but no results were found. Perhaps searching will help find a related post.', 'twentytwelve' ); ?></p> |
| | 63 | <p><?php esc_html_e( 'Apologies, but no results were found. Perhaps searching will help find a related post.', 'twentytwelve' ); ?></p> |
| 64 | 64 | <?php get_search_form(); ?> |
| 65 | 65 | </div><!-- .entry-content --> |
| 66 | 66 | <?php endif; // End current_user_can() check. ?> |
diff --git a/src/wp-content/themes/twentytwelve/search.php b/src/wp-content/themes/twentytwelve/search.php
index 99acfe4034..bafaeada71 100644
|
a
|
b
|
get_header(); ?>
|
| 39 | 39 | |
| 40 | 40 | <article id="post-0" class="post no-results not-found"> |
| 41 | 41 | <header class="entry-header"> |
| 42 | | <h1 class="entry-title"><?php _e( 'Nothing Found', 'twentytwelve' ); ?></h1> |
| | 42 | <h1 class="entry-title"><?php esc_html_e( 'Nothing Found', 'twentytwelve' ); ?></h1> |
| 43 | 43 | </header> |
| 44 | 44 | |
| 45 | 45 | <div class="entry-content"> |
| 46 | | <p><?php _e( 'Sorry, but nothing matched your search criteria. Please try again with some different keywords.', 'twentytwelve' ); ?></p> |
| | 46 | <p><?php esc_html_e( 'Sorry, but nothing matched your search criteria. Please try again with some different keywords.', 'twentytwelve' ); ?></p> |
| 47 | 47 | <?php get_search_form(); ?> |
| 48 | 48 | </div><!-- .entry-content --> |
| 49 | 49 | </article><!-- #post-0 --> |
diff --git a/src/wp-content/themes/twentytwelve/single.php b/src/wp-content/themes/twentytwelve/single.php
index 4cc6a43a4b..c9dd57fafd 100644
|
a
|
b
|
get_header(); ?>
|
| 20 | 20 | <?php get_template_part( 'content', get_post_format() ); ?> |
| 21 | 21 | |
| 22 | 22 | <nav class="nav-single"> |
| 23 | | <h3 class="assistive-text"><?php _e( 'Post navigation', 'twentytwelve' ); ?></h3> |
| | 23 | <h3 class="assistive-text"><?php esc_html_e( 'Post navigation', 'twentytwelve' ); ?></h3> |
| 24 | 24 | <span class="nav-previous"><?php previous_post_link( '%link', '<span class="meta-nav">' . _x( '←', 'Previous post link', 'twentytwelve' ) . '</span> %title' ); ?></span> |
| 25 | 25 | <span class="nav-next"><?php next_post_link( '%link', '%title <span class="meta-nav">' . _x( '→', 'Next post link', 'twentytwelve' ) . '</span>' ); ?></span> |
| 26 | 26 | </nav><!-- .nav-single --> |