Changeset 43912 for branches/5.0/src/wp-admin/includes/upgrade.php

Timestamp:

11/21/2018 01:47:49 AM (8 years ago)

Author:

pento

Message:

Upgrade/Install: Split Sample Page, Hello World, and Privacy Policy content.

[43820] converted the content to blocks, but included block markers in the translateable strings, which made translations difficult to do accurately.

Props desrosj, dd32, ocean90.
See #45151.

File:

• branches/5.0/src/wp-admin/includes/upgrade.php (modified) (3 diffs)

branches/5.0/src/wp-admin/includes/upgrade.php

@@ -160 +160 @@
 
         if ( ! $first_post ) {
-            /* translators: %s: site link */
-            $first_post = __( '<!-- wp:paragraph -->
-<p>Welcome to %s. This is your first post. Edit or delete it, then start writing!</p>
-<!-- /wp:paragraph -->' );
+            $first_post = "<!-- wp:paragraph -->\n<p>" .
+                /* translators: first post content, %s: site link */
+                __( 'Welcome to %s. This is your first post. Edit or delete it, then start writing!' ) .
+                "</p>\n<!-- /wp:paragraph -->";
         }
 
@@ -174 +174 @@
         $first_post = str_replace( 'SITE_NAME', get_network()->site_name, $first_post );
     } else {
-        $first_post = __( '<!-- wp:paragraph -->
-<p>Welcome to WordPress. This is your first post. Edit or delete it, then start writing!</p>
-<!-- /wp:paragraph -->' );
+        $first_post = "<!-- wp:paragraph -->\n<p>" .
+            /* translators: first post content, %s: site link */
+            __( 'Welcome to WordPress. This is your first post. Edit or delete it, then start writing!' ) .
+            "</p>\n<!-- /wp:paragraph -->";
     }
 
@@ -226 +227 @@
         $first_page = get_site_option( 'first_page' );
 
-    $first_page = ! empty( $first_page ) ? $first_page : sprintf( __( "<!-- wp:paragraph -->
-<p>This is an example page. It's different from a blog post because it will stay in one place and will show up in your site navigation (in most themes). Most people start with an About page that introduces them to potential site visitors. It might say something like this:</p>
-<!-- /wp:paragraph -->
-
-<!-- wp:quote -->
-<blockquote class=\"wp-block-quote\"><p>Hi there! I'm a bike messenger by day, aspiring actor by night, and this is my website. I live in Los Angeles, have a great dog named Jack, and I like pi&#241;a coladas. (And gettin' caught in the rain.)</p></blockquote>
-<!-- /wp:quote -->
-
-<!-- wp:paragraph -->
-<p>...or something like this:</p>
-<!-- /wp:paragraph -->
-
-<!-- wp:quote -->
-<blockquote class=\"wp-block-quote\"><p>The XYZ Doohickey Company was founded in 1971, and has been providing quality doohickeys to the public ever since. Located in Gotham City, XYZ employs over 2,000 people and does all kinds of awesome things for the Gotham community.</p></blockquote>
-<!-- /wp:quote -->
-
-<!-- wp:paragraph -->
-<p>As a new WordPress user, you should go to <a href=\"%s\">your dashboard</a> to delete this page and create new pages for your content. Have fun!</p>
-<!-- /wp:paragraph -->" ), admin_url() );
+    if ( empty( $first_page ) ) {
+        $first_page = "<!-- wp:paragraph -->\n<p>";
+        /* translators: first page content */
+        $first_page .= __( "This is an example page. It's different from a blog post because it will stay in one place and will show up in your site navigation (in most themes). Most people start with an About page that introduces them to potential site visitors. It might say something like this:" );
+        $first_page .= "</p>\n<!-- /wp:paragraph -->\n\n";
+
+        $first_page .= "<!-- wp:quote -->\n<blockquote class=\"wp-block-quote\"><p>";
+        /* translators: first page content */
+        $first_page .= __( "Hi there! I'm a bike messenger by day, aspiring actor by night, and this is my website. I live in Los Angeles, have a great dog named Jack, and I like pi&#241;a coladas. (And gettin' caught in the rain.)" );
+        $first_page .= "</p></blockquote>\n<!-- /wp:quote -->\n\n";
+
+        $first_page .= "<!-- wp:paragraph -->\n<p>";
+        /* translators: first page content */
+        $first_page .= __( '...or something like this:' );
+        $first_page .= "</p>\n<!-- /wp:paragraph -->\n\n";
+
+        $first_page .= "<!-- wp:quote -->\n<blockquote class=\"wp-block-quote\"><p>";
+        /* translators: first page content */
+        $first_page .= __( 'The XYZ Doohickey Company was founded in 1971, and has been providing quality doohickeys to the public ever since. Located in Gotham City, XYZ employs over 2,000 people and does all kinds of awesome things for the Gotham community.' );
+        $first_page .= "</p></blockquote>\n<!-- /wp:quote -->\n\n";
+
+        $first_page .= "<!-- wp:paragraph -->\n<p>";
+        $first_page .= sprintf(
+            /* translators: first page content, %s: site admin URL */
+            __( 'As a new WordPress user, you should go to <a href="%s">your dashboard</a> to delete this page and create new pages for your content. Have fun!' ),
+            admin_url()
+        );
+        $first_page .= "</p>\n<!-- /wp:paragraph -->";
+    }
 
     $first_post_guid = get_option('home') . '/?page_id=2';