From ec93bca99e9233683bb5d84ef3d77123c48e062a Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <gerhard.schlager@discourse.org>
Date: Fri, 26 Aug 2022 01:22:04 +0200
Subject: [PATCH] UX: Remove confusing fallback locale warning (#18096)

---
 .../controllers/admin-site-text-index.js      | 10 -----
 .../admin/addon/templates/site-text-index.hbs | 45 ++++++++++++++-----
 config/locales/client.en.yml                  |  1 -
 3 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/app/assets/javascripts/admin/addon/controllers/admin-site-text-index.js b/app/assets/javascripts/admin/addon/controllers/admin-site-text-index.js
index 2f2b708d172..1ec7abbbea6 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-site-text-index.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-site-text-index.js
@@ -42,21 +42,11 @@ export default Controller.extend({
     }
   },
 
-  @discourseComputed("locale")
-  showFallbackLocaleWarning() {
-    return (
-      this.siteSettings.allow_user_locale &&
-      this.siteSettings.set_locale_from_accept_language_header &&
-      this.fallbackLocaleFullName
-    );
-  },
-
   actions: {
     edit(siteText) {
       this.transitionToRoute("adminSiteText.edit", siteText.get("id"), {
         queryParams: {
           locale: this.locale,
-          localeFullName: this.availableLocales[this.locale],
         },
       });
     },
diff --git a/app/assets/javascripts/admin/addon/templates/site-text-index.hbs b/app/assets/javascripts/admin/addon/templates/site-text-index.hbs
index b10fa0d2391..ff74b4cf7f3 100644
--- a/app/assets/javascripts/admin/addon/templates/site-text-index.hbs
+++ b/app/assets/javascripts/admin/addon/templates/site-text-index.hbs
@@ -1,39 +1,60 @@
 <div class="search-area">
   <p>{{i18n "admin.site_text.description"}}</p>
 
-  <TextField @value={{this.q}} @placeholderKey="admin.site_text.search" @class="no-blur site-text-search" @autofocus="true" @key-up={{action "search"}} />
+  <TextField
+    @value={{this.q}}
+    @placeholderKey="admin.site_text.search"
+    @class="no-blur site-text-search"
+    @autofocus="true"
+    @key-up={{action "search"}}
+  />
 
   <div class="reseed">
-    <DButton @action={{route-action "showReseedModal"}} @class="btn-default" @label="admin.reseed.action.label" @title="admin.reseed.action.title" @icon="sync" />
+    <DButton
+      @action={{route-action "showReseedModal"}}
+      @class="btn-default"
+      @label="admin.reseed.action.label"
+      @title="admin.reseed.action.title"
+      @icon="sync"
+    />
   </div>
 
   <p class="filter-options">
     <div class="locale">
       <label>{{i18n "admin.site_text.locale"}}</label>
-      <ComboBox @valueProperty="value" @content={{this.availableLocales}} @value={{this.locale}} @onChange={{action "updateLocale"}} @class="locale-search" @options={{hash filterable=true}} />
+      <ComboBox
+        @valueProperty="value"
+        @content={{this.availableLocales}}
+        @value={{this.locale}}
+        @onChange={{action "updateLocale"}}
+        @class="locale-search"
+        @options={{hash filterable=true}}
+      />
     </div>
 
     <label>
-      <Input @type="checkbox" @checked={{this.overridden}} {{on "click" (action "toggleOverridden")}} />
+      <Input
+        @type="checkbox"
+        @checked={{this.overridden}}
+        {{on "click" (action "toggleOverridden")}}
+      />
       {{i18n "admin.site_text.show_overriden"}}
     </label>
   </p>
 </div>
 
 <ConditionalLoadingSpinner @condition={{this.searching}}>
-  {{#if this.showFallbackLocaleWarning}}
-    <div class="alert alert-info">
-      {{d-icon "exclamation-circle"}}
-      {{i18n "admin.site_text.fallback_locale_warning" fallback=this.fallbackLocaleFullName}}
-    </div>
-  {{/if}}
-
   {{#if this.siteTexts.extras.recommended}}
     <p><b>{{i18n "admin.site_text.recommended"}}</b></p>
   {{/if}}
 
   {{#each this.siteTexts as |siteText|}}
-    <SiteTextSummary @siteText={{siteText}} @editAction={{action "edit"}} @term={{this.q}} @searchRegex={{this.siteTexts.extras.regex}} />
+    <SiteTextSummary
+      @siteText={{siteText}}
+      @editAction={{action "edit"}}
+      @term={{this.q}}
+      @searchRegex={{this.siteTexts.extras.regex}}
+    />
   {{/each}}
 
   {{#if this.siteTexts.extras.has_more}}
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index dc88bdc66ce..4e2297b9c5a 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -5522,7 +5522,6 @@ en:
         recommended: "We recommend customizing the following text to suit your needs:"
         show_overriden: "Only show overridden"
         locale: "Language:"
-        fallback_locale_warning: "You are editing a language based on %{fallback}. Users who choose %{fallback} as their interface language won't see your changes."
         more_than_50_results: "There are more than 50 results. Please refine your search."
 
       settings: # used by theme and site settings