Changeset 30936

Timestamp:

12/16/2014 10:01:32 PM (11 years ago)

Author:

SergeyBiryukov

Message:

Merge Twenty Fifteen commits [30834], [30845] to the 4.1 branch.

Location:

branches/4.1/src/wp-content/themes/twentyfifteen

Files:

• languages/twentyfifteen.pot (modified) (6 diffs)
• single.php (modified) (1 diff)

branches/4.1/src/wp-content/themes/twentyfifteen/languages/twentyfifteen.pot

@@ -5 +5 @@
 "Project-Id-Version: Twenty Fifteen 1.0\n"
 "Report-Msgid-Bugs-To: http://wordpress.org/tags/twentyfifteen\n"
-"POT-Creation-Date: 2014-12-10 23:27:35+00:00\n"
+"POT-Creation-Date: 2014-12-14 12:26:59+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -117 +117 @@
 #. by Noto Sans, translate this to 'off'. Do not translate into your own
 #. language.
-#: functions.php:157
+#: functions.php:158
 msgctxt "Noto Sans font: on or off"
 msgid "on"
@@ -125 +125 @@
 #. by Noto Serif, translate this to 'off'. Do not translate into your own
 #. language.
-#: functions.php:162
+#: functions.php:163
 msgctxt "Noto Serif font: on or off"
 msgid "on"
@@ -133 +133 @@
 #. by Inconsolata, translate this to 'off'. Do not translate into your own
 #. language.
-#: functions.php:167
+#: functions.php:168
 msgctxt "Inconsolata font: on or off"
 msgid "on"
@@ -141 +141 @@
 #. language, translate this to 'greek', 'cyrillic', 'devanagari' or
 #. 'vietnamese'. Do not translate into your own language.
-#: functions.php:172
+#: functions.php:173
 msgctxt "Add new subset (greek, cyrillic, devanagari, vietnamese)"
 msgid "no-subset"
 msgstr ""
 
-#: functions.php:226
+#: functions.php:231
 msgid "expand child menu"
 msgstr ""
 
-#: functions.php:227
+#: functions.php:232
 msgid "collapse child menu"
 msgstr ""
@@ -291 +291 @@
 
 #: single.php:33
-msgctxt "Next post link"
-msgid ""
-"<span class=\"meta-nav\">Next <span class=\"screen-reader-text\">post: </"
-"span></span><span class=\"post-title\">%title</span>"
+msgid "Next"
 msgstr ""
 
 #: single.php:34
-msgctxt "Previous post link"
-msgid ""
-"<span class=\"meta-nav\">Previous <span class=\"screen-reader-text\">post: </"
-"span></span><span class=\"post-title\">%title</span>"
+msgid "Next post:"
+msgstr ""
+
+#: single.php:36
+msgid "Previous"
+msgstr ""
+
+#: single.php:37
+msgid "Previous post:"
 msgstr ""
 

branches/4.1/src/wp-content/themes/twentyfifteen/single.php

@@ -31 +31 @@
             // Previous/next post navigation.
             the_post_navigation( array(
-                'next_text' => _x( '<span class="meta-nav">Next <span class="screen-reader-text">post: </span></span><span class="post-title">%title</span>', 'Next post link', 'twentyfifteen' ),
-                'prev_text' => _x( '<span class="meta-nav">Previous <span class="screen-reader-text">post: </span></span><span class="post-title">%title</span>', 'Previous post link', 'twentyfifteen' )
+                'next_text' => '<span class="meta-nav" aria-hidden="true">' . __( 'Next', 'twentyfifteen' ) . '</span> ' .
+                    '<span class="screen-reader-text">' . __( 'Next post:', 'twentyfifteen' ) . '</span> ' .
+                    '<span class="post-title">%title</span>',
+                'prev_text' => '<span class="meta-nav" aria-hidden="true">' . __( 'Previous', 'twentyfifteen' ) . '</span> ' .
+                    '<span class="screen-reader-text">' . __( 'Previous post:', 'twentyfifteen' ) . '</span> ' .
+                    '<span class="post-title">%title</span>',
             ) );