From 6c48816a4c36d7d22001fac21efb4a924fbc9504 Mon Sep 17 00:00:00 2001
From: Mircea Roata <mircearoatapalade@gmail.com>
Date: Thu, 4 Jul 2024 19:27:53 +0300
Subject: [PATCH] Update tolgee cli

---
 frontend/package.json                         |  2 +-
 frontend/pnpm-lock.yaml                       | 41 ++++++++-----------
 .../lib/components/RemoteServerPicker.svelte  |  1 -
 .../components/left-bar/LaunchButton.svelte   | 11 ++---
 .../lib/components/left-bar/LeftBar.svelte    |  1 -
 .../lib/components/left-bar/Settings.svelte   |  1 -
 .../lib/components/left-bar/Updates.svelte    |  1 -
 .../modals/ExternalInstallMod.svelte          |  1 -
 .../modals/profiles/DeleteProfile.svelte      |  2 -
 .../settings/CacheLocationPicker.svelte       |  2 -
 .../components/modals/settings/Proxy.svelte   |  2 -
 .../modals/smmUpdate/SMMUpdateDownload.svelte |  1 -
 .../lib/components/mods-list/ModsList.svelte  |  1 -
 .../components/mods-list/ModsListItem.svelte  |  5 +--
 14 files changed, 22 insertions(+), 50 deletions(-)

diff --git a/frontend/package.json b/frontend/package.json
index 3d3a5e81..b63f7b03 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -59,7 +59,7 @@
     "@skeletonlabs/tw-plugin": "^0.3.1",
     "@stylistic/eslint-plugin": "^1.6.1",
     "@sveltejs/vite-plugin-svelte": "^3.0.1",
-    "@tolgee/cli": "^2.0.3",
+    "@tolgee/cli": "^2.1.2",
     "@tsconfig/svelte": "^5.0.2",
     "@types/async": "^3.2.24",
     "@types/cookie": "^0.6.0",
diff --git a/frontend/pnpm-lock.yaml b/frontend/pnpm-lock.yaml
index c3fdeef0..d99c6170 100644
--- a/frontend/pnpm-lock.yaml
+++ b/frontend/pnpm-lock.yaml
@@ -70,7 +70,7 @@ dependencies:
     version: 1.0.25
   urql:
     specifier: ^4.0.6
-    version: 4.0.6(graphql@16.8.1)(react@18.2.0)
+    version: 4.0.6(graphql@16.8.1)(react@18.3.1)
 
 devDependencies:
   '@graphql-codegen/add':
@@ -119,8 +119,8 @@ devDependencies:
     specifier: ^3.0.1
     version: 3.0.1(svelte@4.2.8)(vite@5.0.13)
   '@tolgee/cli':
-    specifier: ^2.0.3
-    version: 2.0.3(typescript@5.3.3)
+    specifier: ^2.1.2
+    version: 2.1.2(typescript@5.3.3)
   '@tsconfig/svelte':
     specifier: ^5.0.2
     version: 5.0.2
@@ -1450,11 +1450,6 @@ packages:
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dev: true
 
-  /@fastify/busboy@2.1.1:
-    resolution: {integrity: sha512-vBZP4NlzfOlerQTnba4aqZoMhE/a9HY7HRqoOPaETQcSQuWEIyZMHGfVu6w9wGtGK5fED5qRs2DteVCjOH60sA==}
-    engines: {node: '>=14'}
-    dev: true
-
   /@floating-ui/core@1.6.0:
     resolution: {integrity: sha512-PcF++MykgmTj3CIyOQbKA/hDzOAiqI3mhuoN44WRCopIs1sgoDoU4oty4Jtqaj/y3oDU6fnVSm4QG0a3t5i0+g==}
     dependencies:
@@ -2550,8 +2545,8 @@ packages:
     resolution: {integrity: sha512-KnPRCkQTyqhanNC0K63GBG3wA8I+D1fQuVnAvcBF8f13akOKeQp1gSbu6f77zCxhEk727iV5oQnbHLYzHrECLg==}
     dev: false
 
