Ticket #58318: load-theme-textdomain.diff

src/wp-content/themes/twentyeleven/functions.php

@@ -79 +79 @@
                  * If you're building a theme based on Twenty Eleven, use
                  * a find and replace to change 'twentyeleven' to the name
                  * of your theme in all the template files.
+                 * Manual loading of text domain is not required after the introduction of 
+                 * just in time loading for translations in WordPress version 4.6.
                  */
-                load_theme_textdomain( 'twentyeleven', get_template_directory() . '/languages' );
+                if ( version_compare( $GLOBALS['wp_version'], '4.6', '<' ) ) {
+                        load_theme_textdomain( 'twentyeleven', get_template_directory() . '/languages' );
+                }
 
                 // This theme styles the visual editor with editor-style.css to match the theme style.
                 add_editor_style();

src/wp-content/themes/twentyfifteen/functions.php

@@ -57 +57 @@
                  * Make theme available for translation.
                  * Translations can be filed at WordPress.org. See: https://translate.wordpress.org/projects/wp-themes/twentyfifteen
                  * If you're building a theme based on twentyfifteen, use a find and replace
-                 * to change 'twentyfifteen' to the name of your theme in all the template files
+                 * to change 'twentyfifteen' to the name of your theme in all the template files.
+                 * Manual loading of text domain is not required after the introduction of 
+                 * just in time loading for translations in WordPress version 4.6.
                  */
-                load_theme_textdomain( 'twentyfifteen' );
+
+                if ( version_compare( $GLOBALS['wp_version'], '4.6', '<' ) ) {
+                        load_theme_textdomain( 'twentyfifteen' );
+                }
 
                 // Add default posts and comments RSS feed links to head.
                 add_theme_support( 'automatic-feed-links' );

src/wp-content/themes/twentyfourteen/functions.php

@@ -64 +64 @@
                  * If you're building a theme based on Twenty Fourteen, use a find and
                  * replace to change 'twentyfourteen' to the name of your theme in all
                  * template files.
+                 * Manual loading of text domain is not required after the introduction of 
+                 * just in time loading for translations in WordPress version 4.6.
                  */
