Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix/issue #4613 Improve Scope of Translations #7505

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
4af720e
updated docker-compose file
YAI-cs Feb 12, 2025
e8f9be0
Merge pull request #1 from Ahirshson02/Yailan
YAI-cs Feb 12, 2025
fd8ef55
Merge branch 'kestra-io:develop' into develop
YAI-cs Feb 12, 2025
a4ac4fc
Merge branch 'kestra-io:develop' into develop
YAI-cs Feb 14, 2025
d9f8288
admin-filter done
Ahirshson02 Feb 18, 2025
b5fefc8
Merge branch 'develop' of https://github.com/Ahirshson02/kestraFork i…
Ahirshson02 Feb 18, 2025
1cb949d
Merge branch 'kestra-io:develop' into develop
YAI-cs Feb 19, 2025
f78113c
WIP: Saving my changes before pulling develop
YAI-cs Feb 19, 2025
364eb66
Merge develop with latest changes
YAI-cs Feb 19, 2025
eb55b2d
Updated en.json and translation
YAI-cs Feb 19, 2025
b92b538
Added translation tags in multiple folders and translations in the en…
Christianarauz01 Feb 20, 2025
5d59b08
Merge Chris's Work into main fork branch
Ahirshson02 Feb 20, 2025
394b62f
fix(ui): Issue #4613 improved scope of translation
Ahirshson02 Feb 20, 2025
568ce85
Merge branch 'develop' into fix/scope-of-translation-#4613
MilosPaunovic Feb 21, 2025
f59d882
chore(ui): revert changes on unrelated files
MilosPaunovic Feb 21, 2025
e1b2342
chore(ui): revert changes on unrelated files
MilosPaunovic Feb 21, 2025
b7831e5
chore(ui): revert changes on unrelated files
MilosPaunovic Feb 21, 2025
7779688
chore(ui): tweaks
MilosPaunovic Feb 21, 2025
5d4b4d7
chore(ui): tweaks
MilosPaunovic Feb 21, 2025
dcc1d4a
chore(ui): tweaks
MilosPaunovic Feb 21, 2025
ae2221a
Merge branch 'develop' into fix/scope-of-translation-#4613
MilosPaunovic Feb 21, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions ui/src/components/admin/stats/BasicAuthPrompt.vue
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
<template>
<div class="d-flex" v-if="!configs.isBasicAuthEnabled">
<el-text>Your data is not protected. Don't loose it. <b>Enable our free security features or try our paid offering.</b></el-text>
<el-text>
<span v-html="$t('data_not_protected')" />
</el-text>
<el-button class="ms-auto" @click="promptForCredentials">
<b>Activate Basic Authentication</b>
<b>{{ $t('activate_basic_auth') }}</b>
</el-button>

<el-dialog v-if="promptOAuthCredentials" v-model="promptOAuthCredentials" destroy-on-close :append-to-body="true">
Expand Down
12 changes: 6 additions & 6 deletions ui/src/components/content/CardLogos.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
alt="Dark version logo"
>
<p class="title">
Dark version
{{ $t('dark_version') }}
</p>
<p class="description">
Use this version when working on a dark background to ensure our name remains readable.
{{ $t('use_dark_background') }}
</p>
</div>

Expand All @@ -27,10 +27,10 @@
alt="Light version logo"
>
<p class="title">
Light version
{{ $t('light_version') }}
</p>
<p class="description">
This is the preferred option when working with a light background.
{{ $t('light_background') }}
</p>
</div>

Expand All @@ -44,10 +44,10 @@
alt="Monogram version logo"
>
<p class="title">
Monogram
{{ $t('monogram') }}
</p>
<p class="description">
The wordmark colors adapt based on the background, while the icon remains without a background when placed on a dark background.
{{ $t('wordmark_colors') }}
</p>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion ui/src/components/content/DownloadLogoPack.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
download
:href="$store.getters['doc/resourceUrl']('kestra-logo-kit.zip')"
>
<LinkVariant /> Download Logo Pack
<LinkVariant /> {{ $t('download_logos') }}
</a>
</template>

Expand Down
2 changes: 1 addition & 1 deletion ui/src/components/executions/ChangeExecutionStatus.vue
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<p v-html="$t('change execution state confirm', {id: execution.id})" />

<p>
Current status is : <status size="small" class="me-1" :status="execution.state.current" />
{{ $t("change state current state") }} <status size="small" class="me-1" :status="execution.state.current" />
</p>

