Ticket #45161: 45161.2.diff
| File 45161.2.diff, 7.2 KB (added by , 6 years ago) |
|---|
-
src/wp-admin/edit-form-blocks.php
115 115 ); 116 116 } 117 117 118 // Prepare Jed locale data.119 $locale_data = wp_get_jed_locale_data( 'default' );120 wp_add_inline_script(121 'wp-i18n',122 'wp.i18n.setLocaleData( ' . wp_json_encode( $locale_data ) . ' );'123 );124 125 118 // Preload server-registered block schemas. 126 119 wp_add_inline_script( 127 120 'wp-blocks', -
src/wp-includes/class.wp-scripts.php
532 532 } 533 533 534 534 $output = '(function( translations ){' . 535 'wp.i18n.setLocaleData( translations.locale_data, "' . $domain . '" );' . 535 'translations.locale_data.messages[""].domain = "' . $domain . '";' . 536 'wp.i18n.setLocaleData( translations.locale_data.messages, "' . $domain . '" );' . 536 537 '})(' . $json_translations . ');'; 537 538 538 539 if ( $echo ) { -
src/wp-includes/script-loader.php
320 320 'html-entities' => array( 'wp-polyfill' ), 321 321 'i18n' => array( 'wp-polyfill' ), 322 322 'is-shallow-equal' => array( 'wp-polyfill' ), 323 'keycodes' => array( 'lodash', 'wp-polyfill' ),323 'keycodes' => array( 'lodash', 'wp-polyfill', 'wp-i18n' ), 324 324 'list-reusable-blocks' => array( 325 325 'lodash', 326 326 'wp-api-fetch', … … 363 363 'wordcount' => array( 'wp-polyfill' ), 364 364 ); 365 365 366 $package_translations = array( 367 'api-fetch' => 'default', 368 'blocks' => 'default', 369 'block-library' => 'default', 370 'components' => 'default', 371 'edit-post' => 'default', 372 'editor' => 'default', 373 'format-library' => 'default', 374 'keycodes' => 'default', 375 'list-reusable-blocks' => 'default', 376 'nux' => 'default', 377 ); 378 366 379 foreach ( $packages_dependencies as $package => $dependencies ) { 367 380 $handle = 'wp-' . $package; 368 381 $path = "/wp-includes/js/dist/$package$suffix.js"; 369 382 370 383 $scripts->add( $handle, $path, $dependencies, false, 1 ); 384 385 if ( isset( $package_translations[ $package ] ) ) { 386 $scripts->set_translations( $handle, $package_translations[ $package ] ); 387 } 371 388 } 372 389 } 373 390 -
tests/phpunit/tests/dependencies/scripts.php
777 777 778 778 $expected = "<script type='text/javascript' src='/wp-includes/js/dist/wp-i18n.js'></script>"; 779 779 $expected .= "\n<script type='text/javascript'>\n(function( translations ){" . 780 "wp.i18n.setLocaleData( translations.locale_data, \"default\" );" . 781 "})(" . file_get_contents( DIR_TESTDATA . '/languages/en_US-813e104eb47e13dd4cc5af844c618754.json' ) . ");\n</script>\n"; 780 "translations.locale_data.messages[\"\"].domain = \"default\";" . 781 "wp.i18n.setLocaleData( translations.locale_data.messages, \"default\" );" . 782 "})(" . file_get_contents( DIR_TESTDATA . '/languages/en_US-813e104eb47e13dd4cc5af844c618754.json' ) . ");\n</script>\n"; 782 783 $expected .= "<script type='text/javascript' src='/wp-includes/js/script.js'></script>\n"; 783 784 784 785 $this->assertEquals( $expected, get_echo( 'wp_print_scripts' ) ); … … 794 795 795 796 $expected = "<script type='text/javascript' src='/wp-includes/js/dist/wp-i18n.js'></script>"; 796 797 $expected .= "\n<script type='text/javascript'>\n(function( translations ){" . 797 "wp.i18n.setLocaleData( translations.locale_data, \"internationalized-plugin\" );" . 798 "translations.locale_data.messages[\"\"].domain = \"internationalized-plugin\";" . 799 "wp.i18n.setLocaleData( translations.locale_data.messages, \"internationalized-plugin\" );" . 798 800 "})(" . file_get_contents( DIR_TESTDATA . '/languages/plugins/internationalized-plugin-en_US-2f86cb96a0233e7cb3b6f03ad573be0b.json' ) . ");\n</script>\n"; 799 801 $expected .= "<script type='text/javascript' src='/wp-content/plugins/my-plugin/js/script.js'></script>\n"; 800 802 … … 811 813 812 814 $expected = "<script type='text/javascript' src='/wp-includes/js/dist/wp-i18n.js'></script>"; 813 815 $expected .= "\n<script type='text/javascript'>\n(function( translations ){" . 814 "wp.i18n.setLocaleData( translations.locale_data, \"internationalized-theme\" );" . 816 "translations.locale_data.messages[\"\"].domain = \"internationalized-theme\";" . 817 "wp.i18n.setLocaleData( translations.locale_data.messages, \"internationalized-theme\" );" . 815 818 "})(" . file_get_contents( DIR_TESTDATA . '/languages/themes/internationalized-theme-en_US-2f86cb96a0233e7cb3b6f03ad573be0b.json' ) . ");\n</script>\n"; 816 819 $expected .= "<script type='text/javascript' src='/wp-content/themes/my-theme/js/script.js'></script>\n"; 817 820 … … 828 831 829 832 $expected = "<script type='text/javascript' src='/wp-includes/js/dist/wp-i18n.js'></script>"; 830 833 $expected .= "\n<script type='text/javascript'>\n(function( translations ){" . 831 "wp.i18n.setLocaleData( translations.locale_data, \"admin\" );" . 834 "translations.locale_data.messages[\"\"].domain = \"admin\";" . 835 "wp.i18n.setLocaleData( translations.locale_data.messages, \"admin\" );" . 832 836 "})(" . file_get_contents( DIR_TESTDATA . '/languages/admin-en_US-script-handle.json' ) . ");\n</script>\n"; 833 837 $expected .= "<script type='text/javascript' src='/wp-admin/js/script.js'></script>\n"; 834 838 … … 876 880 877 881 $expected = "<script type='text/javascript' src='/wp-includes/js/dist/wp-i18n.js'></script>"; 878 882 $expected .= "\n<script type='text/javascript'>\n(function( translations ){" . 879 "wp.i18n.setLocaleData( translations.locale_data, \"default\" );" . 883 "translations.locale_data.messages[\"\"].domain = \"default\";" . 884 "wp.i18n.setLocaleData( translations.locale_data.messages, \"default\" );" . 880 885 "})(" . file_get_contents( DIR_TESTDATA . '/languages/en_US-813e104eb47e13dd4cc5af844c618754.json' ) . ");\n</script>\n"; 881 886 $expected .= "<script type='text/javascript' src='/wp-includes/js/script.js'></script>\n"; 882 887 … … 895 900 896 901 $expected = "<script type='text/javascript' src='/wp-includes/js/dist/wp-i18n.js'></script>"; 897 902 $expected .= "\n<script type='text/javascript'>\n(function( translations ){" . 898 "wp.i18n.setLocaleData( translations.locale_data, \"default\" );" . 903 "translations.locale_data.messages[\"\"].domain = \"default\";" . 904 "wp.i18n.setLocaleData( translations.locale_data.messages, \"default\" );" . 899 905 "})(" . file_get_contents( DIR_TESTDATA . '/languages/en_US-813e104eb47e13dd4cc5af844c618754.json' ) . ");\n</script>\n"; 900 906 $expected .= "<script type='text/javascript' src='/wp-includes/js/script.js'></script>\n"; 901 907 $expected .= "<script type='text/javascript' src='/wp-includes/js/script2.js'></script>\n";