From cc349e1f22b4f84cb66924ce5c6f7d8e6b90ea99 Mon Sep 17 00:00:00 2001
From: precondition <57645186+precondition@users.noreply.github.com>
Date: Thu, 18 Aug 2022 23:28:26 +0200
Subject: [PATCH] Locale-aware sort of the OS keyboard layouts by their labels.

---
 src/components/SettingsPanel.vue | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/components/SettingsPanel.vue b/src/components/SettingsPanel.vue
index 8ecfaf1ef0..b06a15fb3d 100644
--- a/src/components/SettingsPanel.vue
+++ b/src/components/SettingsPanel.vue
@@ -105,7 +105,7 @@
           v-model="osKeyboardLayout"
         >
           <option
-            v-for="osLayout in osKeyboardLayouts"
+            v-for="osLayout in sortedOSKeyboardLayouts"
             :key="osLayout"
             :value="osLayout"
           >
@@ -179,6 +179,14 @@ export default {
       async set(value) {
         await this.changeOSKeyboardLayout(value);
       }
+    },
+    sortedOSKeyboardLayouts: function () {
+      // Locale-aware sort of the OS keyboard layouts by their labels.
+      const translatedLayoutName = (osLayout) =>
+        this.$t('settingsPanel.osKeyboardLayout.label.' + osLayout);
+      return [...this.osKeyboardLayouts].sort((a, b) =>
+        translatedLayoutName(a).localeCompare(translatedLayoutName(b))
+      );
     }
   },
   methods: {