-  /@tolgee/cli@2.0.3(typescript@5.3.3):
-    resolution: {integrity: sha512-a0X/7I/++rVrMA2Vi6EKgZ3F2N/pFTf03MTuFKnBADO7QksEV/d2eRxFF9VFis2vo1iz0LCicSnYsjSt9co6HQ==}
+  /@tolgee/cli@2.1.2(typescript@5.3.3):
+    resolution: {integrity: sha512-qVCg8S/rBU883ef34oXM9/HsBdN+loVw3QUpnSNmy7tqWlmSUKcrK8qvHondqdB3zTRWQ0twe15n/JyJDeT2QA==}
     engines: {node: '>= 18'}
     hasBin: true
     dependencies:
@@ -2564,10 +2559,9 @@ packages:
       json5: 2.2.3
       jsonschema: 1.4.1
       openapi-fetch: 0.9.7
-      undici: 5.28.4
+      unescape-js: 1.1.4
       vscode-oniguruma: 1.7.0
       vscode-textmate: 9.0.0
-      xstate: 4.38.3
       yauzl: 2.10.0
     transitivePeerDependencies:
       - typescript
@@ -6233,8 +6227,8 @@ packages:
   /queue-microtask@1.2.3:
     resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}
 
-  /react@18.2.0:
-    resolution: {integrity: sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==}
+  /react@18.3.1:
+    resolution: {integrity: sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
       loose-envify: 1.4.0
@@ -6661,6 +6655,10 @@ packages:
       strip-ansi: 7.1.0
     dev: true
 
+  /string.fromcodepoint@0.2.1:
+    resolution: {integrity: sha512-n69H31OnxSGSZyZbgBlvYIXlrMhJQ0dQAX1js1QDhpaUH6zmU3QYlj07bCwCNlPOu3oRXIubGPl2gDGnHsiCqg==}
+    dev: true
+
   /string.prototype.padend@3.1.5:
     resolution: {integrity: sha512-DOB27b/2UTTD+4myKUFh+/fXWcu/UDyASIXfg+7VzoCNNGOfWvoyU/x5pvVHr++ztyt/oSYI1BcWBBG/hmlNjA==}
     engines: {node: '>= 0.4'}
@@ -7104,11 +7102,10 @@ packages:
     resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==}
     dev: true
 
-  /undici@5.28.4:
-    resolution: {integrity: sha512-72RFADWFqKmUb2hmmvNODKL3p9hcB6Gt2DOQMis1SEBaV6a4MH8soBvzg+95CYhCKPFedut2JY9bMfrDl9D23g==}
-    engines: {node: '>=14.0'}
+  /unescape-js@1.1.4:
+    resolution: {integrity: sha512-42SD8NOQEhdYntEiUQdYq/1V/YHwr1HLwlHuTJB5InVVdOSbgI6xu8jK5q65yIzuFCfczzyDF/7hbGzVbyCw0g==}
     dependencies:
-      '@fastify/busboy': 2.1.1
+      string.fromcodepoint: 0.2.1
     dev: true
 
   /unixify@1.0.0:
@@ -7162,13 +7159,13 @@ packages:
     resolution: {integrity: sha512-WHN8KDQblxd32odxeIgo83rdVDE2bvdkb86it7bMhYZwWKJz0+O0RK/eZiHYnM+zgt/U7hAHOlCQGfjjvSkw2g==}
     dev: true
 
-  /urql@4.0.6(graphql@16.8.1)(react@18.2.0):
+  /urql@4.0.6(graphql@16.8.1)(react@18.3.1):
     resolution: {integrity: sha512-meXJ2puOd64uCGKh7Fse2R7gPa8+ZpBOoA62jN7CPXXUt7SVZSdeXWSpB3HvlfzLUkEqsWbvshwrgeWRYNNGaQ==}
     peerDependencies:
       react: '>= 16.8.0'
     dependencies:
       '@urql/core': 4.2.0(graphql@16.8.1)