<el-select
Expand Down
2 changes: 1 addition & 1 deletion ui/src/components/executions/FilePreview.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<el-button size="small" type="primary" :icon="EyeOutline" @click="getFilePreview">
Preview
{{ $t("preview") }}
</el-button>
<drawer
v-if="selectedPreview === value && preview"
Expand Down
2 changes: 1 addition & 1 deletion ui/src/components/executions/Gantt.vue
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<div>
<el-tooltip placement="right" :persistent="false" :hide-after="0" effect="light">
<template #content>
<span>This task has {{ item.attempts }} attempts.</span>
<span>{{ $t("this_task_has") }} {{ item.attempts }} {{ $t("attempts").toLowerCase() }}.</span>
</template>
<Warning
v-if="item.attempts > 1"
Expand Down
2 changes: 1 addition & 1 deletion ui/src/components/flows/FlowRootTopBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<top-nav-bar :breadcrumb="routeInfo.breadcrumb" :title="routeInfo.title">
<template #title>
<template v-if="deleted">
<Alert class="text-warning me-2" />Deleted:&nbsp;
<Alert class="text-warning me-2" />{{ $t('deleted_label') }}:&nbsp;
</template>
<Lock v-else-if="!isAllowedEdit" class="me-2 gray-700" />
<span :class="{'body-color': deleted}">{{ routeInfo.title }}</span>
Expand Down
18 changes: 9 additions & 9 deletions ui/src/components/flows/MetadataEditor.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
<el-form label-position="top">
<el-form-item :required="true">
<template #label>
<code>id</code>
<code>{{ $t("id") }}</code>
</template>
<el-input :disabled="editing" v-model="newMetadata.id" />
</el-form-item>
<el-form-item :required="true">
<template #label>
<code>namespace</code>
<code>{{ $t("namespace") }}</code>
</template>
<el-input :disabled="editing" v-model="newMetadata.namespace" />
</el-form-item>
Expand Down Expand Up @@ -52,7 +52,7 @@
</el-form-item>
<el-form-item>
<template #label>
<code>labels</code>
<code>{{ $t("labels") }}</code>
</template>
<div class="d-flex w-100" v-for="(item, index) in newMetadata.labels" :key="index">
<div class="flex-fill flex-grow-1 w-100 me-2">
Expand Down Expand Up @@ -81,13 +81,13 @@
</el-form-item>
<el-form-item>
<template #label>
<code>inputs</code>
<code>{{ $t("inputs") }}</code>
</template>
<metadata-inputs v-model="newMetadata.inputs" :inputs="newMetadata.inputs" />
</el-form-item>
<el-form-item>
<template #label>
<code>outputs</code>
<code>{{ $t("outputs") }}</code>
</template>
<editor
:model-value="newMetadata.outputs"
Expand All @@ -100,7 +100,7 @@
</el-form-item>
<el-form-item>
<template #label>
<code>variables</code>
<code>{{ $t("variables") }}</code>
</template>
<metadata-variables v-model="newMetadata.variables" :variables="newMetadata.variables" />
</el-form-item>
Expand All @@ -111,7 +111,7 @@
/>
<el-form-item v-if="concurrencySchema">
<template #label>
<code>concurrency</code>
<code>{{ $t("concurrency") }}</code>
<br>
<task-basic
:schema="concurrencySchema"
Expand All @@ -123,7 +123,7 @@
</el-form-item>
<el-form-item>
<template #label>
<code>pluginDefaults</code>
<code>{{ $t("plugin defaults") }}</code>
</template>
<editor
:model-value="newMetadata.pluginDefaults"
Expand All @@ -136,7 +136,7 @@
</el-form-item>
<el-form-item>
<template #label>
<code>disabled</code>
<code>{{ $t("disabled") }}</code>
</template>
<div>
<el-switch active-color="green" v-model="newMetadata.disabled" @update:model-value="(value) => newMetadata.disabled = value" />
Expand Down
8 changes: 4 additions & 4 deletions ui/src/components/flows/MetadataVariables.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<div class="mt-1 mb-2 wrapper">
<drawer v-if="isEditOpen" v-model="isEditOpen">
<template #header>
<code>variables</code>
<code>{{ $t("variables") }}</code>
</template>

