Ticket #37819: 37819.2.diff

src/wp-includes/l10n.php

@@ -557 +557 @@
         if ( !$mo->import_from_file( $mofile ) ) return false;
 
         if ( isset( $l10n[$domain] ) )
-                $mo->merge_with( $l10n[$domain] );
+                $mo->merge_originals_with( $l10n[$domain] );
 
         unset( $l10n_unloaded[ $domain ] );
 
-        $l10n[$domain] = &$mo;
+        $l10n[$domain] = $mo;
 
         return true;
 }
@@ -1148 +1148 @@
                 return false;
         }
         return $wp_locale->is_rtl();
-}
- No newline at end of file
+}

tests/phpunit/data/languages/internationalized-plugin/internationalized-plugin-fr_FR.po

@@ +1 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: internationalized plugin\n"
+"POT-Creation-Date: 2016-09-19 07:36+0100\n"
+"PO-Revision-Date: 2016-09-22 11:01+0100\n"
+"Last-Translator: imath <mathchristo@yahoo.fr>\n"
+"Language-Team: \n"
+"Language: fr_FR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.5.7\n"
+"X-Poedit-Basepath: .\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Poedit-KeywordsList: __;_e;_x:1,2c;_ex:1,2c;_n:1,2;_nx:1,2,4c;_n_noop:1,2;"
+"_nx_noop:1,2,3c;esc_attr__;esc_html__;esc_attr_e;esc_html_e;esc_attr_x:1,2c;"
+"esc_html_x:1,2c\n"
+"X-Textdomain-Support: yes\n"
+"X-Poedit-SearchPath-0: .\n"
+
+#: internationalized-plugin.php:11
+msgid "This is a dummy plugin"
+msgstr "Ceci est un plugin factice"

tests/phpunit/data/languages/plugins/internationalized-plugin-fr_FR.po

@@ +1 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: internationalized plugin\n"
+"POT-Creation-Date: 2016-09-19 07:36+0100\n"
+"PO-Revision-Date: 2016-09-22 11:19+0100\n"
+"Last-Translator: imath <mathchristo@yahoo.fr>\n"
+"Language-Team: \n"
+"Language: fr_FR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.5.7\n"
+"X-Poedit-Basepath: .\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Poedit-KeywordsList: __;_e;_x:1,2c;_ex:1,2c;_n:1,2;_nx:1,2,4c;_n_noop:1,2;"
+"_nx_noop:1,2,3c;esc_attr__;esc_html__;esc_attr_e;esc_html_e;esc_attr_x:1,2c;"
+"esc_html_x:1,2c\n"
+"X-Textdomain-Support: yes\n"
+"X-Poedit-SearchPath-0: .\n"
+
+#: internationalized-plugin.php:11
+msgid "This is a dummy plugin"
+msgstr "Ceci est un dummy plugin"
+
+#: internationalized-plugin.php:15
+msgid "This is another string"
+msgstr "Ceci est une autre chaine de caractères"
+
+#: internationalized-plugin.php:19
+msgid "This is a third string"
+msgstr "Ceci est une troisième chaine de caractères"

tests/phpunit/data/plugins/internationalized-plugin.php

@@ -10 +10 @@
 function i18n_plugin_test() {
         return __( 'This is a dummy plugin', 'internationalized-plugin' );
 }
+
+function i18n_plugin_test_2() {
+        return __( 'This is another string', 'internationalized-plugin' );
+}
+
+function i18n_plugin_test_3() {
+        return __( 'This is a third string', 'internationalized-plugin' );
+}

tests/phpunit/data/plugins/internationalized-plugin/internationalized-plugin-fr_FR.po