-                load_theme_textdomain( 'twentyfourteen' );
+                if ( version_compare( $GLOBALS['wp_version'], '4.6', '<' ) ) {
+                        load_theme_textdomain( 'twentyfourteen' );
+                }
 
                 /*
                  * This theme styles the visual editor to resemble the theme style.

src/wp-content/themes/twentynineteen/functions.php

@@ -26 +26 @@
          * as indicating support for post thumbnails.
          */
         function twentynineteen_setup() {
-                /*
-                 * Make theme available for translation.
-                 * Translations can be filed in the /languages/ directory.
-                 * If you're building a theme based on Twenty Nineteen, use a find and replace
-                 * to change 'twentynineteen' to the name of your theme in all the template files.
-                 */
-                load_theme_textdomain( 'twentynineteen', get_template_directory() . '/languages' );
 
                 // Add default posts and comments RSS feed links to head.
                 add_theme_support( 'automatic-feed-links' );

src/wp-content/themes/twentyseventeen/functions.php

@@ -25 +25 @@
  * as indicating support for post thumbnails.
  */
 function twentyseventeen_setup() {
-        /*
-         * Make theme available for translation.
-         * Translations can be filed at WordPress.org. See: https://translate.wordpress.org/projects/wp-themes/twentyseventeen
-         * If you're building a theme based on Twenty Seventeen, use a find and replace
-         * to change 'twentyseventeen' to the name of your theme in all the template files.
-         */
-        load_theme_textdomain( 'twentyseventeen' );
 
         // Add default posts and comments RSS feed links to head.
         add_theme_support( 'automatic-feed-links' );

src/wp-content/themes/twentysixteen/functions.php

@@ -49 +49 @@
                  * Make theme available for translation.
                  * Translations can be filed at WordPress.org. See: https://translate.wordpress.org/projects/wp-themes/twentysixteen
                  * If you're building a theme based on Twenty Sixteen, use a find and replace
-                 * to change 'twentysixteen' to the name of your theme in all the template files
+                 * to change 'twentysixteen' to the name of your theme in all the template files.
+                 * Manual loading of text domain is not required after the introduction of 
+                 * just in time loading for translations in WordPress version 4.6.
                  */
-                load_theme_textdomain( 'twentysixteen' );
+                if ( version_compare( $GLOBALS['wp_version'], '4.6', '<' ) ) {
+                        load_theme_textdomain( 'twentysixteen' );
+                }
 
                 // Add default posts and comments RSS feed links to head.
                 add_theme_support( 'automatic-feed-links' );

src/wp-content/themes/twentyten/functions.php

@@ -128 +128 @@
                 /*
                  * Make theme available for translation.
                  * Translations can be filed in the /languages/ directory.
+                 * Manual loading of text domain is not required after the introduction of 
+                 * just in time loading for translations in WordPress version 4.6.
                  */
-                load_theme_textdomain( 'twentyten', get_template_directory() . '/languages' );
+                if ( version_compare( $GLOBALS['wp_version'], '4.6', '<' ) ) {
+                        load_theme_textdomain( 'twentyten', get_template_directory() . '/languages' );
+                }
 
                 // This theme uses wp_nav_menu() in one location.
                 register_nav_menus(

src/wp-content/themes/twentythirteen/functions.php

@@ -75 +75 @@
          * If you're building a theme based on Twenty Thirteen, use a find and
          * replace to change 'twentythirteen' to the name of your theme in all
          * template files.
+         * Manual loading of text domain is not required after the introduction of 
+         * just in time loading for translations in WordPress version 4.6.
          */
-        load_theme_textdomain( 'twentythirteen' );
+        if ( version_compare( $GLOBALS['wp_version'], '4.6', '<' ) ) {
+                load_theme_textdomain( 'twentythirteen' );
+        }
+        
 
         /*
          * This theme styles the visual editor to resemble the theme style,

src/wp-content/themes/twentytwelve/functions.php

@@ -51 +51 @@
          * Translations can be filed at WordPress.org. See: https://translate.wordpress.org/projects/wp-themes/twentytwelve
          * If you're building a theme based on Twenty Twelve, use a find and replace
          * to change 'twentytwelve' to the name of your theme in all the template files.
+         * Manual loading of text domain is not required after the introduction of 
+         * just in time loading for translations in WordPress version 4.6.
          */
-        load_theme_textdomain( 'twentytwelve' );
+        if ( version_compare( $GLOBALS['wp_version'], '4.6', '<' ) ) {
+                load_theme_textdomain( 'twentytwelve' );
+        }
+        
 
         // This theme styles the visual editor with editor-style.css to match the theme style.
         add_editor_style();

src/wp-content/themes/twentytwenty/functions.php

@@ -111 +111 @@
                 )
         );
 
-        /*
-         * Make theme available for translation.
-         * Translations can be filed in the /languages/ directory.
-         * If you're building a theme based on Twenty Twenty, use a find and replace
-         * to change 'twentytwenty' to the name of your theme in all the template files.
-         */
-        load_theme_textdomain( 'twentytwenty' );
-
         // Add support for full and wide align images.
         add_theme_support( 'align-wide' );
 

src/wp-content/themes/twentytwentyone/functions.php

@@ -27 +27 @@
          * @return void
          */
         function twenty_twenty_one_setup() {
-                /*
-                 * Make theme available for translation.
-                 * Translations can be filed in the /languages/ directory.
-                 * If you're building a theme based on Twenty Twenty-One, use a find and replace
-                 * to change 'twentytwentyone' to the name of your theme in all the template files.
-                 */
-                load_theme_textdomain( 'twentytwentyone', get_template_directory() . '/languages' );
 
                 // Add default posts and comments RSS feed links to head.
                 add_theme_support( 'automatic-feed-links' );