<template #footer>
Expand All @@ -22,7 +22,7 @@
<el-form label-position="top">
<el-form-item>
<template #label>
<code>name</code>
<code>{{ $t("name") }}</code>
</template>
<el-input
:model-value="newVariables[selectedIndex][0]"
Expand All @@ -33,7 +33,7 @@
</el-form-item>
<el-form-item>
<template #label>
<code>value</code>
<code>{{ $t("value") }}</code>
</template>
<editor
:model-value="newVariables[selectedIndex][1]"
Expand Down Expand Up @@ -79,7 +79,7 @@
class="w-25"
@click="addVariable"
>
Add
{{ $t("add") }}
</el-button>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion ui/src/components/flows/TaskEditor.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<el-form-item>
<template #label>
<div class="type-div">
<code>type</code>
<code>{{ $t("type") }}</code>
</div>
</template>
<plugin-select
Expand Down
4 changes: 2 additions & 2 deletions ui/src/components/flows/blueprints/BlueprintDetail.vue
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
</editor>
</el-card>
<template v-if="blueprint.description">
<h4>About this blueprint</h4>
<h4>{{ $t('about_this_blueprint') }}</h4>
<div v-if="!system" class="tags text-uppercase">
<div v-for="(tag, index) in blueprint.tags" :key="index" class="tag-box">
<el-tag type="info" size="small">
Expand All @@ -68,7 +68,7 @@
</template>
</el-col>
<el-col :md="24" :lg="embed ? 24 : 6" v-if="blueprint?.includedTasks?.length > 0">
<h4>Plugins</h4>
<h4>{{ $t('plugins.names') }}</h4>
<div class="plugins-container">
<div v-for="task in [...new Set(blueprint.includedTasks)]" :key="task">
<task-icon :cls="task" :icons="icons" />
Expand Down
18 changes: 9 additions & 9 deletions ui/src/components/inputs/DurationPicker.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div class="input-group">
<label for="years">Years</label>
<label for="years">{{ $t('years') }}</label>
<el-input-number
size="small"
controls-position="right"
Expand All @@ -10,7 +10,7 @@
/>
</div>
<div class="input-group">
<label for="months">Months</label>
<label for="months">{{ $t('months') }}</label>
<el-input-number
size="small"
controls-position="right"
Expand All @@ -20,7 +20,7 @@
/>
</div>
<div class="input-group">
<label for="weeks">Weeks</label>
<label for="weeks">{{ $t('weeks') }}</label>
<el-input-number
size="small"
controls-position="right"
Expand All @@ -30,7 +30,7 @@
/>
</div>
<div class="input-group">
<label for="days">Days</label>
<label for="days">{{ $t('days') }}</label>
<el-input-number
size="small"
controls-position="right"
Expand All @@ -40,7 +40,7 @@
/>
</div>
<div class="input-group">
<label for="hours">Hours</label>
<label for="hours">{{ $t('hours') }}</label>
<el-input-number
size="small"
controls-position="right"
Expand All @@ -50,7 +50,7 @@
/>
</div>
<div class="input-group">
<label for="minutes">Minutes</label>
<label for="minutes">{{ $t('minutes') }}</label>
<el-input-number
size="small"
controls-position="right"
Expand All @@ -60,7 +60,7 @@
/>
</div>
<div class="input-group">
<label for="seconds">Seconds</label>
<label for="seconds">{{ $t('seconds') }}</label>
<el-input-number
size="small"
controls-position="right"
Expand All @@ -71,9 +71,9 @@
</div>
<div>
<el-text size="small" :type="durationIssue ? 'danger': ''">
{{ durationIssue ?? "or input custom duration:" }}
{{ durationIssue ?? $t('input_custom_duration') }}
</el-text>
<el-input type="text" id="customDuration" v-model="customDuration" @input="parseDuration" placeholder="Custom duration" />
<el-input type="text" id="customDuration" v-model="customDuration" @input="parseDuration" :placeholder="$t('datepicker.custom duration')" />
</div>
</template>

Expand Down
8 changes: 4 additions & 4 deletions ui/src/components/inputs/Editor.vue
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@
if (!this.readOnly) {
this.editor.addAction({
id: "kestra-save",
label: "Save",
label: this.$t("save"),
keybindings: [KeyMod.CtrlCmd | KeyCode.KeyS],
contextMenuGroupId: "navigation",
contextMenuOrder: 1.5,
Expand All @@ -289,7 +289,7 @@

this.editor.addAction({
id: "kestra-execute",
label: "Execute the flow",
label: this.$t("execute flow behaviour"),
keybindings: [KeyMod.CtrlCmd | KeyCode.KeyE],
contextMenuGroupId: "navigation",
contextMenuOrder: 1.5,
Expand All @@ -300,7 +300,7 @@

this.editor.addAction({
id: "confirm",
label: "Confirm",
label: this.$t("confirm"),
keybindings: [KeyMod.CtrlCmd | KeyCode.Enter],
contextMenuGroupId: "navigation",
contextMenuOrder: 1.5,
Expand Down Expand Up @@ -329,7 +329,7 @@
if (this.original === undefined && this.navbar && this.fullHeight) {
this.editor.addAction({
id: "fold-multiline",
label: "Fold All Multi Lines",
label: this.$t("fold_all_multi_lines"),
keybindings: [KeyCode.F10],
contextMenuGroupId: "fold",
contextMenuOrder: 1.5,
Expand Down
Loading