@@ +1 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: internationalized plugin\n"
+"POT-Creation-Date: 2016-09-19 07:36+0100\n"
+"PO-Revision-Date: 2016-09-22 11:23+0100\n"
+"Last-Translator: imath <mathchristo@yahoo.fr>\n"
+"Language-Team: \n"
+"Language: fr_FR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.5.7\n"
+"X-Poedit-Basepath: .\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Poedit-KeywordsList: __;_e;_x:1,2c;_ex:1,2c;_n:1,2;_nx:1,2,4c;_n_noop:1,2;"
+"_nx_noop:1,2,3c;esc_attr__;esc_html__;esc_attr_e;esc_html_e;esc_attr_x:1,2c;"
+"esc_html_x:1,2c\n"
+"X-Textdomain-Support: yes\n"
+"X-Poedit-SearchPath-0: .\n"
+
+#: internationalized-plugin.php:11
+msgid "This is a dummy plugin"
+msgstr "Ceci est un dummy plugin"
+
+#: internationalized-plugin.php:15
+msgid "This is another string"
+msgstr "Ceci est une autre chaine de caractères"
+
+#: internationalized-plugin.php:19
+msgid "This is a third string"
+msgstr "Ceci est la chaine de caractères numéro trois"

tests/phpunit/tests/l10n/loadTextdomainJustInTime.php

@@ -48 +48 @@
                 return 'de_DE';
         }
 
+        public function filter_set_locale_to_french() {
+                return 'fr_FR';
+        }
+
         /**
          * @ticket 34114
          */
@@ -141 +145 @@
                 $this->assertSame( 'Das ist ein Dummy Plugin', $expected_output_final );
                 $this->assertTrue( $is_textdomain_loaded_final );
         }
