Changeset 26376

Timestamp:

11/26/2013 01:53:17 AM (12 years ago)

Author:

SergeyBiryukov

Message:

Allow Open Sans to be disabled per language. props dimadin. fixes #26063.

File:

• trunk/src/wp-includes/script-loader.php (modified) (1 diff)

trunk/src/wp-includes/script-loader.php

@@ -560 +560 @@
     $styles->add_data( 'ie', 'conditional', 'lte IE 7' );
 
-    $subsets = 'latin,latin-ext';
-
-    /* translators: To add an additional Open Sans character subset specific to your language,
-     * translate this to 'greek', 'cyrillic' or 'vietnamese'. Do not translate into your own language.
+    $open_sans_font_url = '';
+
+    /* translators: If there are characters in your language that are not supported
+     * by Open Sans, translate this to 'off'. Do not translate into your own language.
      */
-    $subset = _x( 'no-subset', 'Open Sans font: add new subset (greek, cyrillic, vietnamese)' );
-
-    if ( 'cyrillic' == $subset )
-        $subsets .= ',cyrillic,cyrillic-ext';
-    elseif ( 'greek' == $subset )
-        $subsets .= ',greek,greek-ext';
-    elseif ( 'vietnamese' == $subset )
-        $subsets .= ',vietnamese';
-
-    // Hotlink Open Sans, for now
-    $styles->add( 'open-sans', "//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,300,400,600&subset=$subsets" );
+    if ( 'off' !== _x( 'on', 'Open Sans font: on or off' ) ) {
+        $subsets = 'latin,latin-ext';
+
+        /* translators: To add an additional Open Sans character subset specific to your language,
+         * translate this to 'greek', 'cyrillic' or 'vietnamese'. Do not translate into your own language.
+         */
+        $subset = _x( 'no-subset', 'Open Sans font: add new subset (greek, cyrillic, vietnamese)' );
+
+        if ( 'cyrillic' == $subset ) {
+            $subsets .= ',cyrillic,cyrillic-ext';
+        } elseif ( 'greek' == $subset ) {
+            $subsets .= ',greek,greek-ext';
+        } elseif ( 'vietnamese' == $subset ) {
+            $subsets .= ',vietnamese';
+        }
+
+        $query_args = array(
+            'family' => 'Open+Sans:300italic,400italic,600italic,300,400,600',
+            'subset' => $subsets,
+        );
+        // Hotlink Open Sans, for now
+        $open_sans_font_url = add_query_arg( $query_args, '//fonts.googleapis.com/css' );
+    }
+
+    $styles->add( 'open-sans', $open_sans_font_url );
 
     // Dashicons