Changeset 55268 for trunk/src/wp-content/themes/twentyfifteen/functions.php

Timestamp:

02/07/2023 03:50:14 PM (2 years ago)

Author:

audrasjb

Message:

Twenty Fifteen: Bundle Google Fonts locally.

This changeset bundles the Google Fonts used by Twenty Fifteen locally in the theme folder, instead of loading them from Google servers. Existing font stylesheet handles are maintained for backward compatibilily.

Props garrett-eclipse, kjellr, ocean90, SergeyBiryukov, westonruter, luminuu, audrasjb, jhoffmann, jffng, paapst, cbirdsong, webcommsat, kau-boy, MatthiasReinholz, sabernhardt, hellofromTonya, JeffPaul, davidbaumwald, desrosj, bedas, poena, costdev, mukesh27, azaozz, aristath.
See #55985.

File:

• trunk/src/wp-content/themes/twentyfifteen/functions.php (modified) (9 diffs)

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

@@ -171 +171 @@
         /*
          * This theme styles the visual editor to resemble the theme style,
-         * specifically font, colors, icons, and column width.
-         */
-        add_editor_style( array( 'css/editor-style.css', 'genericons/genericons.css', twentyfifteen_fonts_url() ) );
+         * specifically font, colors, icons, and column width. When fonts are
+         * self-hosted, the theme directory needs to be removed first.
+         */
+        $font_stylesheet = str_replace(
+            array( get_template_directory_uri() . '/', get_stylesheet_directory_uri() . '/' ),
+            '',
+            twentyfifteen_fonts_url()
+        );
+        add_editor_style( array( 'css/editor-style.css', 'genericons/genericons.css', $font_stylesheet ) );
 
         // Load regular editor styles into the new block-based editor.
@@ -348 +354 @@
 if ( ! function_exists( 'twentyfifteen_fonts_url' ) ) :
     /**
-     * Register Google fonts for Twenty Fifteen.
+     * Register fonts for Twenty Fifteen.
      *
      * @since Twenty Fifteen 1.0
+     * @since Twenty Fifteen 3.4 Replaced Google URL with self-hosted fonts.
      *
-     * @return string Google fonts URL for the theme.
+     * @return string Fonts URL for the theme.
      */
     function twentyfifteen_fonts_url() {
         $fonts_url = '';
         $fonts     = array();
-        $subsets   = 'latin,latin-ext';
 
         /*
@@ -364 +370 @@
          */
         if ( 'off' !== _x( 'on', 'Noto Sans font: on or off', 'twentyfifteen' ) ) {
-            $fonts[] = 'Noto Sans:400italic,700italic,400,700';
+            $fonts[] = 'noto-sans';
         }
 
@@ -372 +378 @@
          */
         if ( 'off' !== _x( 'on', 'Noto Serif font: on or off', 'twentyfifteen' ) ) {
-            $fonts[] = 'Noto Serif:400italic,700italic,400,700';
+            $fonts[] = 'noto-serif';
         }
 
@@ -380 +386 @@
          */
         if ( 'off' !== _x( 'on', 'Inconsolata font: on or off', 'twentyfifteen' ) ) {
-            $fonts[] = 'Inconsolata:400,700';
+            $fonts[] = 'inconsolata';
         }
 
-        /*
-         * translators: To add an additional character subset specific to your language,
-         * translate this to 'greek', 'cyrillic', 'devanagari' or 'vietnamese'. Do not translate into your own language.
-         */
-        $subset = _x( 'no-subset', 'Add new subset (greek, cyrillic, devanagari, vietnamese)', 'twentyfifteen' );
-
-        if ( 'cyrillic' === $subset ) {
-            $subsets .= ',cyrillic,cyrillic-ext';
-        } elseif ( 'greek' === $subset ) {
-            $subsets .= ',greek,greek-ext';
-        } elseif ( 'devanagari' === $subset ) {
-            $subsets .= ',devanagari';
-        } elseif ( 'vietnamese' === $subset ) {
-            $subsets .= ',vietnamese';
-        }
-
         if ( $fonts ) {
-            $fonts_url = add_query_arg(
-                array(
-                    'family'  => urlencode( implode( '|', $fonts ) ),
-                    'subset'  => urlencode( $subsets ),
-                    'display' => urlencode( 'fallback' ),
-                ),
-                'https://fonts.googleapis.com/css'
-            );
+            $fonts_url = get_template_directory_uri() . '/assets/fonts/' . implode( '-plus-', $fonts ) . '.css';
         }
 
@@ -433 +416 @@
 function twentyfifteen_scripts() {
     // Add custom fonts, used in the main stylesheet.
-    wp_enqueue_style( 'twentyfifteen-fonts', twentyfifteen_fonts_url(), array(), null );
+    $font_version = ( 0 === strpos( (string) twentyfifteen_fonts_url(), get_template_directory_uri() . '/' ) ) ? '20230328' : null;
+    wp_enqueue_style( 'twentyfifteen-fonts', twentyfifteen_fonts_url(), array(), $font_version );
 
     // Add Genericons, used in the main stylesheet.
@@ -483 +467 @@
     wp_enqueue_style( 'twentyfifteen-block-editor-style', get_template_directory_uri() . '/css/editor-blocks.css', array(), '20220908' );
     // Add custom fonts.
-    wp_enqueue_style( 'twentyfifteen-fonts', twentyfifteen_fonts_url(), array(), null );
+    $font_version = ( 0 === strpos( (string) twentyfifteen_fonts_url(), get_template_directory_uri() . '/' ) ) ? '20230328' : null;
+    wp_enqueue_style( 'twentyfifteen-fonts', twentyfifteen_fonts_url(), array(), $font_version );
 }
 add_action( 'enqueue_block_editor_assets', 'twentyfifteen_block_editor_styles' );
@@ -492 +477 @@
  *
  * @since Twenty Fifteen 1.7
+ * @deprecated Twenty Fifteen 3.4 Disabled filter because, by default, fonts are self-hosted.
  *
  * @param array   $urls          URLs to print for resource hints.
@@ -511 +497 @@
     return $urls;
 }
-add_filter( 'wp_resource_hints', 'twentyfifteen_resource_hints', 10, 2 );
+// add_filter( 'wp_resource_hints', 'twentyfifteen_resource_hints', 10, 2 );
 
 /**