+
+        /**
+         * @ticket 37819
+         */
+        public function test_should_allow_custom_text_domain() {
+                add_filter( 'locale', array( $this, 'filter_set_locale_to_french' ) );
+
+                require_once DIR_TESTDATA . '/plugins/internationalized-plugin.php';
+
+                $this->assertSame( 'Ceci est un dummy plugin', i18n_plugin_test() );
+
+                $this->assertSame( 'Ceci est une autre chaine de caractères', i18n_plugin_test_2() );
+
+                load_textdomain( 'internationalized-plugin', WP_LANG_DIR . '/internationalized-plugin/internationalized-plugin-fr_FR.mo' );
+
+                $this->assertSame( 'Ceci est un plugin factice', i18n_plugin_test() );
+
+                $this->assertSame( 'Ceci est une autre chaine de caractères', i18n_plugin_test_2() );
+
+                // Reset for next tests
+                unload_textdomain( 'internationalized-plugin' );
+
+                remove_filter( 'locale', array( $this, 'filter_set_locale_to_french' ) );
+        }
+
+        /**
+         * @ticket 37819
+         */
+        public function test_should_allow_multiple_custom_text_domain_full_entries_first() {
+                add_filter( 'locale', array( $this, 'filter_set_locale_to_french' ) );
+
+                $expected = array(
+                        'wp-lang-dir' => array(
+                                'Ceci est un dummy plugin',
+                                'Ceci est une autre chaine de caractères',
+                                'Ceci est une troisième chaine de caractères',
+                        ),
+                        'custom-dir-1' => array(
+                                'Ceci est un dummy plugin',
+                                'Ceci est une autre chaine de caractères',
+                                'Ceci est la chaine de caractères numéro trois', // Should be added by DIR_TESTDATA . '/plugins/*'
+                        ),
+                        'custom-dir-2' => array(
+                                'Ceci est un plugin factice',                    // Should be added by WP_LANG_DIR . '/internationalized-plugin/*'
+                                'Ceci est une autre chaine de caractères',       // Should be kept from WP_LANG_DIR/plugins/' (as this entry is missing in WP_LANG_DIR . '/internationalized-plugin/*' )
+                                'Ceci est la chaine de caractères numéro trois', // Should be kept from DIR_TESTDATA . '/plugins/*' (as this entry is missing in WP_LANG_DIR . '/internationalized-plugin/*' )
+                        ),
+                );
+
+                // Check WP_LANG_DIR/plugins/*.mo is loaded "just in time"
+                $this->assertSame( $expected['wp-lang-dir'], array( i18n_plugin_test(), i18n_plugin_test_2(), i18n_plugin_test_3() ) );
+
+                require_once DIR_TESTDATA . '/plugins/internationalized-plugin.php';
+
+                // Check overriding with a custom file containing all entries is ok
+                load_textdomain( 'internationalized-plugin', DIR_TESTDATA . '/plugins/internationalized-plugin/internationalized-plugin-fr_FR.mo' );
+
+                $this->assertSame( $expected['custom-dir-1'], array( i18n_plugin_test(), i18n_plugin_test_2(), i18n_plugin_test_3() ) );
+
+                // Check overriding with a custom file containing incomplete entries is ok
+                load_textdomain( 'internationalized-plugin', WP_LANG_DIR . '/internationalized-plugin/internationalized-plugin-fr_FR.mo' );
+
+                $this->assertSame( $expected['custom-dir-2'], array( i18n_plugin_test(), i18n_plugin_test_2(), i18n_plugin_test_3() ) );
+
+                // Reset for next tests
+                unload_textdomain( 'internationalized-plugin' );
+
+                remove_filter( 'locale', array( $this, 'filter_set_locale_to_french' ) );
+        }
+
+        /**
+         * @ticket 37819
+         */
+        public function test_should_allow_multiple_custom_text_domain_incomplete_entries_first() {
+                add_filter( 'locale', array( $this, 'filter_set_locale_to_french' ) );
+
+                $expected = array(
+                        'wp-lang-dir' => array(
+                                'Ceci est un dummy plugin',
+                                'Ceci est une autre chaine de caractères',
+                                'Ceci est une troisième chaine de caractères',
+                        ),
+                        'custom-dir-1' => array(
+                                'Ceci est un plugin factice',                   // Should be added by WP_LANG_DIR . '/internationalized-plugi/*'
+                                'Ceci est une autre chaine de caractères',      // Should be kept from WP_LANG_DIR/plugins/' (as this entry is missing in WP_LANG_DIR . '/internationalized-plugin/*' )
+                                'Ceci est une troisième chaine de caractères',  // Should be kept from WP_LANG_DIR/plugins/' (as this entry is missing in WP_LANG_DIR . '/internationalized-plugin/*' )
+                        ),
+                        'custom-dir-2' => array(
+                                'Ceci est un dummy plugin',                      // Should be added by DIR_TESTDATA . '/plugins/*'
+                                'Ceci est une autre chaine de caractères',       // Shouldn't change as entries are the same
+                                'Ceci est la chaine de caractères numéro trois', // Should be added by DIR_TESTDATA . '/plugins/*'
+                        ),
+                );
+
+                // Check WP_LANG_DIR/plugins/*.mo is loaded "just in time"
+                $this->assertSame( $expected['wp-lang-dir'], array( i18n_plugin_test(), i18n_plugin_test_2(), i18n_plugin_test_3() ) );
+
+                require_once DIR_TESTDATA . '/plugins/internationalized-plugin.php';
+
+                // Check overriding with a custom file containing incomplete entries is ok
+                load_textdomain( 'internationalized-plugin', WP_LANG_DIR . '/internationalized-plugin/internationalized-plugin-fr_FR.mo' );
+
+                $this->assertSame( $expected['custom-dir-1'], array( i18n_plugin_test(), i18n_plugin_test_2(), i18n_plugin_test_3() ) );
+
+                // Check overriding with a custom file containing full entries is ok
+                load_textdomain( 'internationalized-plugin', DIR_TESTDATA . '/plugins/internationalized-plugin/internationalized-plugin-fr_FR.mo' );
+
+                $this->assertSame( $expected['custom-dir-2'], array( i18n_plugin_test(), i18n_plugin_test_2(), i18n_plugin_test_3() ) );
+
+                // Reset for next tests
+                unload_textdomain( 'internationalized-plugin' );
+
+                remove_filter( 'locale', array( $this, 'filter_set_locale_to_french' ) );
+        }
 }