From 40e684d779a03904a214c1aaf8a102597aa343f2 Mon Sep 17 00:00:00 2001 From: Dion Hulse Date: Sun, 28 Feb 2010 11:43:04 +0000 Subject: [PATCH] Better internationalisation for TwentyTen. Props filosofo. Fixes #12384 git-svn-id: https://develop.svn.wordpress.org/trunk@13498 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-content/themes/twentyten/attachment.php | 41 +++-- wp-content/themes/twentyten/category.php | 4 +- wp-content/themes/twentyten/comments.php | 11 +- wp-content/themes/twentyten/header.php | 6 +- wp-content/themes/twentyten/index.php | 10 +- wp-content/themes/twentyten/loop.php | 202 +++++++++++---------- wp-content/themes/twentyten/search.php | 2 +- wp-content/themes/twentyten/single.php | 22 ++- wp-content/themes/twentyten/tag.php | 4 +- 9 files changed, 173 insertions(+), 129 deletions(-) diff --git a/wp-content/themes/twentyten/attachment.php b/wp-content/themes/twentyten/attachment.php index 3218369ee9..e129262f39 100644 --- a/wp-content/themes/twentyten/attachment.php +++ b/wp-content/themes/twentyten/attachment.php @@ -11,11 +11,20 @@

- - - - - + By %3$s', 'twentyten'), + get_author_posts_url( get_the_author_meta('ID') ), + sprintf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ), + get_the_author() + ); + ?> + | + Published %2$s', 'twentyten'), + esc_attr(get_the_time()), + get_the_date() + ); + ?> |\n\t\t\t\t\t\t", "\n\t\t\t\t\t" ); ?>
@@ -42,12 +51,22 @@
- permalink. Follow any comments here with the RSS feed for this post.', 'twentyten' ), - get_the_category_list(', '), - get_the_tag_list( __( ' and tagged ', 'twentyten' ), ', ', '' ), - get_permalink(), - the_title_attribute('echo=0'), - get_post_comments_feed_link() ); ?> + permalink. Follow any comments here with the RSS feed for this post.', 'twentyten' ); + } else { + $utility_text = __( 'This entry was posted in %1$s. Bookmark the permalink. Follow any comments here with the RSS feed for this post.', 'twentyten' ); + } + printf( + $utility_text, + get_the_category_list(', '), + $tag_list, + get_permalink(), + the_title_attribute('echo=0'), + get_post_comments_feed_link() + ); + ?> Post a comment or leave a trackback: Trackback URL.', 'twentyten' ), get_trackback_url() ); ?> diff --git a/wp-content/themes/twentyten/category.php b/wp-content/themes/twentyten/category.php index 68aef76ee0..e638959c57 100644 --- a/wp-content/themes/twentyten/category.php +++ b/wp-content/themes/twentyten/category.php @@ -3,7 +3,9 @@
-

+

' . single_cat_title('', false) . ''); + ?>

' . $categorydesc . '
' ); ?> diff --git a/wp-content/themes/twentyten/comments.php b/wp-content/themes/twentyten/comments.php index 45a17ecaae..404c734db8 100644 --- a/wp-content/themes/twentyten/comments.php +++ b/wp-content/themes/twentyten/comments.php @@ -1,8 +1,3 @@ -
@@ -17,7 +12,11 @@ ?> -

+

' . get_the_title() . ''), + sprintf(__('One Response to %s', 'twentyten'), '' . get_the_title() . ''), + sprintf(__('%% Responses to %s', 'twentyten'), '' . get_the_title() . '') + ); ?>

1 ) : // are there comments to navigate through ?>
diff --git a/wp-content/themes/twentyten/header.php b/wp-content/themes/twentyten/header.php index 2bc9b2784f..fe2e256e98 100644 --- a/wp-content/themes/twentyten/header.php +++ b/wp-content/themes/twentyten/header.php @@ -1,8 +1,8 @@ > - <?php - if ( is_single() ) { + <title><?php + if ( is_single() ) { single_post_title(); echo ' | '; bloginfo('name'); } elseif ( is_home() || is_front_page() ) { bloginfo('name'); echo ' | '; bloginfo('description'); twentyten_the_page_number(); @@ -15,7 +15,7 @@ } else { wp_title(''); echo ' | '; bloginfo('name'); twentyten_the_page_number(); } - ?> + ?> diff --git a/wp-content/themes/twentyten/index.php b/wp-content/themes/twentyten/index.php index e12aa8050f..cee8d62142 100644 --- a/wp-content/themes/twentyten/index.php +++ b/wp-content/themes/twentyten/index.php @@ -3,15 +3,7 @@
- -

-
-

- -
- +
diff --git a/wp-content/themes/twentyten/loop.php b/wp-content/themes/twentyten/loop.php index 92b8ded076..475a96dd89 100644 --- a/wp-content/themes/twentyten/loop.php +++ b/wp-content/themes/twentyten/loop.php @@ -1,9 +1,9 @@ -max_num_pages > 1 ) { ?> +max_num_pages > 1 ) : ?> - +
@@ -16,112 +16,132 @@ - -
> -

+ +
> +

