Skip to content

Commit

Permalink
Update tolgee cli
Browse files Browse the repository at this point in the history
  • Loading branch information
mircearoata committed Jul 4, 2024
1 parent b11744b commit 6c48816
Show file tree
Hide file tree
Showing 14 changed files with 22 additions and 50 deletions.
2 changes: 1 addition & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
41 changes: 17 additions & 24 deletions frontend/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion frontend/src/lib/components/RemoteServerPicker.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
11 changes: 3 additions & 8 deletions frontend/src/lib/components/left-bar/LaunchButton.svelte
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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>
Expand All @@ -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>
1 change: 0 additions & 1 deletion frontend/src/lib/components/left-bar/LeftBar.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
1 change: 0 additions & 1 deletion frontend/src/lib/components/left-bar/Settings.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
1 change: 0 additions & 1 deletion frontend/src/lib/components/left-bar/Updates.svelte
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 0 additions & 2 deletions frontend/src/lib/components/modals/settings/Proxy.svelte
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
1 change: 0 additions & 1 deletion frontend/src/lib/components/mods-list/ModsList.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
5 changes: 1 addition & 4 deletions frontend/src/lib/components/mods-list/ModsListItem.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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',
Expand Down

0 comments on commit 6c48816

Please sign in to comment.