From f275dbeb9815f35430e24c4dc246e74539f50c48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Laxstr=C3=B6m?= Date: Fri, 3 May 2013 08:43:08 +0000 Subject: [PATCH] I18n for System font Bug: 47819 Change-Id: I9244aab0ec32c27bfc56dd5a441f02a9783e5fb1 --- i18n/en.json | 1 + i18n/qqq.json | 3 ++- resources/js/ext.uls.displaysettings.js | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/i18n/en.json b/i18n/en.json index 090d0af1..26cbadb5 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -28,6 +28,7 @@ "ext-uls-webfonts-select-for": "Select font for $1", "ext-uls-webfonts-select-for-ui-info": "Font used for user interface", "ext-uls-webfonts-select-for-content-info": "Font used for content", +"ext-uls-webfonts-system-font": "System font", "ext-uls-back-to-display-settings": "Back to display settings", "ext-uls-input-settings-title": "Input settings", "ext-uls-input-settings-title-short": "Input", diff --git a/i18n/qqq.json b/i18n/qqq.json index 80d38584..c1ef198d 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -30,6 +30,7 @@ "ext-uls-webfonts-select-for": "Label for font selector dropdown. $1 is a language name", "ext-uls-webfonts-select-for-ui-info": "Information displayed under font selector", "ext-uls-webfonts-select-for-content-info": "Information displayed under font selector", + "ext-uls-webfonts-system-font": "Value in a dropdown. System font means that instead of using a specific font provided by this extension, the default font defined in the browser or operating system is used.", "ext-uls-back-to-display-settings": "Text for the link shown when language selector is accessed from language settings.", "ext-uls-input-settings-title": "Title text for input settings screen", "ext-uls-input-settings-title-short": "Short title for input settings screen", @@ -48,4 +49,4 @@ "ext-uls-input-enable": "Label for enable input tools button", "ext-uls-input-disable-info": "Info text for the disable input tools button", "ext-uls-input-settings-noime": "Text to be shown when no input methods are available for a selected language" -} \ No newline at end of file +} diff --git a/resources/js/ext.uls.displaysettings.js b/resources/js/ext.uls.displaysettings.js index fcb00626..19889d8e 100644 --- a/resources/js/ext.uls.displaysettings.js +++ b/resources/js/ext.uls.displaysettings.js @@ -390,7 +390,7 @@ } ); $fontSelector.prop( 'disabled', !this.isWebFontsEnabled() ); - $systemFont = $( '