-      react: 18.2.0
+      react: 18.3.1
       wonka: 6.3.4
     transitivePeerDependencies:
       - graphql
@@ -7363,10 +7360,6 @@ packages:
         optional: true
     dev: true
 
-  /xstate@4.38.3:
-    resolution: {integrity: sha512-SH7nAaaPQx57dx6qvfcIgqKRXIh4L0A1iYEqim4s1u7c9VoCgzZc+63FY90AKU4ZzOC2cfJzTnpO4zK7fCUzzw==}
-    dev: true
-
   /y18n@4.0.3:
     resolution: {integrity: sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==}
     dev: true
diff --git a/frontend/src/lib/components/RemoteServerPicker.svelte b/frontend/src/lib/components/RemoteServerPicker.svelte
index 89d49691..843d09df 100644
--- a/frontend/src/lib/components/RemoteServerPicker.svelte
+++ b/frontend/src/lib/components/RemoteServerPicker.svelte
@@ -2,7 +2,6 @@
   import { mdiFolder, mdiLoading, mdiServerNetwork, mdiSubdirectoryArrowLeft } from '@mdi/js';
   import _ from 'lodash';
   import { onDestroy } from 'svelte';
-  import '@tolgee/svelte'; // Import so that the tolgee cli parses this file
 
   import SvgIcon from '$lib/components/SVGIcon.svelte';
   import T from '$lib/components/T.svelte';
diff --git a/frontend/src/lib/components/left-bar/LaunchButton.svelte b/frontend/src/lib/components/left-bar/LaunchButton.svelte
index effb95ee..26b55de8 100644
--- a/frontend/src/lib/components/left-bar/LaunchButton.svelte
+++ b/frontend/src/lib/components/left-bar/LaunchButton.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
   import { mdiOpenInNew, mdiTrayFull } from '@mdi/js';
   import { getContextClient } from '@urql/svelte';
-  import '@tolgee/svelte'; // Import so that the tolgee cli parses this file
 
   import SvgIcon from '$lib/components/SVGIcon.svelte';
   import T from '$lib/components/T.svelte';
@@ -121,7 +120,7 @@
       on:click={() => startQueue()}
     >
       <span>
-        <T defaultValue={'Apply {queued, plural, one {one change} other {# changes}'} keyName="launch-button.apply-queued" params={{ queued: $queuedMods.length }}/>
+        <T defaultValue={'Apply {queued, plural, one {one change} other {# changes}}'} keyName="launch-button.apply-queued" params={{ queued: $queuedMods.length }}/>
       </span>
       <div class="grow" />
       <SvgIcon
@@ -267,9 +266,7 @@
     </span>
   {:else if areOperationsQueued}
     <span>
-      <T defaultValue="Changes have not yet been made to your mod files. Click the button above to apply the changes you have queued." keyName="launch-button.changes-queued"/>
-      <br/><br/>
-      <T defaultValue={'(You\'re in Queue "Start manually" mode)'} keyName="launch-button.queue-manual"/>
+      <T defaultValue={'Changes have not yet been made to your mod files. Click the button above to apply the changes you have queued.\n\n(You\'re in Queue "Start manually" mode)'} keyName="launch-button.changes-queued"/>
     </span>
   {:else if $isGameRunning}
     <span>
@@ -289,9 +286,7 @@
     </span>
   {:else}
     <span>
-      <T defaultValue="You're ready to rumble!" keyName="launch-button.ready"/>
-      <br/><br/>
-      <T defaultValue="Note: The Mod Manager has already finished installing the mod files for you. You could launch the game using your usual game launcher and mods would still be loaded." keyName="launch-button.ready-note"/>
+      <T defaultValue="You're ready to rumble!\n\nNote: The Mod Manager has already finished installing the mod files for you. You could launch the game using your usual game launcher and mods would still be loaded." keyName="launch-button.ready"/>
     </span>
   {/if}
 </Tooltip>