-
- - - - -
+
+ Posted on %3$s by %6$s', 'twentyten'), + get_permalink(), + esc_attr( get_the_time() ), + get_the_date(), + get_author_posts_url( get_the_author_meta('ID') ), + sprintf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ), + get_the_author() + ); + ?> +
-
-
- $post->ID, 'post_type' => 'attachment', 'post_mime_type' => 'image', 'orderby' => 'menu_order', 'order' => 'ASC', 'numberposts' => 999) ); - $total_images = count($images); - $image = array_shift($images); - echo wp_get_attachment_image( $image->ID, 'thumbnail' ); - ?> -
-

%2$s photos.', 'twentyten'), 'href="' . get_permalink() . '" title="' . sprintf( esc_attr__('Permalink to %s', 'twentyten'), the_title_attribute('echo=0') ) . '" rel="bookmark"', $total_images ); ?>

+
+
+ $post->ID, 'post_type' => 'attachment', 'post_mime_type' => 'image', 'orderby' => 'menu_order', 'order' => 'ASC', 'numberposts' => 999) ); + $total_images = count($images); + $image = array_shift($images); + echo wp_get_attachment_image( $image->ID, 'thumbnail' ); + ?> +
+

%2$s photos.', 'twentyten'), + 'href="' . get_permalink() . '" title="' . sprintf( esc_attr__('Permalink to %s', 'twentyten'), the_title_attribute('echo=0') ) . '" rel="bookmark"', + $total_images + ); ?>

- -
+ +
-
- - - - - |\n\t\t\t\t\t\t", "\n\t\t\t\t\t\n" ); ?> -
-
+
+ + + | + + |\n\t\t\t\t\t\t", "\n\t\t\t\t\t\n" ); ?> +
+
- -
> - -
- →', 'twentyten' ) ); ?> -
- -
- →', 'twentyten' ) ); ?> -
- + +
> + +
+ →', 'twentyten' ) ); ?> +
+ +
+ →', 'twentyten' ) ); ?> +
+ -
- - - - - - - |\n\t\t\t\t\t\t", "\n\t\t\t\t\t\n" ); ?> -
-
+
+ Posted on %3$s by %6$s', 'twentyten'), + get_permalink(), + esc_attr( get_the_time() ), + get_the_date(), + get_author_posts_url( get_the_author_meta('ID') ), + sprintf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ), + get_the_author() + ); + ?> + | + + |\n\t\t\t\t\t\t", "\n\t\t\t\t\t\n" ); ?> +
+
- -
> -

+ +
> +

-
- - - - -
+
+ Posted on %3$s by %6$s', 'twentyten'), + get_permalink(), + esc_attr( get_the_time() ), + get_the_date(), + get_author_posts_url( get_the_author_meta('ID') ), + sprintf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ), + get_the_author() + ); + ?> +
- -
- →', 'twentyten' ) ); ?> -
- -
- →', 'twentyten' ) ); ?> - ' . __( 'Pages:', 'twentyten' ) . '&after=
'); ?> -
- + +
+ →', 'twentyten' ) ); ?> +
+ +
+ →', 'twentyten' ) ); ?> + ' . __( 'Pages:', 'twentyten' ) . '&after=
'); ?> +
+ -
- - - - - - - - - |\n\t\t\t\t\t\t", "\n\t\t\t\t\t\n" ); ?> -
-
+
+ + | + + + + | + + + |\n\t\t\t\t\t\t", "\n\t\t\t\t\t\n" ); ?> +
+
- + - + -max_num_pages > 1 ) { ?> +max_num_pages > 1 ) : ?> - \ No newline at end of file + \ No newline at end of file diff --git a/wp-content/themes/twentyten/search.php b/wp-content/themes/twentyten/search.php index 6e83f1edd1..e84fb82abb 100644 --- a/wp-content/themes/twentyten/search.php +++ b/wp-content/themes/twentyten/search.php @@ -4,7 +4,7 @@
-

+

' . get_search_query() . ''); ?>

diff --git a/wp-content/themes/twentyten/single.php b/wp-content/themes/twentyten/single.php index 368bf0b5e4..9c35716e01 100644 --- a/wp-content/themes/twentyten/single.php +++ b/wp-content/themes/twentyten/single.php @@ -42,12 +42,22 @@
- permalink. Follow any comments here with the RSS feed for this post.', 'twentyten' ), - get_the_category_list(', '), - get_the_tag_list( __( ' and tagged ', 'twentyten' ), ', ', '' ), - get_permalink(), - the_title_attribute('echo=0'), - get_post_comments_feed_link() ); ?> + permalink. Follow any comments here with the RSS feed for this post.', 'twentyten' ); + } else { + $utility_text = __( 'This entry was posted in %1$s. Bookmark the permalink. Follow any comments here with the RSS feed for this post.', 'twentyten' ); + } + printf( + $utility_text, + get_the_category_list(', '), + $tag_list, + get_permalink(), + the_title_attribute('echo=0'), + get_post_comments_feed_link() + ); + ?> ", "" ); ?>
diff --git a/wp-content/themes/twentyten/tag.php b/wp-content/themes/twentyten/tag.php index 081379ec0d..7bdd50285c 100644 --- a/wp-content/themes/twentyten/tag.php +++ b/wp-content/themes/twentyten/tag.php @@ -5,7 +5,9 @@ -

+

' . single_tag_title('', false) . ''); + ?>