From 1a477eb511a65bf3f409d927394e1a53af029f1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javi=20Mart=C3=ADn?= <javim@elretirao.net>
Date: Fri, 25 Jun 2021 22:23:06 +0200
Subject: [PATCH] Remove unneeded optgroup in locale switcher

The `<optgroup>` doesn't make much sense if all options are inside one
group. And the information provided was redundant: when using a select
field having "Language" as a label, it's obvious that the options are
the available languages.

Now that, since now the `<select>` field is smaller, we need to add an
extra padding so the icon doesn't overlap the text.
---
 app/assets/stylesheets/layout.scss         |  3 ++-
 app/views/shared/_locale_switcher.html.erb | 14 ++++++--------
 config/locales/en/general.yml              |  1 -
 config/locales/es/general.yml              |  1 -
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss
index 58380e9e7..f3948d611 100644
--- a/app/assets/stylesheets/layout.scss
+++ b/app/assets/stylesheets/layout.scss
@@ -1012,7 +1012,8 @@ footer {
     margin-bottom: 0;
     margin-top: $line-height / 4;
     outline: none;
-    padding: 0 $line-height / 4;
+    padding-left: $line-height / 4;
+    padding-right: calc(#{$line-height / 4} + 1em);
     width: auto;
 
     &:focus {
diff --git a/app/views/shared/_locale_switcher.html.erb b/app/views/shared/_locale_switcher.html.erb
index 294badcb8..05c9d9fea 100644
--- a/app/views/shared/_locale_switcher.html.erb
+++ b/app/views/shared/_locale_switcher.html.erb
@@ -5,14 +5,12 @@
         <%= t("layouts.header.locale") %>
       </label>
       <select class="js-location-changer locale-switcher inline-block" name="locale-switcher" id="locale-switcher">
-        <optgroup label="<%= t("layouts.header.available_locales") %>">
-          <% I18n.available_locales.map do |loc| %>
-            <option <%= "selected" if loc == I18n.locale %>
-                    value="<%= current_path_with_query_params(locale: loc) %>">
-              <%= name_for_locale(loc) %>
-            </option>
-          <% end %>
-        </optgroup>
+        <% I18n.available_locales.map do |loc| %>
+          <option <%= "selected" if loc == I18n.locale %>
+                  value="<%= current_path_with_query_params(locale: loc) %>">
+            <%= name_for_locale(loc) %>
+          </option>
+        <% end %>
       </select>
     </form>
   </div>
diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml
index 650e44785..a58e5e6ba 100644
--- a/config/locales/en/general.yml
+++ b/config/locales/en/general.yml
@@ -226,7 +226,6 @@ en:
     header:
       administration_menu: Menu
       administration: Administration
-      available_locales: Available languages
       collaborative_legislation: Collaborative legislation
       debates: Debates
       locale: "Language:"
diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml
index 7c59338f9..81a903d8c 100644
--- a/config/locales/es/general.yml
+++ b/config/locales/es/general.yml
@@ -226,7 +226,6 @@ es:
     header:
       administration_menu: Menú
       administration: Administración
-      available_locales: Idiomas disponibles
       collaborative_legislation: Legislación colaborativa
       debates: Debates
       locale: "Idioma:"