diff --git a/frontend/src/lib/components/left-bar/LeftBar.svelte b/frontend/src/lib/components/left-bar/LeftBar.svelte
index 31267bc4..ca0865bd 100644
--- a/frontend/src/lib/components/left-bar/LeftBar.svelte
+++ b/frontend/src/lib/components/left-bar/LeftBar.svelte
@@ -3,7 +3,6 @@
   import { type PopupSettings, popup } from '@skeletonlabs/skeleton';
   import _ from 'lodash';
   import { siDiscord, siGithub } from 'simple-icons/icons';
-  import '@tolgee/svelte'; // Import so that the tolgee cli parses this file
 
   import LaunchButton from './LaunchButton.svelte';
   import Settings from './Settings.svelte';
diff --git a/frontend/src/lib/components/left-bar/Settings.svelte b/frontend/src/lib/components/left-bar/Settings.svelte
index 965c5f4d..8e6702a9 100644
--- a/frontend/src/lib/components/left-bar/Settings.svelte
+++ b/frontend/src/lib/components/left-bar/Settings.svelte
@@ -2,7 +2,6 @@
   import { mdiBug, mdiCheck, mdiCheckboxBlankOutline, mdiCheckboxMarkedOutline, mdiChevronRight, mdiClipboard, mdiCog, mdiDownload, mdiFolderEdit, mdiLanConnect, mdiTune } from '@mdi/js';
   import { ListBox, ListBoxItem } from '@skeletonlabs/skeleton';
   import { getContextClient } from '@urql/svelte';
-  import '@tolgee/svelte'; // Import so that the tolgee cli parses this file
 
   import SvgIcon from '$lib/components/SVGIcon.svelte';
   import T from '$lib/components/T.svelte';
diff --git a/frontend/src/lib/components/left-bar/Updates.svelte b/frontend/src/lib/components/left-bar/Updates.svelte
index b0dda806..bf6ba201 100644
--- a/frontend/src/lib/components/left-bar/Updates.svelte
+++ b/frontend/src/lib/components/left-bar/Updates.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
   import { mdiCheckCircle, mdiSync } from '@mdi/js';
-  import '@tolgee/svelte'; // Import so that the tolgee cli parses this file
 
   import SvgIcon from '$lib/components/SVGIcon.svelte';
   import T from '$lib/components/T.svelte';
diff --git a/frontend/src/lib/components/modals/ExternalInstallMod.svelte b/frontend/src/lib/components/modals/ExternalInstallMod.svelte
index 28a7e7d2..c2064c7d 100644
--- a/frontend/src/lib/components/modals/ExternalInstallMod.svelte
+++ b/frontend/src/lib/components/modals/ExternalInstallMod.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
   import { getContextClient, queryStore } from '@urql/svelte';
-  import '@tolgee/svelte'; // Import so that the tolgee cli parses this file
 
   import T from '$lib/components/T.svelte';
   import { GetModSummaryDocument } from '$lib/generated';
diff --git a/frontend/src/lib/components/modals/profiles/DeleteProfile.svelte b/frontend/src/lib/components/modals/profiles/DeleteProfile.svelte
index 76eeb6eb..eb16d5a5 100644
--- a/frontend/src/lib/components/modals/profiles/DeleteProfile.svelte
+++ b/frontend/src/lib/components/modals/profiles/DeleteProfile.svelte
@@ -1,6 +1,4 @@
 <script lang="ts">
-  import '@tolgee/svelte'; // Import so that the tolgee cli parses this file
-
   import T from '$lib/components/T.svelte';
   import { error } from '$lib/store/generalStore';
   import { DeleteProfile } from '$wailsjs/go/ficsitcli/ficsitCLI';
