Skip to content

Commit 241b128

Browse files
hayato-444hayato-444
committed
Re-apply Japanese translations and UI labels after rebase
1 parent 9b481ee commit 241b128

File tree

12 files changed

+342
-122
lines changed

12 files changed

+342
-122
lines changed

‎web/src/frontend/classic/components/AppBar.svelte‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
<Button
8080
class="clickable"
8181
icon={Bookmark}
82-
iconDescription={'Bookmarks'}
82+
iconDescription={$Locale.Frontend_Classic_BookmarkList_Heading()}
8383
kind="ghost"
8484
tooltipPosition="bottom"
8585
tooltipAlignment="center"
@@ -104,17 +104,21 @@
104104
{#if showWindowControls}
105105
<HeaderGlobalAction
106106
on:click={minimize}
107-
iconDescription="Minimize"
107+
iconDescription={$Locale.Frontend_Classic_Window_ButtonMinimize_Description()}
108108
icon={Subtract}
109109
/>
110110
<HeaderGlobalAction
111-
on:click={() => (winMaximized ? restore() : maximize())}
112-
iconDescription="Maximize"
113-
icon={winMaximized ? Copy : Checkbox}
111+
on:click={() => (winMaximized ? restore() : maximize())}
112+
iconDescription={
113+
winMaximized
114+
? $Locale.Frontend_Classic_Window_ButtonRestore_Description()
115+
: $Locale.Frontend_Classic_Window_ButtonMaximize_Description()
116+
}
117+
icon={winMaximized ? Copy : Checkbox}
114118
/>
115119
<HeaderGlobalAction
116120
on:click={() => close()}
117-
iconDescription="Close"
121+
iconDescription={$Locale.Frontend_Classic_Window_ButtonClose_Description()}
118122
icon={Close}
119123
class="close"
120124
/>

‎web/src/frontend/classic/components/BookmarksImport.svelte‎

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,23 @@
11
<script lang="ts">
22
import { Modal, InlineLoading, Tag } from 'carbon-components-svelte';
33
import { type BookmarkImportResult, type BookmarkExportResult } from '.././../../engine/providers/BookmarkPlugin';
4+
import { Locale, SidenavIconsOnTop } from '../stores/Settings';
45
56
export let isModalOpen = false;
67
let importResult: Promise<BookmarkImportResult>;
78
let exportResult: Promise<BookmarkExportResult>;
8-
const importButtonInfo = { text: 'Import' };
9-
const exportButtonInfo = { text: 'Export' };
9+
10+
const importButtonInfo = { text: $Locale.Frontend_Classic_Bookmark_ImportButton() };
11+
const exportButtonInfo = { text: $Locale.Frontend_Classic_Bookmark_ExportButton() };
1012
let pressedButton: undefined | { text: string } = undefined;
1113
1214
function OnSecondaryButtonClick(event: CustomEvent<{ text: string }>) {
1315
switch (event.detail.text) {
14-
case importButtonInfo.text:
16+
case $Locale.Frontend_Classic_Bookmark_ImportButton():
1517
pressedButton = importButtonInfo;
1618
importResult = window.HakuNeko.BookmarkPlugin.Import();
1719
return;
18-
case exportButtonInfo.text:
20+
case $Locale.Frontend_Classic_Bookmark_ExportButton():
1921
pressedButton = exportButtonInfo;
2022
exportResult = window.HakuNeko.BookmarkPlugin.Export();
2123
return;
@@ -30,82 +32,84 @@
3032
on:open
3133
on:close
3234
on:submit
33-
modalHeading="Import/Export bookmarks"
35+
modalHeading={$Locale.Frontend_Classic_Bookmark_ModalHeading()}
3436
preventCloseOnClickOutside
35-
primaryButtonText="Close"
37+
primaryButtonText={$Locale.Frontend_Classic_Bookmark_CloseButton()}
3638
secondaryButtons={[importButtonInfo, exportButtonInfo]}
3739
on:click:button--primary={() => isModalOpen = false}
3840
on:click:button--secondary={OnSecondaryButtonClick}
3941
>
4042
{#if !pressedButton}
4143
<InlineLoading
4244
status="inactive"
43-
description="Import Hakuneko's bookmarks from previous version"
45+
description={$Locale.Frontend_Classic_Bookmark_ImportDescription()}
4446
/>
4547
{/if}
4648
{#if pressedButton === importButtonInfo}
4749
{#await importResult}
4850
<InlineLoading
4951
status="active"
50-
description="Import in progress ..."
52+
description={$Locale.Frontend_Classic_Bookmark_Importing()}
5153
/>
5254
{:then results}
5355
{#if results.cancelled}
54-
<InlineLoading status="error" description="User canceled" />
56+
<InlineLoading status="error" description={$Locale.Frontend_Classic_Bookmark_UserCanceled()} />
5557
{:else}
5658
<InlineLoading
5759
status="finished"
58-
description="Import completed"
60+
description={$Locale.Frontend_Classic_Bookmark_ImportDone()}
5961
/>
6062
<div>
6163
<Tag type="cyan">
6264
({results.found})
63-
</Tag> found
65+
</Tag> {$Locale.Frontend_Classic_Bookmark_Found().replace('{0}', String(results.found))}
6466
</div>
6567
<div>
6668
<Tag type="green">
6769
({results.imported})
68-
</Tag> imported
70+
</Tag> {$Locale.Frontend_Classic_Bookmark_Imported().replace('{0}', String(results.imported))}
71+
6972
</div>
7073
<div>
7174
<Tag type="cool-gray">
7275
({results.skipped})
73-
</Tag> skipped
76+
</Tag> {$Locale.Frontend_Classic_Bookmark_Skipped().replace('{0}', String(results.skipped))}
7477
</div>
7578
<div>
7679
<Tag type="red">
7780
({results.broken})
78-
</Tag> broken
81+
</Tag> {$Locale.Frontend_Classic_Bookmark_Broken().replace('{0}', String(results.broken))}
7982
</div>
8083
{/if}
8184
{:catch error}
82-
<InlineLoading status="error" description="Error: {error}"
83-
></InlineLoading>
85+
<InlineLoading status="error" description={$Locale.Frontend_Classic_Bookmark_Error(String(error))} />
8486
{/await}
8587
{/if}
8688
{#if pressedButton === exportButtonInfo}
8789
{#await exportResult}
8890
<InlineLoading
8991
status="active"
90-
description="Export in progress ..."
92+
description={$Locale.Frontend_Classic_Bookmark_Exporting()}
9193
/>
9294
{:then results}
9395
{#if results.cancelled}
94-
<InlineLoading status="error" description="User canceled" />
96+
<InlineLoading status="error" description={$Locale.Frontend_Classic_Bookmark_UserCanceled()} />
9597
{:else}
9698
<InlineLoading
9799
status="finished"
98-
description="Export completed"
100+
description={$Locale.Frontend_Classic_Bookmark_ExportDone()}
99101
/>
100102
<div>
101103
<Tag type="green">
102104
({results.exported})
103-
</Tag> exported
105+
</Tag> {$Locale.Frontend_Classic_Bookmark_Exported()}
104106
</div>
105107
{/if}
106108
{:catch error}
107-
<InlineLoading status="error" description="Error: {error}"
108-
></InlineLoading>
109+
<InlineLoading
110+
status="error"
111+
description={$Locale.Frontend_Classic_Bookmark_Error(error.message ?? String(error))}
112+
/>
109113
{/await}
110114
{/if}
111115
</Modal>

‎web/src/frontend/classic/components/DownloadManagerStatus.svelte‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
import TrashCan from 'carbon-icons-svelte/lib/TrashCan.svelte';
1313
import { DownloadTask, Status } from '../../../engine/DownloadTask';
1414
import DownloadManager from './DownloadManager.svelte';
15+
import { Locale } from '../stores/Settings';
16+
1517
1618
let previousTasks: DownloadTask[] = [];
1719
let currentDownload: DownloadTask;
@@ -117,20 +119,20 @@
117119
kind="secondary"
118120
size="small"
119121
icon={Clean}
120-
iconDescription="Clear finished tasks"
122+
iconDescription={$Locale.Frontend_DownloadManager_ClearFinished()}
121123
on:click={() => deleteTasks(Status.Completed)}
122124
/>
123125
<Button
124126
size="small"
125127
icon={RetryFailed}
126-
iconDescription="Retry failed tasks"
128+
iconDescription={$Locale.Frontend_DownloadManager_RetryFailed()}
127129
on:click={() => retryTasks(Status.Failed)}
128130
/>
129131
<Button
130132
kind="danger-tertiary"
131133
size="small"
132134
icon={TrashCan}
133-
iconDescription="Delete all tasks"
135+
iconDescription={$Locale.Frontend_DownloadManager_DeleteAll()}
134136
on:click={() => deleteTasks()}
135137
/>
136138
</div>
@@ -141,14 +143,17 @@
141143
<div class="label">
142144
<CloudDownload size={32}></CloudDownload>
143145
<div class="count">
144-
Downloads ({downloadTasks.filter((job) =>
146+
{$Locale.Frontend_DownloadManager_Active(
147+
`${downloadTasks.filter((job) =>
145148
[
146149
Status.Downloading,
147150
Status.Processing,
148151
Status.Queued,
149152
].includes(job.Status.Value),
150-
)?.length})
151-
</div>
153+
)?.length}`
154+
)}
155+
</div>
156+
152157
</div>
153158
<div class="downloads">
154159
{#if downloadTasks.length > 0}
@@ -157,11 +162,10 @@
157162
<ProgressBar
158163
value={progress * 100}
159164
status={statusmap[status]}
160-
labelText="[{currentDownload.Media.Parent
161-
.Title}] {currentDownload.Media.Title}"
165+
labelText={`${currentDownload.Media.Parent.Title} - ${currentDownload.Media.Title}`}
162166
></ProgressBar>
163167
{:else}
164-
<ProgressBar size="sm" value={0} labelText="<no tasks>"
168+
<ProgressBar size="sm" value={0} labelText={$Locale.Frontend_DownloadManager_NoTasks()}
165169
></ProgressBar>
166170
{/if}
167171
</div>

‎web/src/frontend/classic/components/DownloadManagerTask.svelte‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
99
import type { DownloadTask } from '../../../engine/DownloadTask';
1010
import { Status } from '../../../engine/DownloadTask';
11+
import { Locale } from '../stores/Settings';
12+
1113
1214
interface Props {
1315
job: DownloadTask;
@@ -82,7 +84,7 @@
8284
kind="ghost"
8385
size="small"
8486
icon={TrashCan}
85-
iconDescription="Delete"
87+
iconDescription={$Locale.Frontend_DownloadManagerTask_Delete()}
8688
on:click={() => window.HakuNeko.DownloadManager.Dequeue(job)}
8789
/>
8890
</div>

‎web/src/frontend/classic/components/MediaItem.svelte‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import View from 'carbon-icons-svelte/lib/View.svelte';
2626
import ViewFilled from 'carbon-icons-svelte/lib/ViewFilled.svelte';
2727
import VolumeFileStorage from 'carbon-icons-svelte/lib/VolumeFileStorage.svelte';
28+
2829
2930
import { Tags, type Tag } from '../../../engine/Tags';
3031
const availableLanguageTags = Tags.Language.toArray();
@@ -135,7 +136,7 @@
135136
tooltipPosition="right"
136137
tooltipAlignment="end"
137138
icon={CloudDownload}
138-
iconDescription="Download"
139+
iconDescription={$Locale.Frontend_MediaItem_Download()}
139140
onclick={() => addDownload(item as StoreableMediaContainer<MediaItem>)}
140141
/>
141142
{:else if downloadTaskStatus === Status.Queued}
@@ -144,7 +145,7 @@
144145
kind="ghost"
145146
tooltipPosition="right"
146147
tooltipAlignment="end"
147-
iconDescription="Cancel"
148+
iconDescription={$Locale.Frontend_MediaItem_Cancel()}
148149
onclick={() => addDownload(item as StoreableMediaContainer<MediaItem>)}
149150
>
150151
<PauseFuture fill="var(--cds-icon-secondary)" />
@@ -155,7 +156,7 @@
155156
kind="ghost"
156157
tooltipPosition="right"
157158
tooltipAlignment="end"
158-
iconDescription="Cancel (paused)"
159+
iconDescription={$Locale.Frontend_MediaItem_CancelPaused()}
159160
onclick={() => removeDownload(downloadTask)}
160161
>
161162
<Pause fill="var(--cds-toggle-off)" />
@@ -166,7 +167,7 @@
166167
kind="ghost"
167168
tooltipPosition="right"
168169
tooltipAlignment="end"
169-
iconDescription="Cancel (downloading...)"
170+
iconDescription={$Locale.Frontend_MediaItem_CancelDownloading()}
170171
onclick={() => removeDownload(downloadTask)}
171172
>
172173
<Download fill="var(--cds-support-info)" />
@@ -176,7 +177,7 @@
176177
<Button
177178
size="small"
178179
kind="ghost"
179-
iconDescription="Cancel (processing...)"
180+
iconDescription={$Locale.Frontend_MediaItem_CancelProcessing()}
180181
onclick={() => removeDownload(downloadTask)}
181182
>
182183
<VolumeFileStorage fill="var(--cds-support-info)" />
@@ -188,7 +189,7 @@
188189
tooltipPosition="right"
189190
tooltipAlignment="end"
190191
icon={EventIncident}
191-
iconDescription="Error: click to retry (detailed error in download tasks)"
192+
iconDescription={$Locale.Frontend_MediaItem_ErrorRetry()}
192193
onclick={() => downloadTask.Run()}
193194
/>
194195
{:else if downloadTaskStatus === Status.Completed}
@@ -197,7 +198,7 @@
197198
kind="ghost"
198199
tooltipPosition="right"
199200
tooltipAlignment="end"
200-
iconDescription="Download complete"
201+
iconDescription={$Locale.Frontend_MediaItem_DownloadComplete()}
201202
onclick={() => alert('Download complete. TODO: open folder using system explorer')}
202203
>
203204
<FolderOpen fill="var(--cds-support-03)" />
@@ -208,7 +209,7 @@
208209
kind="ghost"
209210
tooltipPosition="right"
210211
tooltipAlignment="end"
211-
iconDescription="Download"
212+
iconDescription={$Locale.Frontend_MediaItem_Download()}
212213
onclick={() => addDownload(item as StoreableMediaContainer<MediaItem>)}
213214
>
214215
<CloudDownload fill="var(--cds-icon-01)" />
@@ -220,7 +221,7 @@
220221
icon={flagicon}
221222
tooltipPosition="right"
222223
tooltipAlignment="end"
223-
iconDescription="View"
224+
iconDescription={$Locale.Frontend_MediaItem_View()}
224225
onclick={(event) => onView(event)}
225226
/>
226227
<ClickableTile class="title" onclick={(event) => onView(event)}>

0 commit comments

Comments
 (0)