Skip to content

FOUR-13914 | The Language Selected for a User Is Not Complete #6201

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

Merged
merged 2 commits into from
Feb 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 9 additions & 9 deletions resources/js/components/shared/DataCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<template #header>
<div class="header">
<i class="text-secondary data-card-header fas nav-icon d-inline align-middle" :class="info.icon" />
<h5 class="mb-0 data-card-header d-inline align-middle">{{ info.typeHumanPlural }}</h5>
<h5 class="mb-0 data-card-header d-inline align-middle">{{ $t(info.typeHumanPlural) }}</h5>
<b-form-checkbox
class="data-card-header export-all d-inline align-middle fw-semibold"
:disabled="disabled"
v-model="includeAllByGroup"
>
{{ $root.operation }} All
{{ $t($root.operation) }} {{ $t('All') }}
</b-form-checkbox>
</div>
</template>
Expand All @@ -20,13 +20,13 @@
<div>
<small v-if="hasSomeForcePasswordProtectAsset(info.items)" class="fw-semibold form-text text-muted mt-0">
<i class="fas fa-exclamation-triangle text-warning p-0"/>
{{ info.typeHumanPlural }} may contain sensitive information.
{{ $t(info.typeHumanPlural) }} {{ $t('may contain sensitive information.') }}
</small>
</div>
<span>Status:</span>
<span>{{ $t('Status') }}:</span>
<b-badge v-if="$root.includeAllByGroup[info.type]" pill variant="success">
<i class="fas fa-check-circle export-status-label" />
Full {{ $root.operation }}
{{ $t('Full') }} {{ $t($root.operation) }}
</b-badge>
<b-badge v-else pill variant="warning">
<i class="fas fa-exclamation-triangle export-status-label" />
Expand All @@ -38,17 +38,17 @@
<data-tree :data="elementsCount" :collapsable="false" :show-icon="false"/>
</template>
<template v-else>
Total Elements:
{{ $t('Total Elements') }}:
<span class="fw-semibold">
{{ info.items.length }}
<span v-if="info.items.length > 1">{{ info.typeHumanPlural }}</span>
<span v-else>{{ info.typeHuman }}</span>
<span v-if="info.items.length > 1">{{ $t(info.typeHumanPlural) }}</span>
<span v-else>{{ $t(info.typeHuman) }}</span>
</span>
</template>
<div class="mt-3">
<b-link v-if="$root.includeAllByGroup[info.type]" @click="onGroupDetailsClick">
<i class="fas fa-info-circle fa-fw mr-0 pr-0"></i>
Details
{{ $t('Details') }}
</b-link>
</div>
</b-card-text>
Expand Down
2 changes: 1 addition & 1 deletion resources/js/components/shared/FilterTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
:style="{ width: column.width + 'px' }"
>
<slot :name="column.field">
{{ column.label }}
{{ $t(column.label) }}
</slot>
</div>
<div class="pm-table-filter-button">
Expand Down
2 changes: 1 addition & 1 deletion resources/js/components/shared/SidebarNav.vue
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
class="text-capitalize"
@click="onClick(i)"
>
{{ formatAssetName(page.title) }}
{{ formatAssetName($t(page.title)) }}
</sidebar-button>
</li>
</b-collapse>
Expand Down
4 changes: 2 additions & 2 deletions resources/js/processes-catalogue/components/ProcessTab.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
lazy
>
<b-tab
title="My Requests"
:title="$t('My Requests')"
active
>
<request-tab
Expand All @@ -15,7 +15,7 @@
</b-tab>
<b-tab
class="bg-white"
title="My Tasks"
:title="$t('My Tasks')"
>
<task-tab
:currentUser="currentUser"
Expand Down
26 changes: 13 additions & 13 deletions resources/js/processes/export/components/DependentAssetView.vue
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
<template>
<div class="mb-2">
<h2>{{ $root.operation }} Process: <span class="text-capitalize">{{ processName }}</span></h2>
<h2>{{ $t($root.operation) }} {{ $t('Process') }}: <span class="text-capitalize">{{ processName }}</span></h2>
<hr>
<div>
<div class="mb-2">
<h4>{{ group.typeHumanPlural }}</h4>
<h4>{{ $t(group.typeHumanPlural) }}</h4>
</div>
<div v-if="$root.includeAllByGroup[group.type]" class="mb-2">
<h6 class="mb-0 fw-semibold">{{ $root.operation }} Status:
<h6 class="mb-0 fw-semibold">{{ $t($root.operation) }} {{ $t('Status') }}:
<b-badge pill variant="success">
<i class="fas fa-check-circle export-status-label" />
Full {{ $root.operation }}
{{ $t('Full') }} {{ $t($root.operation) }}
</b-badge>
</h6>
<small class="text-muted"><span class="font-weight-bold">All</span> {{ group.typeHumanPlural }} will be included in this {{ $root.operation.toLowerCase() }}.</small>
<small class="text-muted"><span class="font-weight-bold">{{ $t('All') }}</span> {{ $t(group.typeHumanPlural) }} will be included in this {{ $root.operation.toLowerCase() }}.</small>
</div>
<div v-else class="mb-2">
<h6 class="mb-0 fw-semibold">{{ $root.operation }} Status:
<h6 class="mb-0 fw-semibold">{{ $t($root.operation) }} {{ $t('Status') }}:
<b-badge pill variant="warning">
<i class="fas fa-exclamation-triangle export-status-label" />
Not {{ $root.operation }}ing
</b-badge>
</h6>
<small class="text-muted">{{ group.typeHumanPlural }} will <span class="font-weight-bold">Not</span> be included in this {{ $root.operation.toLowerCase() }}.</small>
<small class="text-muted">{{ $t(group.typeHumanPlural) }} will <span class="font-weight-bold">Not</span> be included in this {{ $root.operation.toLowerCase() }}.</small>
</div>
<div class="mb-2">
<b-link @click="returnToSummaryClick">Return to Summary</b-link>
<b-link @click="returnToSummaryClick">{{ $t('Return to Summary') }}</b-link>
</div>
</div>
<hr>
Expand All @@ -42,18 +42,18 @@
</template>
<b-card-text>
<ul class="process-element-metadata">
<li v-if="item.description">Description: <span class="fw-semibold">{{ item.description }}</span></li>
<li>Categories: <span class="fw-semibold">{{ item.categories }}</span></li>
<li v-if="item.description">{{ $t('Description') }}: <span class="fw-semibold">{{ item.description }}</span></li>
<li>{{ $t('Categories') }}: <span class="fw-semibold">{{ item.categories }}</span></li>
<li v-for="(attribute, i) in item.extraAttributes" :key="i">
<span v-if="i !== 'translatedLanguages'">
{{ i[0].toUpperCase() + i.substring(1) }}: <span class="fw-semibold">{{ attribute }}</span>
</span>
</li>
<!-- <li>Language: <span class="process-metadata"></span></li> -->
<li>Created Date: <span class="fw-semibold">{{ item.createdAt }}</span></li>
<li>Last Modified Date: <span class="fw-semibold">{{ item.updatedAt }}</span></li>
<li>{{ $t('Created Date') }}: <span class="fw-semibold">{{ item.createdAt }}</span></li>
<li>{{ $t('Last Modified Date') }}: <span class="fw-semibold">{{ item.updatedAt }}</span></li>
<li>
Translations:
{{ $t('Translations') }}:
<small class="mr-1 badge badge-pill badge-primary" v-for="language in item.translatedLanguages">
{{ language }}
</small>
Expand Down
31 changes: 16 additions & 15 deletions resources/js/processes/export/components/MainAssetView.vue
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
<template>
<div>
<h2>{{ $root.operation }} Process: <span class="text-capitalize">{{ processName }}</span></h2>
<h2>{{ $t($root.operation) }} {{ $t('Process') }}: <span class="text-capitalize">{{ processName }}</span></h2>
<hr>
<div class="mb-2">
<h4>Summary</h4>
<h4>{{ $t('Summary') }}</h4>
</div>
<div class="mb-2">
<ul v-if="processInfo" class="process-summary mb-2">
<li> Description: <span class="fw-semibold">{{ processInfo.description }}</span></li>
<li> Categories: <span class="fw-semibold">{{ processInfo.categories }}</span></li>
<li> Process Manager:
<li>{{ $t('Description') }}: <span class="fw-semibold">{{ processInfo.description }}</span></li>
<li>{{ $t('Categories') }}: <span class="fw-semibold">{{ processInfo.categories }}</span></li>
<li>{{ $t('Process Manager') }}:
<span class="fw-semibold">
<b-link v-if="processInfo.processManagerId"
:href="`/profile/${processInfo.processManagerId}`"
target="_blank">{{ processInfo.processManager }}</b-link>
<span v-else>{{ processInfo.processManager }}</span>
</span>
</li>
<li> Created: <span class="fw-semibold">{{ processInfo.created_at }}</span></li>
<li> Last Modified:
<span class="fw-semibold">{{ processInfo.updated_at }}</span>
By:
<li>{{ $t('Created') }}: <span class="fw-semibold">{{ processInfo.created_at }}</span></li>
<li>{{ $t('Last Modified') }}:
<span class="fw-semibold">{{ processInfo.updated_at }}</span>
{{ $t('By') }}:
<span class="fw-semibold">
<b-link v-if="processInfo.lastModifiedById"
:href="`/profile/${processInfo.lastModifiedById}`"
Expand All @@ -47,10 +47,10 @@
stacked
:disabled="$root.forcePasswordProtect"
>
Password Protect Export
<b-form-text class="process-options-helper-text">Define a password to protect your export file.</b-form-text>
{{ $t('Password Protect Export') }}
<b-form-text class="process-options-helper-text">{{ $t('Define a password to protect your export file.') }}</b-form-text>
<small v-if="$root.forcePasswordProtect" class="text-danger">
Password protect is required because some assets may have sensitive data.
{{ $t('Password protect is required because some assets may have sensitive data.') }}
</small>
</b-form-checkbox>
<b-form-checkbox
Expand All @@ -59,15 +59,15 @@
class="fw-semibold"
stacked
>
{{ $root.operation }} All Process elements
<b-form-text v-if="$root.operation === 'Export'" class="process-options-helper-text">Include all elements related to this process in your export file.</b-form-text>
{{ $t($root.operation) }} {{ $t('All Process Elements') }}
<b-form-text v-if="$root.operation === 'Export'" class="process-options-helper-text">{{ $t('Include all elements related to this process in your export file.') }}</b-form-text>
<b-form-text v-else class="process-options-helper-text">{{ $t('All elements related to this process will be imported.') }}</b-form-text>
</b-form-checkbox>
</b-form-group>
</div>
<hr>
<div class="pb-2" v-if="groups.length === 0">
<p class="fw-semibold"> This process contains no dependent assets to {{ $root.operation.toLowerCase() }}. </p>
<p class="fw-semibold">{{ $t('This process contains no dependent assets to') }} {{ $t($root.operation.toLowerCase()) }}.</p>
</div>
<div v-for="group in groups" :key="group.type">
<data-card v-if="!group.hidden" :info="group" :isEnabled="$root.hasSomeNotDiscardedByParent(group.items)" :class="!$root.hasSomeNotDiscardedByParent(group.items) ? 'card-disabled' : ''"/>
Expand Down Expand Up @@ -284,6 +284,7 @@ export default {

.process-summary {
padding-left: 0;
list-style: none;
}

.process-options-helper-text {
Expand Down
6 changes: 3 additions & 3 deletions resources/js/processes/export/components/SetPasswordModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@
<b-form-group>
<div v-if="ask">
<b-form-checkbox class="pt-2" v-model="passwordProtect" switch :disabled="$root.forcePasswordProtect">
Password Protect Export
{{ $t('Password Protect Export') }}
</b-form-checkbox>
<small v-if="$root.forcePasswordProtect" class="text-danger">
Password protect is required because some assets may have sensitive data.
{{ $t('Password protect is required because some assets may have sensitive data.') }}
</small>
</div>
<template v-if="passwordProtect === true">
<div class="pt-3">
<label for="set-password">Password</label>
<vue-password v-model="password" id="set-password" :disable-strength=true />
<small v-if="errors.length === true" class="text-danger">{{ 'Password must have at least 8 characters.' }}</small>
<small v-if="errors.length === true" class="text-danger">{{ $t('Password must have at least 8 characters.') }}</small>
</div>
<div class="pt-3">
<label for="confirm-set-password">Verify Password</label>
Expand Down
4 changes: 4 additions & 0 deletions resources/lang/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -762,9 +762,11 @@
"Started By Me": "Von mir begonnen",
"Started import of": "Import gestartet von:",
"Started": "Begonnen",
"STARTED": "Begonnen",
"Starting": "Start",
"State or Region": "Bundesland oder Region",
"Status": "Status",
"STATUS": "STATUS",
"statuses": "Status",
"Sub Process": "Unterprozess",
"Sub process has multiple blank start events": "Der Unterprozess hat mehrere leere Startereignisse",
Expand Down Expand Up @@ -1863,7 +1865,9 @@
"Case #": "Fall Nr.",
"Case title": "Falltitel",
"Task name": "Aufgabenname",
"TASK NAME": "Aufgabenname",
"Due date": "Fälligkeitsdatum",
"DUE DATE": "Fälligkeitsdatum",
"Inbox": "Posteingang",
"{{- subject }} caused an error": "{{- subject }} hat einen Fehler verursacht",
"{{- subject }} completed": "{{- subject }} abgeschlossen",
Expand Down
Loading