Skip to content

Commit ee92cf9

Browse files
ryancooleyryancooley
authored
Merge pull request #6201 from ProcessMaker/observation/FOUR-13914-b
FOUR-13914 | The Language Selected for a User Is Not Complete
2 parents 8f5641a + 050bd6b commit ee92cf9

11 files changed

Lines changed: 103 additions & 52 deletions

File tree

‎resources/js/components/shared/DataCard.vue‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
<template #header>
55
<div class="header">
66
<i class="text-secondary data-card-header fas nav-icon d-inline align-middle" :class="info.icon" />
7-
<h5 class="mb-0 data-card-header d-inline align-middle">{{ info.typeHumanPlural }}</h5>
7+
<h5 class="mb-0 data-card-header d-inline align-middle">{{ $t(info.typeHumanPlural) }}</h5>
88
<b-form-checkbox
99
class="data-card-header export-all d-inline align-middle fw-semibold"
1010
:disabled="disabled"
1111
v-model="includeAllByGroup"
1212
>
13-
{{ $root.operation }} All
13+
{{ $t($root.operation) }} {{ $t('All') }}
1414
</b-form-checkbox>
1515
</div>
1616
</template>
@@ -20,13 +20,13 @@
2020
<div>
2121
<small v-if="hasSomeForcePasswordProtectAsset(info.items)" class="fw-semibold form-text text-muted mt-0">
2222
<i class="fas fa-exclamation-triangle text-warning p-0"/>
23-
{{ info.typeHumanPlural }} may contain sensitive information.
23+
{{ $t(info.typeHumanPlural) }} {{ $t('may contain sensitive information.') }}
2424
</small>
2525
</div>
26-
<span>Status:</span>
26+
<span>{{ $t('Status') }}:</span>
2727
<b-badge v-if="$root.includeAllByGroup[info.type]" pill variant="success">
2828
<i class="fas fa-check-circle export-status-label" />
29-
Full {{ $root.operation }}
29+
{{ $t('Full') }} {{ $t($root.operation) }}
3030
</b-badge>
3131
<b-badge v-else pill variant="warning">
3232
<i class="fas fa-exclamation-triangle export-status-label" />
@@ -38,17 +38,17 @@
3838
<data-tree :data="elementsCount" :collapsable="false" :show-icon="false"/>
3939
</template>
4040
<template v-else>
41-
Total Elements:
41+
{{ $t('Total Elements') }}:
4242
<span class="fw-semibold">
4343
{{ info.items.length }}
44-
<span v-if="info.items.length > 1">{{ info.typeHumanPlural }}</span>
45-
<span v-else>{{ info.typeHuman }}</span>
44+
<span v-if="info.items.length > 1">{{ $t(info.typeHumanPlural) }}</span>
45+
<span v-else>{{ $t(info.typeHuman) }}</span>
4646
</span>
4747
</template>
4848
<div class="mt-3">
4949
<b-link v-if="$root.includeAllByGroup[info.type]" @click="onGroupDetailsClick">
5050
<i class="fas fa-info-circle fa-fw mr-0 pr-0"></i>
51-
Details
51+
{{ $t('Details') }}
5252
</b-link>
5353
</div>
5454
</b-card-text>

‎resources/js/components/shared/FilterTable.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
:style="{ width: column.width + 'px' }"
2929
>
3030
<slot :name="column.field">
31-
{{ column.label }}
31+
{{ $t(column.label) }}
3232
</slot>
3333
</div>
3434
<div class="pm-table-filter-button">

‎resources/js/components/shared/SidebarNav.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
class="text-capitalize"
3232
@click="onClick(i)"
3333
>
34-
{{ formatAssetName(page.title) }}
34+
{{ formatAssetName($t(page.title)) }}
3535
</sidebar-button>
3636
</li>
3737
</b-collapse>

‎resources/js/processes-catalogue/components/ProcessTab.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
lazy
66
>
77
<b-tab
8-
title="My Requests"
8+
:title="$t('My Requests')"
99
active
1010
>
1111
<request-tab
@@ -15,7 +15,7 @@
1515
</b-tab>
1616
<b-tab
1717
class="bg-white"
18-
title="My Tasks"
18+
:title="$t('My Tasks')"
1919
>
2020
<task-tab
2121
:currentUser="currentUser"

