Merge pull request #2098 from getkirby/fix/1940-panel-language

Panel default lang on install and user creat #1940
getkirby · Sep 16, 2019 · eff45dc · eff45dc
2 parents de9f5df + 7c848aa
commit eff45dc
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/config/api/models/System.php b/config/api/models/System.php
@@ -11,6 +11,9 @@
         'ascii' => function () {
             return Str::$ascii;
         },
+        'defaultLanguage' => function () {
+            return $this->kirby()->option('panel.language', 'en');
+        },
         'isOk' => function (System $system) {
             return $system->isOk();
         },
@@ -90,6 +93,7 @@
         ],
         'panel' => [
             'ascii',
+            'defaultLanguage',
             'isOk',
             'isInstalled',
             'isLocal',

diff --git a/panel/src/components/Dialogs/UserCreateDialog.vue b/panel/src/components/Dialogs/UserCreateDialog.vue
@@ -85,7 +85,7 @@ export default {
         name: "",
         email: "",
         password: "",
-        language: "en",
+        language: this.$store.state.system.info.defaultLanguage || "en",
         role: this.$user.role.name
       };
     },

diff --git a/panel/src/components/Views/InstallationView.vue b/panel/src/components/Views/InstallationView.vue
@@ -73,7 +73,7 @@ export default {
       user: {
         name: "",
         email: "",
-        language: "en",
+        language: "",
         password: "",
         role: "admin"
       },

diff --git a/panel/src/components/Views/UserView.vue b/panel/src/components/Views/UserView.vue
@@ -40,7 +40,7 @@
         <k-button-group>
           <k-button :disabled="!permissions.changeEmail || isLocked" icon="email" @click="action('email')">{{ $t("email") }}: {{ user.email }}</k-button>
           <k-button :disabled="!permissions.changeRole || isLocked" icon="bolt" @click="action('role')">{{ $t("role") }}: {{ user.role.title }}</k-button>
-          <k-button :disabled="!permissions.changeLanguage || isLocked" icon="globe" @click="action('language')">{{ $t("language") }}: {{ user.language }}</k-button>
+          <k-button :disabled="!permissions.changeLanguage || isLocked" icon="globe" @click="action('language')">{{ $t("language") }}: {{ userLanguage.name }}</k-button>
         </k-button-group>
       </k-view>
     </div>
@@ -166,6 +166,9 @@ export default {
     },
     uploadApi() {
       return config.api + "/users/" + this.user.id + "/avatar";
+    },
+    userLanguage() {
+      return this.$store.state.languages.all.filter(x => x.code === this.user.language)[0];
     }
   },
   watch: {