fix(user): login text and user skin profile behavior

Voxelum · Sep 17, 2019 · db83b86 · db83b86
1 parent b20c22d
commit db83b86
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/renderer/windows/main/UserPage.vue b/src/renderer/windows/main/UserPage.vue
@@ -59,6 +59,7 @@
               </v-flex>
               <v-flex xs1 style="padding-left: 5px;">
                 <v-select hide-details :label="$t('user.profileService')" 
+                          readonly
                           :items="profileServices" :value="user.profileService"
                           color="primary" dark prepend-inner-icon="add" 
                           @click:prepend-inner="userServiceDialog=true" />

diff --git a/src/renderer/windows/main/components/DialogLogin.vue b/src/renderer/windows/main/components/DialogLogin.vue
@@ -48,7 +48,7 @@
                           dark 
                           prepend-icon="person"
                           required 
-                          :label="$t(`user.${selectedAuthService}.account`)"
+                          :label="$t(`user.${selectedAuthService === 'offline' ? 'offline' : 'mojang'}.account`)"
                           :rules="accountRules" 
                           :items="history" 
                           :error="accountError" 
@@ -60,7 +60,7 @@
                             prepend-icon="lock" 
                             type="password" 
                             required
-                            :label="$t(`user.${selectedAuthService}.password`)"
+                            :label="$t(`user.${selectedAuthService === 'offline' ? 'offline' : 'mojang'}.password`)"
                             :rules="passwordRules" 
                             :disabled="selectedAuthService==='offline'" 
                             :error="passwordError"
@@ -167,13 +167,13 @@ export default {
   computed: {
     authServices() {
       return this.$repo.getters.authServices.map(m => ({
-        text: this.$t(`user.${m}.name`),
+        text: m === 'offline' || m === 'mojang' ? this.$t(`user.${m}.name`) : m,
         value: m,
       }));
     },
     profileServices() {
       return this.$repo.getters.profileServices.map(m => ({
-        text: this.$t(`user.${m}.name`),
+        text: m === 'offline' || m === 'mojang' ? this.$t(`user.${m}.name`) : m,
         value: m,
       }));
     },
@@ -256,7 +256,7 @@ export default {
         });
       }
     },
-    deleteGameProfile(profile) { 
+    deleteGameProfile(profile) {
       this.$repo.commit('removeUserProfile', profile.userId);
     },
     async login() {