‎resources/js/processes/export/components/DependentAssetView.vue‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
<template>
22
<div class="mb-2">
3-
<h2>{{ $root.operation }} Process: <span class="text-capitalize">{{ processName }}</span></h2>
3+
<h2>{{ $t($root.operation) }} {{ $t('Process') }}: <span class="text-capitalize">{{ processName }}</span></h2>
44
<hr>
55
<div>
66
<div class="mb-2">
7-
<h4>{{ group.typeHumanPlural }}</h4>
7+
<h4>{{ $t(group.typeHumanPlural) }}</h4>
88
</div>
99
<div v-if="$root.includeAllByGroup[group.type]" class="mb-2">
10-
<h6 class="mb-0 fw-semibold">{{ $root.operation }} Status:
10+
<h6 class="mb-0 fw-semibold">{{ $t($root.operation) }} {{ $t('Status') }}:
1111
<b-badge pill variant="success">
1212
<i class="fas fa-check-circle export-status-label" />
13-
Full {{ $root.operation }}
13+
{{ $t('Full') }} {{ $t($root.operation) }}
1414
</b-badge>
1515
</h6>
16-
<small class="text-muted"><span class="font-weight-bold">All</span> {{ group.typeHumanPlural }} will be included in this {{ $root.operation.toLowerCase() }}.</small>
16+
<small class="text-muted"><span class="font-weight-bold">{{ $t('All') }}</span> {{ $t(group.typeHumanPlural) }} will be included in this {{ $root.operation.toLowerCase() }}.</small>
1717
</div>
1818
<div v-else class="mb-2">
19-
<h6 class="mb-0 fw-semibold">{{ $root.operation }} Status:
19+
<h6 class="mb-0 fw-semibold">{{ $t($root.operation) }} {{ $t('Status') }}:
2020
<b-badge pill variant="warning">
2121
<i class="fas fa-exclamation-triangle export-status-label" />
2222
Not {{ $root.operation }}ing
2323
</b-badge>
2424
</h6>
25-
<small class="text-muted">{{ group.typeHumanPlural }} will <span class="font-weight-bold">Not</span> be included in this {{ $root.operation.toLowerCase() }}.</small>
25+
<small class="text-muted">{{ $t(group.typeHumanPlural) }} will <span class="font-weight-bold">Not</span> be included in this {{ $root.operation.toLowerCase() }}.</small>
2626
</div>
2727
<div class="mb-2">
28-
<b-link @click="returnToSummaryClick">Return to Summary</b-link>
28+
<b-link @click="returnToSummaryClick">{{ $t('Return to Summary') }}</b-link>
2929
</div>
3030
</div>
3131
<hr>
@@ -42,18 +42,18 @@
4242
</template>
4343
<b-card-text>
4444
<ul class="process-element-metadata">
45-
<li v-if="item.description">Description: <span class="fw-semibold">{{ item.description }}</span></li>
46-
<li>Categories: <span class="fw-semibold">{{ item.categories }}</span></li>
45+
<li v-if="item.description">{{ $t('Description') }}: <span class="fw-semibold">{{ item.description }}</span></li>
46+
<li>{{ $t('Categories') }}: <span class="fw-semibold">{{ item.categories }}</span></li>
4747
<li v-for="(attribute, i) in item.extraAttributes" :key="i">
4848
<span v-if="i !== 'translatedLanguages'">
4949
{{ i[0].toUpperCase() + i.substring(1) }}: <span class="fw-semibold">{{ attribute }}</span>
5050
</span>
5151
</li>
5252
<!-- <li>Language: <span class="process-metadata"></span></li> -->
53-
<li>Created Date: <span class="fw-semibold">{{ item.createdAt }}</span></li>
54-
<li>Last Modified Date: <span class="fw-semibold">{{ item.updatedAt }}</span></li>
53+
<li>{{ $t('Created Date') }}: <span class="fw-semibold">{{ item.createdAt }}</span></li>
54+
<li>{{ $t('Last Modified Date') }}: <span class="fw-semibold">{{ item.updatedAt }}</span></li>
5555
<li>
56-
Translations:
56+
{{ $t('Translations') }}:
5757
<small class="mr-1 badge badge-pill badge-primary" v-for="language in item.translatedLanguages">
5858
{{ language }}
5959
</small>

