[beta] Improve languages and bump to v07 patch.

DIDIRUS4 · Dec 30, 2023 · 9258411 · 9258411
1 parent 1cb8dc2
commit 9258411
Show file tree

Hide file tree

Showing 9 changed files with 70 additions and 25 deletions.
diff --git a/.github/workflows/cli-build.yml b/.github/workflows/cli-build.yml
@@ -2,7 +2,7 @@ name: CLI Build + Lint
 
 on:
   push:
-    branches: [ master, beta ]
+    branches: [ beta ]
   pull_request:
 env:
   CARGO_TERM_COLOR: always

diff --git a/.github/workflows/gui-build.yml b/.github/workflows/gui-build.yml
@@ -2,7 +2,7 @@ name: GUI Build + Lint
 
 on:
   push:
-    branches: [master, beta]
+    branches: [ beta ]
   pull_request:
 jobs:
   build:

diff --git a/.github/workflows/tauri-build.yml b/.github/workflows/tauri-build.yml
@@ -1,7 +1,7 @@
 name: 'Tauri GUI Build'
 on:
   push:
-    branches: [ master, beta ]
+    branches: [ beta ]
   pull_request:
 jobs:
   test-tauri:

diff --git a/theseus_gui/package.json b/theseus_gui/package.json
@@ -2,7 +2,7 @@
   "name": "theseus_gui",
   "private": true,
   "version": "0.6.3",
-  "patch_version": "06-Cosmic-Beta",
+  "patch_version": "07-Cosmic-Beta",
   "type": "module",
   "scripts": {
     "dev": "vite",

diff --git a/theseus_gui/src-tauri/tauri.conf.json b/theseus_gui/src-tauri/tauri.conf.json
@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "Modrinth App",
-    "version": "0.6.306"
+    "version": "0.6.307"
   },
   "tauri": {
     "allowlist": {

diff --git a/theseus_gui/src/components/ui/InstanceCreationModal.vue b/theseus_gui/src/components/ui/InstanceCreationModal.vue
@@ -1,5 +1,5 @@
 <template>
-  <Modal ref="modal" header="Create instance" :noblur="!themeStore.advancedRendering">
+  <Modal ref="modal" :header="t('InstanceCreationModal.CreateInstance')" :noblur="!themeStore.advancedRendering">
     <div class="modal-header">
       <Chips v-model="creationType" :items="['custom', 'from file', 'import from launcher']" />
     </div>
@@ -10,16 +10,16 @@
         <div class="image-input">
           <Button @click="upload_icon()">
             <UploadIcon />
-            Select icon
+            {{t('InstanceCreationModal.SelectIcon')}}
           </Button>
           <Button :disabled="!display_icon" @click="reset_icon">
             <XIcon />
-            Remove icon
+            {{t('InstanceCreationModal.RemoveIcon')}}
           </Button>
         </div>
       </div>
       <div class="input-row">
-        <p class="input-label">Name</p>
+        <p class="input-label">{{ t('InstanceCreationModal.Name') }}</p>
         <input
           v-model="profile_name"
           autocomplete="off"
@@ -29,19 +29,19 @@
         />
       </div>
       <div class="input-row">
-        <p class="input-label">Loader</p>
+        <p class="input-label">{{ t('InstanceCreationModal.Loader') }}</p>
         <Chips v-model="loader" :items="loaders" />
       </div>
       <div class="input-row">
-        <p class="input-label">Game version</p>
+        <p class="input-label">{{t('InstanceCreationModal.GameVersion')}}</p>
         <div class="versions">
           <multiselect
             v-model="game_version"
             class="selector"
             :options="game_versions"
             :multiple="false"
             :searchable="true"
-            placeholder="Select game version"
+            :placeholder="t('InstanceCreationModal.GameVersionSelection')"
             open-direction="top"
             :show-labels="false"
           />
@@ -54,44 +54,44 @@
         </div>
       </div>
       <div v-if="showAdvanced && loader !== 'vanilla'" class="input-row">
-        <p class="input-label">Loader version</p>
+        <p class="input-label">{{t('InstanceCreationModal.LoaderVersion')}}</p>
         <Chips v-model="loader_version" :items="['stable', 'latest', 'other']" />
       </div>
       <div v-if="showAdvanced && loader_version === 'other' && loader !== 'vanilla'">
         <div v-if="game_version" class="input-row">
-          <p class="input-label">Select version</p>
+          <p class="input-label">{{t('InstanceCreationModal.LoaderVersionSelection1')}}</p>
           <multiselect
             v-model="specified_loader_version"
             class="selector"
             :options="selectable_versions"
             :searchable="true"
-            placeholder="Select loader version"
+            :placeholder="t('InstanceCreationModal.LoaderVersionSelection2')"
             open-direction="top"
             :show-labels="false"
           />
         </div>
         <div v-else class="input-row">
-          <p class="warning">Select a game version before you select a loader version</p>
+          <p class="warning">{{t('InstanceCreationModal.warn1')}}</p>
         </div>
       </div>
       <div class="input-group push-right">
         <Button @click="toggle_advanced">
           <CodeIcon />
-          {{ showAdvanced ? 'Hide advanced' : 'Show advanced' }}
+          {{ showAdvanced ? t('InstanceCreationModal.HideAdvanced') : t('InstanceCreationModal.ShowAdvanced') }}
         </Button>
         <Button @click="hide()">
           <XIcon />
-          Cancel
+          {{t('InstanceCreationModal.Cancel')}}
         </Button>
         <Button color="primary" :disabled="!check_valid || creating" @click="create_instance()">
           <PlusIcon v-if="!creating" />
-          {{ creating ? 'Creating...' : 'Create' }}
+          {{ creating ? t('InstanceCreationModal.Creating') : t('InstanceCreationModal.Create') }}
         </Button>
       </div>
     </div>
     <div v-else-if="creationType === 'from file'" class="modal-body">
-      <Button @click="openFile"> <FolderOpenIcon /> Import from file </Button>
-      <div class="info"><InfoIcon /> Or drag and drop your .mrpack file</div>
+      <Button @click="openFile"> <FolderOpenIcon /> {{t('InstanceCreationModal.Import')}} </Button>
+      <div class="info"><InfoIcon /> {{t('InstanceCreationModal.DragImport')}} </div>
     </div>
     <div v-else class="modal-body">
       <Chips
@@ -138,7 +138,7 @@
               "
             />
           </div>
-          <div class="name-cell table-cell">Profile name</div>
+          <div class="name-cell table-cell">{{t('InstanceCreationModal.ProfileName')}}</div>
         </div>
         <div
           v-if="
@@ -160,7 +160,7 @@
             </div>
           </div>
         </div>
-        <div v-else class="table-content empty">No profiles found</div>
+        <div v-else class="table-content empty">{{t('InstanceCreationModal.NoProfileFound')}}</div>
       </div>
       <div class="button-row">
         <Button
@@ -236,7 +236,8 @@ import {
   import_instance,
 } from '@/helpers/import.js'
 import ProgressBar from '@/components/ui/ProgressBar.vue'
-
+import { i18n } from '@/main.js';
+const t = i18n.global.t;
 const themeStore = useTheming()
 
 const profile_name = ref('')

diff --git a/theseus_gui/src/languages/en_us.json b/theseus_gui/src/languages/en_us.json
@@ -282,5 +282,27 @@
     "OpenFolder": "Open Folder",
     "OpenInMR": "Open in Modrinth",
     "CopyLink": "Copy Link"
+  },
+  "InstanceCreationModal": {
+    "CreateInstance": "Create instance",
+    "SelectIcon": "Select icon",
+    "RemoveIcon": "Remove icon",
+    "Name": "Name",
+    "Loader": "Loader",
+    "GameVersion": "Game Version",
+    "GameVersionSelection": "Select game version",
+    "LoaderVersion": "Loader Version",
+    "LoaderVersionSelection1": "Select version",
+    "LoaderVersionSelection2": "Select loader version",
+    "warn1": "Select a game version before you select a loader version",
+    "HideAdvanced": "Hide advanced",
+    "ShowAdvanced": "Show advanced",
+    "Cancel": "Cancel",
+    "Creating": "Creating...",
+    "Create": "Create",
+    "Import": "Import from file",
+    "DragImport": "Or drag and drop your .mrpack file",
+    "ProfileName": "Profile name",
+    "NoProfileFound": "No profiles found"
   }
 }
