From 94823c689772d19040a00404a9cb012c83741d43 Mon Sep 17 00:00:00 2001
From: Stefan Peters <Stefan.Peters@gbv.de>
Date: Thu, 11 Apr 2019 10:16:22 +0200
Subject: [PATCH] Further adjust display of keyboard shortcuts (#304)

---
 config/locale.json             |  6 ++++--
 src/components/TheSettings.vue | 10 ++--------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/config/locale.json b/config/locale.json
index 4a8ca92e8..cd2f0509a 100644
--- a/config/locale.json
+++ b/config/locale.json
@@ -15,7 +15,8 @@
       "no": "No",
       "loading": "Loading...",
       "cancel": "Cancel",
-      "authNecessary": "Authentication necessary."
+      "authNecessary": "Authentication necessary.",
+      "or": "or"
     },
     "navbar": {
       "feedback": "Feedback",
@@ -252,7 +253,8 @@
       "addToMapping": "zum Mapping hinzufügen",
       "loading": "Lade...",
       "cancel": "Abbrechen",
-      "authNecessary": "Authentifizierung notwendig."
+      "authNecessary": "Authentifizierung notwendig.",
+      "or": "oder"
     },
     "navbar": {
       "feedback": "Feedback",
diff --git a/src/components/TheSettings.vue b/src/components/TheSettings.vue
index 6c8fe11ef..bf2d3d69e 100644
--- a/src/components/TheSettings.vue
+++ b/src/components/TheSettings.vue
@@ -188,14 +188,8 @@
           <p
             v-for="shortcut in config.shortcuts"
             :key="`settingsModal-shortcuts-${shortcut.id}`">
-            <b>{{ $util.prefLabel(shortcut) || shortcut.action }}</b>
-            <ul>
-              <li
-                v-for="(keys, index) in shortcut.keys.split(',')"
-                :key="`settingsModal-shortcuts-${shortcut.id}-keys-${index}`">
-                <span v-html="keys.split('+').map(key => `<kbd>${replaceKey(key)}</kbd>`).join(' + ')" />
-              </li>
-            </ul>
+            <b>{{ $util.prefLabel(shortcut) || shortcut.action }}</b><br>
+            <span v-html="shortcut.keys.split(',').map(keys => keys.split('+').map(key => `<kbd>${replaceKey(key)}</kbd>`).join(' + ')).join(` ${$t('general.or')} `)" />
           </p>
         </b-tab>
         <b-tab