‎resources/js/processes/export/components/MainAssetView.vue‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
<template>
22
<div>
3-
<h2>{{ $root.operation }} Process: <span class="text-capitalize">{{ processName }}</span></h2>
3+
<h2>{{ $t($root.operation) }} {{ $t('Process') }}: <span class="text-capitalize">{{ processName }}</span></h2>
44
<hr>
55
<div class="mb-2">
6-
<h4>Summary</h4>
6+
<h4>{{ $t('Summary') }}</h4>
77
</div>
88
<div class="mb-2">
99
<ul v-if="processInfo" class="process-summary mb-2">
10-
<li> Description: <span class="fw-semibold">{{ processInfo.description }}</span></li>
11-
<li> Categories: <span class="fw-semibold">{{ processInfo.categories }}</span></li>
12-
<li> Process Manager:
10+
<li>{{ $t('Description') }}: <span class="fw-semibold">{{ processInfo.description }}</span></li>
11+
<li>{{ $t('Categories') }}: <span class="fw-semibold">{{ processInfo.categories }}</span></li>
12+
<li>{{ $t('Process Manager') }}:
1313
<span class="fw-semibold">
1414
<b-link v-if="processInfo.processManagerId"
1515
:href="`/profile/${processInfo.processManagerId}`"
1616
target="_blank">{{ processInfo.processManager }}</b-link>
1717
<span v-else>{{ processInfo.processManager }}</span>
1818
</span>
1919
</li>
20-
<li> Created: <span class="fw-semibold">{{ processInfo.created_at }}</span></li>
21-
<li> Last Modified:
22-
<span class="fw-semibold">{{ processInfo.updated_at }}</span>
23-
By:
20+
<li>{{ $t('Created') }}: <span class="fw-semibold">{{ processInfo.created_at }}</span></li>
21+
<li>{{ $t('Last Modified') }}:
22+
<span class="fw-semibold">{{ processInfo.updated_at }}</span>
23+
{{ $t('By') }}:
2424
<span class="fw-semibold">
2525
<b-link v-if="processInfo.lastModifiedById"
2626
:href="`/profile/${processInfo.lastModifiedById}`"
@@ -47,10 +47,10 @@
4747
stacked
4848
:disabled="$root.forcePasswordProtect"
4949
>
50-
Password Protect Export
51-
<b-form-text class="process-options-helper-text">Define a password to protect your export file.</b-form-text>
50+
{{ $t('Password Protect Export') }}
51+
<b-form-text class="process-options-helper-text">{{ $t('Define a password to protect your export file.') }}</b-form-text>
5252
<small v-if="$root.forcePasswordProtect" class="text-danger">
53-
Password protect is required because some assets may have sensitive data.
53+
{{ $t('Password protect is required because some assets may have sensitive data.') }}
5454
</small>
5555
</b-form-checkbox>
5656
<b-form-checkbox
@@ -59,15 +59,15 @@
5959
class="fw-semibold"
6060
stacked
6161
>
62-
{{ $root.operation }} All Process elements
63-
<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>
62+
{{ $t($root.operation) }} {{ $t('All Process Elements') }}
63+
<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>
6464
<b-form-text v-else class="process-options-helper-text">{{ $t('All elements related to this process will be imported.') }}</b-form-text>
6565
</b-form-checkbox>
6666
</b-form-group>
6767
</div>
6868
<hr>
6969
<div class="pb-2" v-if="groups.length === 0">
70-
<p class="fw-semibold"> This process contains no dependent assets to {{ $root.operation.toLowerCase() }}. </p>
70+
<p class="fw-semibold">{{ $t('This process contains no dependent assets to') }} {{ $t($root.operation.toLowerCase()) }}.</p>
7171
</div>
7272
<div v-for="group in groups" :key="group.type">
7373
<data-card v-if="!group.hidden" :info="group" :isEnabled="$root.hasSomeNotDiscardedByParent(group.items)" :class="!$root.hasSomeNotDiscardedByParent(group.items) ? 'card-disabled' : ''"/>
@@ -284,6 +284,7 @@ export default {
284284
285285
.process-summary {
286286
padding-left: 0;
287+
list-style: none;
287288
}
288289
289290
.process-options-helper-text {

‎resources/js/processes/export/components/SetPasswordModal.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@
1313
<b-form-group>
1414
<div v-if="ask">
1515
<b-form-checkbox class="pt-2" v-model="passwordProtect" switch :disabled="$root.forcePasswordProtect">
16-
Password Protect Export
16+
{{ $t('Password Protect Export') }}
1717
</b-form-checkbox>
1818
<small v-if="$root.forcePasswordProtect" class="text-danger">
19-
Password protect is required because some assets may have sensitive data.
19+
{{ $t('Password protect is required because some assets may have sensitive data.') }}
2020
</small>
2121
</div>
2222
<template v-if="passwordProtect === true">
2323
<div class="pt-3">
2424
<label for="set-password">Password</label>
2525
<vue-password v-model="password" id="set-password" :disable-strength=true />
26-
<small v-if="errors.length === true" class="text-danger">{{ 'Password must have at least 8 characters.' }}</small>
26+
<small v-if="errors.length === true" class="text-danger">{{ $t('Password must have at least 8 characters.') }}</small>
2727
</div>
2828
<div class="pt-3">
2929
<label for="confirm-set-password">Verify Password</label>

‎resources/lang/de.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -762,9 +762,11 @@
762762
"Started By Me": "Von mir begonnen",
763763
"Started import of": "Import gestartet von:",
764764
"Started": "Begonnen",
765+
"STARTED": "Begonnen",
765766
"Starting": "Start",
766767
"State or Region": "Bundesland oder Region",
767768
"Status": "Status",
769+
"STATUS": "STATUS",
768770
"statuses": "Status",
769771
"Sub Process": "Unterprozess",
770772
"Sub process has multiple blank start events": "Der Unterprozess hat mehrere leere Startereignisse",
@@ -1863,7 +1865,9 @@
18631865
"Case #": "Fall Nr.",
18641866
"Case title": "Falltitel",
18651867
"Task name": "Aufgabenname",
1868+
"TASK NAME": "Aufgabenname",
18661869
"Due date": "Fälligkeitsdatum",
1870+
"DUE DATE": "Fälligkeitsdatum",
18671871
"Inbox": "Posteingang",
18681872
"{{- subject }} caused an error": "{{- subject }} hat einen Fehler verursacht",
18691873
"{{- subject }} completed": "{{- subject }} abgeschlossen",

0 commit comments

Comments
 (0)