diff --git a/theseus_gui/src/languages/ru_ru.json b/theseus_gui/src/languages/ru_ru.json
@@ -282,5 +282,27 @@
     "OpenFolder": "Открыть папку",
     "OpenInMR": "Открыть в Modrinth",
     "CopyLink": "Копировать ссылку"
+  },
+  "InstanceCreationModal": {
+    "CreateInstance": "Создать экземпляр",
+    "SelectIcon": "Выбрать значок",
+    "RemoveIcon": "Удалить значок",
+    "Name": "Название",
+    "Loader": "Загрузчик",
+    "GameVersion": "Версия игры",
+    "GameVersionSelection": "Выбрать версию игры",
+    "LoaderVersion": "Версия загрузчика",
+    "LoaderVersionSelection1": "Выбрать версию",
+    "LoaderVersionSelection2": "Выбрать версию загрузчика",
+    "warn1": "Выберите версию игры перед выбором версии загрузчика",
+    "HideAdvanced": "Скрыть дополнительные опции",
+    "ShowAdvanced": "Показать дополнительные опции",
+    "Cancel": "Отмена",
+    "Creating": "Создание...",
+    "Create": "Создать",
+    "Import": "Импорт из файла",
+    "DragImport": "Или перетащите ваш файл .mrpack",
+    "ProfileName": "Название профиля",
+    "NoProfileFound": "Профили не найдены"
   }
 }
diff --git a/theseus_gui/src/pages/Settings.vue b/theseus_gui/src/pages/Settings.vue
@@ -230,7 +230,7 @@ async function refreshDir() {
 
       <div class="adjacent-input">
         <label for="language">
-          <span class="label__title">[⚑ RUS 20% COMPLETED] {{t('Settings.Language')}}</span>
+          <span class="label__title">{{t('Settings.Language')}}</span>
           <span class="label__description">{{t('Settings.ChangeTheGlobalLauncherLanguages')}}</span>
         </label>
         <DropdownSelect