From eb891778ff936f2f5099463cb025b35e111d66d8 Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Wed, 23 Sep 2020 12:00:07 +0300
Subject: [PATCH] DEV: Do not translate font names (#10723)

Use the names as provided by discourse-fonts and remove the
translated strings.

It also ensures that the selected font is present in case a font will
be removed in the future.
---
 app/models/base_font_setting.rb |  6 +-----
 config/locales/client.en.yml    | 24 ------------------------
 lib/stylesheet/importer.rb      | 16 ++++++++++------
 3 files changed, 11 insertions(+), 35 deletions(-)

diff --git a/app/models/base_font_setting.rb b/app/models/base_font_setting.rb
index ff9787763e7..36c0321876b 100644
--- a/app/models/base_font_setting.rb
+++ b/app/models/base_font_setting.rb
@@ -9,11 +9,7 @@ class BaseFontSetting < EnumSiteSetting
 
   def self.values
     @values ||= DiscourseFonts.fonts.map do |font|
-      { name: "base_font_setting.#{font[:key]}", value: font[:key] }
+      { name: font[:name], value: font[:key] }
     end
   end
-
-  def self.translate_names?
-    true
-  end
 end
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 2c6be84cc4f..9f63c6a3f0d 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1737,30 +1737,6 @@ en:
       categories_boxes: "Boxes with Subcategories"
       categories_boxes_with_topics: "Boxes with Featured Topics"
 
-    base_font_setting:
-      helvetica: "Helvetica/Arial"
-      open_sans: "Open Sans"
-      oxanium: "Oxanium"
-      roboto: "Roboto"
-      lato: "Lato"
-      noto_sans_jp: "NotoSansJP"
-      montserrat: "Montserrat"
-      roboto_condensed: "RobotoCondensed"
-      source_sans_pro: "SourceSansPro"
-      oswald: "Oswald"
-      raleway: "Raleway"
-      roboto_mono: "RobotoMono"
-      poppins: "Poppins"
-      noto_sans: "NotoSans"
-      roboto_slab: "RobotoSlab"
-      merriweather: "Merriweather"
-      ubuntu: "Ubuntu"
-      pt_sans: "PTSans"
-      playfair_display: "PlayfairDisplay"
-      nunito: "Nunito"
-      lora: "Lora"
-      mukta: "Mukta"
-
     shortcut_modifier_key:
       shift: "Shift"
       ctrl: "Ctrl"
diff --git a/lib/stylesheet/importer.rb b/lib/stylesheet/importer.rb
index b59a09735d9..f0b2c7b11c9 100644
--- a/lib/stylesheet/importer.rb
+++ b/lib/stylesheet/importer.rb
@@ -43,13 +43,17 @@ module Stylesheet
       register_import "font" do
         font = DiscourseFonts.fonts.find { |f| f[:key] == SiteSetting.base_font }
 
-        contents = <<~EOF
-          #{font_css(font)}
+        contents = if font.present?
+          <<~EOF
+            #{font_css(font)}
 
-          :root {
-            --font-family: #{font[:stack]};
-          }
-        EOF
+            :root {
+              --font-family: #{font[:stack]};
+            }
+          EOF
+        else
+          ""
+        end
 
         Import.new("font.scss", source: contents)
       end