Ticket #44578: 44578.diff

src/wp-includes/rest-api/class-wp-rest-server.php

@@ -325 +325 @@
 
                 $result = $this->check_authentication();
 
+                $restore_locale = false;
+
+                if ( isset( $_GET['_locale'] ) && 'user' === $_GET['_locale'] && is_user_logged_in() ) {
+                        $restore_locale = switch_to_locale( get_user_locale() );
+                }
+
                 if ( ! is_wp_error( $result ) ) {
                         $result = $this->dispatch( $request );
                 }
@@ -417 +423 @@
                         } else {
                                 echo $result;
                         }
+
+                        if ( $restore_locale ) {
+                                restore_previous_locale();
+                        }
                 }
                 return null;
         }

tests/phpunit/data/languages/de_DE.po

@@ -2 +2 @@
 # This file is distributed under the same license as the 4.9.x package.
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2018-08-13 19:19+0300\n"
+"PO-Revision-Date: 2018-09-05 00:19-0400\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -48 +48 @@
 #: wp-includes/user.php:3445
 msgid "[%1$s] Confirm Action: %2$s"
 msgstr "[%1$s] Aktion bestätigen: %2$s"
+
+#: wp-includes/post.php:1444
+msgctxt "post type general name"
+msgid "Posts"
+msgstr "Beiträge"

tests/phpunit/data/languages/es_ES.po

@@ -2 +2 @@
 # This file is distributed under the same license as the Development (4.9.x) package.
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2018-08-13 19:19+0300\n"
+"PO-Revision-Date: 2018-09-04 23:52-0400\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -44 +44 @@
 #: wp-includes/user.php:3445
 msgid "[%1$s] Confirm Action: %2$s"
 msgstr "[%1$s] Confirma la acción: %2$s"
+
+#: wp-includes/post.php:1444
+msgctxt "post type general name"
+msgid "Posts"
+msgstr "Entradas"

tests/phpunit/tests/rest-api/rest-server.php

@@ -1177 +1177 @@
                 );
         }
 
+        public function test_locale_user() {
+
+                $locale = get_locale();
+
+                $user = self::factory()->user->create( array(
+                        'locale' => 'es_ES',
+                        'role'   => 'administrator',
+                ) );
+                wp_set_current_user( $user );
+
+                $_GET['_locale']      = 'user';
+                $_REQUEST['_wpnonce'] = wp_create_nonce( 'wp_rest' );
+
+                rest_get_server()->serve_request( '/wp/v2/types/post' );
+                $json = rest_get_server()->sent_body;
+
+                $decoded = json_decode( $json, true );
+
+                $this->assertInternalType( 'array', $decoded );
+                $this->assertArrayHasKey( 'name', $decoded );
+                $this->assertEquals( 'Entradas', $decoded['name'] );
+                $this->assertEquals( $locale, get_locale() );
+
+                restore_previous_locale();
+        }
+
+        public function test_locale_user_none_set() {
+
+                $locale = get_locale();
+
+                $user = self::factory()->user->create( array(
+                        'role' => 'administrator',
+                ) );
+                wp_set_current_user( $user );
+
+                $_GET['_locale']      = 'user';
+                $_REQUEST['_wpnonce'] = wp_create_nonce( 'wp_rest' );
+
+                rest_get_server()->serve_request( '/wp/v2/types/post' );
+                $json = rest_get_server()->sent_body;
+
+                $decoded = json_decode( $json, true );
+
+                $this->assertInternalType( 'array', $decoded );
+                $this->assertArrayHasKey( 'name', $decoded );
+                $this->assertEquals( 'Posts', $decoded['name'] );
+                $this->assertEquals( $locale, get_locale() );
+
+                restore_previous_locale();
+        }
+
+        public function test_locale_user_logged_out() {
+
+                $_GET['_locale']      = 'user';
+                $_REQUEST['_wpnonce'] = wp_create_nonce( 'wp_rest' );
+
+                rest_get_server()->serve_request( '/wp/v2/types/post' );
+                $json = rest_get_server()->sent_body;
+
+                $decoded = json_decode( $json, true );
+
+                $this->assertInternalType( 'array', $decoded );
+                $this->assertArrayHasKey( 'name', $decoded );
+                $this->assertEquals( 'Posts', $decoded['name'] );
+
+                restore_previous_locale();
+        }
+
+        public function test_locale_site() {
+
+                $locale = get_locale();
+
+                $user = self::factory()->user->create( array(
+                        'role' => 'administrator',
+                ) );
+                wp_set_current_user( $user );
+
+                $_GET['_locale']      = 'site';
+                $_REQUEST['_wpnonce'] = wp_create_nonce( 'wp_rest' );
+
+                rest_get_server()->serve_request( '/wp/v2/types/post' );
+                $json = rest_get_server()->sent_body;
+
+                $decoded = json_decode( $json, true );
+
+                $this->assertInternalType( 'array', $decoded );
+                $this->assertArrayHasKey( 'name', $decoded );
+                $this->assertEquals( 'Posts', $decoded['name'] );
+                $this->assertEquals( $locale, get_locale() );
+
+                restore_previous_locale();
+        }
+
+        public function test_locale_site_logged_out() {
+
+                $_GET['_locale']      = 'site';
+                $_REQUEST['_wpnonce'] = wp_create_nonce( 'wp_rest' );
+
+                rest_get_server()->serve_request( '/wp/v2/types/post' );
+                $json = rest_get_server()->sent_body;
+
+                $decoded = json_decode( $json, true );
+
+                $this->assertInternalType( 'array', $decoded );
+                $this->assertArrayHasKey( 'name', $decoded );
+                $this->assertEquals( 'Posts', $decoded['name'] );
+
+                restore_previous_locale();
+        }
+
+        public function test_locale_site_already_switched_retains_switch() {
+
+                switch_to_locale( 'de_DE' );
+
+                $user = self::factory()->user->create( array(
+                        'locale' => 'es_ES',
+                        'role'   => 'administrator',
+                ) );
+                wp_set_current_user( $user );
+
+                $_GET['_locale']      = 'site';
+                $_REQUEST['_wpnonce'] = wp_create_nonce( 'wp_rest' );
+
+                rest_get_server()->serve_request( '/wp/v2/types/post' );
+                $json = rest_get_server()->sent_body;
+
+                $decoded = json_decode( $json, true );
+
+                $this->assertInternalType( 'array', $decoded );
+                $this->assertArrayHasKey( 'name', $decoded );
+                $this->assertEquals( 'Beiträge', $decoded['name'] );
+                $this->assertEquals( 'de_DE', get_locale() );
+
+                restore_previous_locale();
+        }
+
         /**
          * Helper to setup a users and auth cookie global for the
          * rest_send_refreshed_nonce related tests.