From 0c14f0d0a0380c3993611185ba5977fe7d688aba Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Thu, 7 Feb 2019 11:04:49 +0000
Subject: [PATCH] UX: Rename color scheme to color palette in UI

The word 'scheme' was very easy to get confused with 'theme', this provides a better distinction.
---
 config/locales/client.en.yml | 18 +++++++++---------
 config/locales/server.en.yml | 28 ++++++++++------------------
 2 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 42f0aa68af1..23bf69cde7a 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -3347,7 +3347,7 @@ en:
           preview: "Preview"
           is_default: "Theme is enabled by default"
           user_selectable: "Theme can be selected by users"
-          color_scheme: "Color Scheme"
+          color_scheme: "Color Palette"
           color_scheme_select: "Select colors to be used by theme"
           custom_sections: "Custom sections:"
           theme_components: "Theme Components"
@@ -3438,19 +3438,19 @@ en:
             title: "Define theme settings in YAML format"
         colors:
           select_base:
-            title: "Select base color scheme"
-            description: "Base scheme:"
+            title: "Select base color palette"
+            description: "Base palette:"
           title: "Colors"
-          edit: "Edit Color Schemes"
-          long_title: "Color Schemes"
-          about: "Modify the colors used by your themes. Create a new color scheme to start."
-          new_name: "New Color Scheme"
+          edit: "Edit Color Palettes"
+          long_title: "Color Palettes"
+          about: "Modify the colors used by your themes. Create a new color palette to start."
+          new_name: "New Color Palette"
           copy_name_prefix: "Copy of"
-          delete_confirm: "Delete this color scheme?"
+          delete_confirm: "Delete this color palette?"
           undo: "undo"
           undo_title: "Undo your changes to this color since the last time it was saved."
           revert: "revert"
-          revert_title: "Reset this color to Discourse's default color scheme."
+          revert_title: "Reset this color to Discourse's default color palette."
           primary:
             name: "primary"
             description: "Most text, icons, and borders."
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index c525fe1f901..cf74939b931 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -72,7 +72,7 @@ en:
   on_another_topic: "On another topic"
 
   themes:
-    bad_color_scheme: "Can not update theme, invalid color scheme"
+    bad_color_scheme: "Can not update theme, invalid color palette"
     other_error: "Something went wrong updating theme"
     import_error:
       generic: An error occured while importing that theme
@@ -84,7 +84,7 @@ en:
     errors:
       component_no_user_selectable: "Theme components can't be user-selectable"
       component_no_default: "Theme components can't be default theme"
-      component_no_color_scheme: "Theme components can't have color scheme"
+      component_no_color_scheme: "Theme components can't have color palettes"
       no_multilevels_components: "Themes with child themes can't be child themes themselves"
     settings_errors:
       invalid_yaml: "Provided YAML is invalid."
@@ -3436,14 +3436,14 @@ en:
 
   color_schemes:
     base_theme_name: "Base"
-    light: "Light Scheme"
-    dark: "Dark Scheme"
-    neutral: "Neutral Scheme"
-    grey_amber: "Grey Amber Scheme"
-    shades_of_blue: "Shades of Blue Scheme"
-    latte: "Latte Scheme"
-    summer: "Summer Scheme"
-    dark_rose: "Dark Rose Scheme"
+    light: "Light"
+    dark: "Dark"
+    neutral: "Neutral"
+    grey_amber: "Grey Amber"
+    shades_of_blue: "Shades of Blue"
+    latte: "Latte"
+    summer: "Summer"
+    dark_rose: "Dark Rose"
     default_theme_name: "Light"
     light_theme_name: "Light"
     dark_theme_name: "Dark"
@@ -4212,14 +4212,6 @@ en:
 
       colors:
         title: "Theme"
-        fields:
-          theme_id:
-            description: "Do you prefer a light or dark color scheme to start with? You can further customize the look and feel of your site via Admin, Customize."
-            choices:
-              default:
-                label: "Simple Light"
-              dark:
-                label: "Simple Dark"
 
       logos:
         title: "Logos"