Changeset 33497

Timestamp:

07/29/2015 07:37:06 PM (11 years ago)

Author:

azaozz

Message:

Press This: properly add Open Sans to the editor, using the mce_css filter.
See #26072. Fixes #33189.

Location:

trunk/src/wp-admin

Files:

• css/press-this-editor.css (modified) (1 diff)
• includes/class-wp-press-this.php (modified) (1 diff)

trunk/src/wp-admin/css/press-this-editor.css

@@ -7 +7 @@
 * Links
 */
-@import url("https://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,600,700");
 a {
         color: #0073aa;

trunk/src/wp-admin/includes/class-wp-press-this.php

@@ -784 +784 @@
                 }
 
-                return $styles . $press_this;
+                $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.
+                 */
+                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' => urlencode( 'Open Sans:400italic,700italic,400,600,700' ),
+                                'subset' => urlencode( $subsets ),
+                        );
+
+                        $open_sans_font_url = ',' . add_query_arg( $query_args, 'https://fonts.googleapis.com/css' );
+                }
+
+                return $styles . $press_this . $open_sans_font_url;
         }