diff --git a/frontend/src/lib/components/modals/settings/CacheLocationPicker.svelte b/frontend/src/lib/components/modals/settings/CacheLocationPicker.svelte
index 3abd6053..1a1086d1 100644
--- a/frontend/src/lib/components/modals/settings/CacheLocationPicker.svelte
+++ b/frontend/src/lib/components/modals/settings/CacheLocationPicker.svelte
@@ -1,6 +1,4 @@
 <script lang="ts">
-  import '@tolgee/svelte'; // Import so that the tolgee cli parses this file
-
   import { newCacheLocation } from './cacheLocationPicker';
 
   import T from '$lib/components/T.svelte';
diff --git a/frontend/src/lib/components/modals/settings/Proxy.svelte b/frontend/src/lib/components/modals/settings/Proxy.svelte
index 6130cade..7ea15011 100644
--- a/frontend/src/lib/components/modals/settings/Proxy.svelte
+++ b/frontend/src/lib/components/modals/settings/Proxy.svelte
@@ -1,6 +1,4 @@
 <script lang="ts">
-  import '@tolgee/svelte'; // Import so that the tolgee cli parses this file
-
   import T from '$lib/components/T.svelte';
   import { progress } from '$lib/store/ficsitCLIStore';
   import { proxy } from '$lib/store/settingsStore';
diff --git a/frontend/src/lib/components/modals/smmUpdate/SMMUpdateDownload.svelte b/frontend/src/lib/components/modals/smmUpdate/SMMUpdateDownload.svelte
index 50d56bb2..edd940f5 100644
--- a/frontend/src/lib/components/modals/smmUpdate/SMMUpdateDownload.svelte
+++ b/frontend/src/lib/components/modals/smmUpdate/SMMUpdateDownload.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
   import { ProgressBar } from '@skeletonlabs/skeleton';
   import { compare } from 'semver';
-  import '@tolgee/svelte'; // Import so that the tolgee cli parses this file
 
   import { isUpdateOnStart } from './smmUpdate';
 
diff --git a/frontend/src/lib/components/mods-list/ModsList.svelte b/frontend/src/lib/components/mods-list/ModsList.svelte
index 967e1e2c..f23227bb 100644
--- a/frontend/src/lib/components/mods-list/ModsList.svelte
+++ b/frontend/src/lib/components/mods-list/ModsList.svelte
@@ -3,7 +3,6 @@
   import Fuse from 'fuse.js';
   import _ from 'lodash';
   import { createEventDispatcher } from 'svelte';
-  import '@tolgee/svelte'; // Import so that the tolgee cli parses this file
 
   import ModListFilters from './ModsListFilters.svelte';
   import ModsListItem from './ModsListItem.svelte';
diff --git a/frontend/src/lib/components/mods-list/ModsListItem.svelte b/frontend/src/lib/components/mods-list/ModsListItem.svelte
index 49f90357..c438b00a 100644
--- a/frontend/src/lib/components/mods-list/ModsListItem.svelte
+++ b/frontend/src/lib/components/mods-list/ModsListItem.svelte
@@ -112,7 +112,7 @@
         display.tooltipHtml = '<br/>' + compatibility.note;
       } else {
         // TODO compatibility.note should always be non-null here, what should our fallback text be if it's not?
-        display.tooltip += $t('mod.list-item.compatibility-note-none', ' (None specified)');
+        display.tooltip += $t('mod-list-item.compatibility-note-none', ' (None specified)');
       }
     }
     if (queued) {
@@ -188,9 +188,6 @@
             if (result.source === 'reported') {
               compatibility = {
                 state: result.state,
-                // note: result.note 
-                //   ? `This mod has been reported as ${result.state} on this game version.<br>${result.note}` 
-                //   : `This mod has been reported as ${result.state} on this game version. (No further notes provided)`,
                 note: $t('mod-list-item.compatibility-note', 'This mod has been reported as {state} on this game version.', { state: result.state }) 
                   + result.note ? '<br>' + result.note : ' ' + $t('mod-list-item.compatibility-note-none', '(No further notes provided)'),
                 source: 'reported',