@quazardous/qdadm 2.33.1 → 2.35.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +2 -2
- package/src/components/dialogs/MultiStepDialog.vue +15 -12
- package/src/components/display/EntityTimeline.vue +9 -7
- package/src/components/display/LogStream.vue +11 -0
- package/src/components/layout/AppLayout.vue +88 -32
- package/src/components/layout/PageNav.vue +4 -2
- package/src/components/layout/defaults/DefaultUserInfo.vue +45 -37
- package/src/components/pages/NotFoundPage.vue +5 -3
- package/src/components/tasks/TaskDialog.vue +1 -1
- package/src/components/tasks/TaskHost.vue +2 -1
- package/src/composables/index.ts +1 -0
- package/src/composables/useBreadcrumb.ts +21 -14
- package/src/composables/useEntityItemFormPage.ts +9 -6
- package/src/composables/useEntityItemShowPage.ts +8 -6
- package/src/composables/useListPage.ts +9 -6
- package/src/composables/useNavContext.ts +4 -6
- package/src/composables/useUserBox.ts +119 -0
- package/src/i18n/__tests__/I18n.test.ts +14 -0
- package/src/i18n/defaults/__tests__/generated-sync.test.ts +2 -2
- package/src/i18n/defaults/core.en.generated.ts +24 -10
- package/src/i18n/defaults/core.en.yml +24 -10
- package/src/i18n/defaults/core.fr.generated.ts +24 -10
- package/src/i18n/defaults/core.fr.yml +24 -10
- package/src/i18n/useI18n.ts +12 -0
- package/src/index.ts +1 -0
- package/src/kernel/Kernel.types.ts +6 -1
- package/src/plugin.ts +6 -1
- package/src/tasks/taskStore.ts +22 -1
|
@@ -31,6 +31,7 @@ import { requireDeleteConfirmation } from './confirmDelete'
|
|
|
31
31
|
import { useDirtyState } from './useDirtyState'
|
|
32
32
|
import { useUnsavedChangesGuard, type GuardDialogState } from './useUnsavedChangesGuard'
|
|
33
33
|
import { useBreadcrumb } from './useBreadcrumb'
|
|
34
|
+
import { useI18n } from '../i18n/useI18n'
|
|
34
35
|
import {
|
|
35
36
|
useEntityItemPage,
|
|
36
37
|
type CreateContext,
|
|
@@ -130,6 +131,7 @@ export function useEntityItemFormPage<T extends Record<string, unknown> = Record
|
|
|
130
131
|
const router = useRouter()
|
|
131
132
|
const route = useRoute()
|
|
132
133
|
const confirm = useConfirm() as ConfirmService
|
|
134
|
+
const { tOr } = useI18n()
|
|
133
135
|
const debug = inject<boolean>('qdadmDebug', false)
|
|
134
136
|
// Loads show as activity on the notification badge (#2677); a no-op without notifications.
|
|
135
137
|
const notifications = useNotifications()
|
|
@@ -441,8 +443,8 @@ export function useEntityItemFormPage<T extends Record<string, unknown> = Record
|
|
|
441
443
|
function confirmDelete(): void {
|
|
442
444
|
const label = manager.getEntityLabel(data.value) || entityId.value
|
|
443
445
|
requireDeleteConfirmation(confirm, {
|
|
444
|
-
message:
|
|
445
|
-
header: 'Confirm Delete',
|
|
446
|
+
message: tOr('core.messages.confirmDeleteItem', 'Delete {entity} "{label}"?', { entity: entityName, label: String(label) }),
|
|
447
|
+
header: tOr('core.messages.confirmDeleteTitle', 'Confirm Delete'),
|
|
446
448
|
accept: remove,
|
|
447
449
|
})
|
|
448
450
|
}
|
|
@@ -766,7 +768,7 @@ export function useEntityItemFormPage<T extends Record<string, unknown> = Record
|
|
|
766
768
|
}
|
|
767
769
|
|
|
768
770
|
function addDeleteAction(options: AddDeleteActionOptions = {}): void {
|
|
769
|
-
const { label = 'Delete' } = options
|
|
771
|
+
const { label = tOr('core.actions.delete', 'Delete') } = options
|
|
770
772
|
|
|
771
773
|
addAction('delete', {
|
|
772
774
|
label,
|
|
@@ -798,13 +800,14 @@ export function useEntityItemFormPage<T extends Record<string, unknown> = Record
|
|
|
798
800
|
const pageTitle = computed(() => {
|
|
799
801
|
if (isEdit.value) {
|
|
800
802
|
const label = entityLabel.value
|
|
801
|
-
|
|
803
|
+
const action = tOr('core.actions.edit', 'Edit')
|
|
804
|
+
return label ? `${action} ${entityName}: ${label}` : `${action} ${entityName}`
|
|
802
805
|
}
|
|
803
|
-
return
|
|
806
|
+
return `${tOr('core.actions.create', 'Create')} ${entityName}`
|
|
804
807
|
})
|
|
805
808
|
|
|
806
809
|
const pageTitleParts = computed<PageTitleParts>(() => ({
|
|
807
|
-
action: isEdit.value ? 'Edit' : 'Create',
|
|
810
|
+
action: isEdit.value ? tOr('core.actions.edit', 'Edit') : tOr('core.actions.create', 'Create'),
|
|
808
811
|
entityName,
|
|
809
812
|
entityLabel: isEdit.value ? entityLabel.value : undefined,
|
|
810
813
|
}))
|
|
@@ -39,6 +39,7 @@ import { useRouter, useRoute, type Router } from 'vue-router'
|
|
|
39
39
|
import { useNotifications } from '../notifications/NotificationStore'
|
|
40
40
|
import { useConfirm } from 'primevue/useconfirm'
|
|
41
41
|
import { requireDeleteConfirmation } from './confirmDelete'
|
|
42
|
+
import { useI18n } from '../i18n/useI18n'
|
|
42
43
|
import {
|
|
43
44
|
useEntityItemPage,
|
|
44
45
|
type ParentConfig,
|
|
@@ -270,6 +271,7 @@ export function useEntityItemShowPage<T = Record<string, unknown>>(
|
|
|
270
271
|
|
|
271
272
|
const router: Router = useRouter()
|
|
272
273
|
const confirm = useConfirm() as ConfirmService
|
|
274
|
+
const { tOr } = useI18n()
|
|
273
275
|
|
|
274
276
|
// Lazy action state (declared before base so onLoadSuccess wrapper can reference it)
|
|
275
277
|
const lazyActionsMap = ref<Map<string, LazyActionConfig>>(new Map())
|
|
@@ -441,7 +443,7 @@ export function useEntityItemShowPage<T = Record<string, unknown>>(
|
|
|
441
443
|
}
|
|
442
444
|
|
|
443
445
|
function addEditAction(editOptions: { label?: string; icon?: string } = {}): UseEntityItemShowPageReturn<T> {
|
|
444
|
-
const { label = 'Edit', icon = 'pi pi-pencil' } = editOptions
|
|
446
|
+
const { label = tOr('core.actions.edit', 'Edit'), icon = 'pi pi-pencil' } = editOptions
|
|
445
447
|
return addAction({
|
|
446
448
|
name: 'edit',
|
|
447
449
|
label,
|
|
@@ -455,7 +457,7 @@ export function useEntityItemShowPage<T = Record<string, unknown>>(
|
|
|
455
457
|
function addDeleteAction(
|
|
456
458
|
deleteOptions: { label?: string; icon?: string; confirm?: boolean } = {}
|
|
457
459
|
): UseEntityItemShowPageReturn<T> {
|
|
458
|
-
const { label = 'Delete', icon = 'pi pi-trash', confirm: confirmDelete = true } = deleteOptions
|
|
460
|
+
const { label = tOr('core.actions.delete', 'Delete'), icon = 'pi pi-trash', confirm: confirmDelete = true } = deleteOptions
|
|
459
461
|
return addAction({
|
|
460
462
|
name: 'delete',
|
|
461
463
|
label,
|
|
@@ -464,8 +466,8 @@ export function useEntityItemShowPage<T = Record<string, unknown>>(
|
|
|
464
466
|
onClick: () => {
|
|
465
467
|
if (confirmDelete) {
|
|
466
468
|
requireDeleteConfirmation(confirm, {
|
|
467
|
-
message:
|
|
468
|
-
header: 'Confirm Delete',
|
|
469
|
+
message: tOr('core.messages.confirmDeleteThis', 'Are you sure you want to delete this {entity}?', { entity: manager.label || entity }),
|
|
470
|
+
header: tOr('core.messages.confirmDeleteTitle', 'Confirm Delete'),
|
|
469
471
|
accept: () => deleteEntity(),
|
|
470
472
|
})
|
|
471
473
|
} else {
|
|
@@ -477,7 +479,7 @@ export function useEntityItemShowPage<T = Record<string, unknown>>(
|
|
|
477
479
|
}
|
|
478
480
|
|
|
479
481
|
function addBackAction(backOptions: { label?: string; icon?: string; route?: string } = {}): UseEntityItemShowPageReturn<T> {
|
|
480
|
-
const { label = 'Back', icon = 'pi pi-arrow-left', route: backRoute } = backOptions
|
|
482
|
+
const { label = tOr('core.actions.back', 'Back'), icon = 'pi pi-arrow-left', route: backRoute } = backOptions
|
|
481
483
|
return addAction({
|
|
482
484
|
name: 'back',
|
|
483
485
|
label,
|
|
@@ -532,7 +534,7 @@ export function useEntityItemShowPage<T = Record<string, unknown>>(
|
|
|
532
534
|
// ============ PAGE TITLE ============
|
|
533
535
|
|
|
534
536
|
const titleParts = computed<PageTitleParts>(() => ({
|
|
535
|
-
action: 'View',
|
|
537
|
+
action: tOr('core.actions.view', 'View'),
|
|
536
538
|
entityName: manager.label || entity,
|
|
537
539
|
entityLabel: entityLabel.value || undefined,
|
|
538
540
|
}))
|
|
@@ -151,7 +151,7 @@ export function useListPage<T = unknown>(config: UseListPageOptions<T>): UseList
|
|
|
151
151
|
const isMobile = ref(window.innerWidth < 768)
|
|
152
152
|
|
|
153
153
|
// i18n integration — column headers resolve via entities.{entity}.fields.{field}
|
|
154
|
-
const { i18n: kernelI18n, locale: i18nLocale } = useI18n()
|
|
154
|
+
const { i18n: kernelI18n, locale: i18nLocale, tOr } = useI18n()
|
|
155
155
|
|
|
156
156
|
// Get EntityManager via orchestrator (#1193 — canonical injection: one
|
|
157
157
|
// error-message source; erased to this file's Read-tier view)
|
|
@@ -1059,8 +1059,11 @@ export function useListPage<T = unknown>(config: UseListPageOptions<T>): UseList
|
|
|
1059
1059
|
function confirmDelete(item: unknown, labelField = 'name'): void {
|
|
1060
1060
|
const itemRecord = item as Record<string, unknown>
|
|
1061
1061
|
requireDeleteConfirmation(confirm, {
|
|
1062
|
-
message:
|
|
1063
|
-
|
|
1062
|
+
message: tOr('core.messages.confirmDeleteItem', 'Delete {entity} "{label}"?', {
|
|
1063
|
+
entity: entityName,
|
|
1064
|
+
label: String(itemRecord[labelField] || itemRecord[resolvedDataKey]),
|
|
1065
|
+
}),
|
|
1066
|
+
header: tOr('core.messages.confirmDeleteTitle', 'Confirm Delete'),
|
|
1064
1067
|
accept: () => deleteItem(item, labelField),
|
|
1065
1068
|
})
|
|
1066
1069
|
}
|
|
@@ -1243,7 +1246,7 @@ export function useListPage<T = unknown>(config: UseListPageOptions<T>): UseList
|
|
|
1243
1246
|
function addViewAction(options: Partial<ActionConfig> = {}): void {
|
|
1244
1247
|
addAction('view', {
|
|
1245
1248
|
icon: 'pi pi-eye',
|
|
1246
|
-
tooltip: 'View',
|
|
1249
|
+
tooltip: tOr('core.actions.view', 'View'),
|
|
1247
1250
|
onClick: options.onClick || goToShow,
|
|
1248
1251
|
...options,
|
|
1249
1252
|
})
|
|
@@ -1252,7 +1255,7 @@ export function useListPage<T = unknown>(config: UseListPageOptions<T>): UseList
|
|
|
1252
1255
|
function addEditAction(options: Partial<ActionConfig> = {}): void {
|
|
1253
1256
|
addAction('edit', {
|
|
1254
1257
|
icon: 'pi pi-pencil',
|
|
1255
|
-
tooltip: 'Edit',
|
|
1258
|
+
tooltip: tOr('core.actions.edit', 'Edit'),
|
|
1256
1259
|
onClick: options.onClick || goToEdit,
|
|
1257
1260
|
visible: (row) => manager.canUpdate(row),
|
|
1258
1261
|
...options,
|
|
@@ -1263,7 +1266,7 @@ export function useListPage<T = unknown>(config: UseListPageOptions<T>): UseList
|
|
|
1263
1266
|
const labelField = options.labelField || 'name'
|
|
1264
1267
|
addAction('delete', {
|
|
1265
1268
|
icon: 'pi pi-trash',
|
|
1266
|
-
tooltip: 'Delete',
|
|
1269
|
+
tooltip: tOr('core.actions.delete', 'Delete'),
|
|
1267
1270
|
severity: 'danger',
|
|
1268
1271
|
onClick: (row) => confirmDelete(row, labelField),
|
|
1269
1272
|
visible: (row) => manager.canDelete(row),
|
|
@@ -153,7 +153,7 @@ export function useNavContext(_options: UseNavContextOptions = {}): UseNavContex
|
|
|
153
153
|
const hydrator = useStackHydrator()
|
|
154
154
|
|
|
155
155
|
// i18n for the mode-toggle labels (no-op shim outside a kernel)
|
|
156
|
-
const {
|
|
156
|
+
const { tOr, locale: i18nLocale } = useI18n()
|
|
157
157
|
|
|
158
158
|
function getManager(entityName: string): EntityManager | null {
|
|
159
159
|
return orchestrator?.get(entityName) ?? null
|
|
@@ -224,7 +224,7 @@ export function useNavContext(_options: UseNavContextOptions = {}): UseNavContex
|
|
|
224
224
|
type: 'create',
|
|
225
225
|
entity: item.entity,
|
|
226
226
|
manager,
|
|
227
|
-
label: 'Create',
|
|
227
|
+
label: tOr('core.actions.create', 'Create'),
|
|
228
228
|
routeName: manager ? `${manager.routePrefix}-create` : null,
|
|
229
229
|
})
|
|
230
230
|
} else if (item.kind === 'route') {
|
|
@@ -302,7 +302,7 @@ export function useNavContext(_options: UseNavContextOptions = {}): UseNavContex
|
|
|
302
302
|
const homeItem = computed(() => {
|
|
303
303
|
if (!homeRouteName || !routeExists(homeRouteName)) return null
|
|
304
304
|
return {
|
|
305
|
-
label: homeRouteName === 'dashboard' ? 'Dashboard' : 'Home',
|
|
305
|
+
label: homeRouteName === 'dashboard' ? breadcrumbLabel('dashboard', 'Dashboard') : breadcrumbLabel('home', 'Home'),
|
|
306
306
|
to: { name: homeRouteName },
|
|
307
307
|
icon: 'pi pi-home',
|
|
308
308
|
}
|
|
@@ -461,9 +461,7 @@ export function useNavContext(_options: UseNavContextOptions = {}): UseNavContex
|
|
|
461
461
|
|
|
462
462
|
/** Resolve a `breadcrumb.*` label from the i18n catalog, with fallback. */
|
|
463
463
|
function breadcrumbLabel(key: string, fallback: string): string {
|
|
464
|
-
|
|
465
|
-
if (trace?.hit) return trace.result
|
|
466
|
-
return fallback
|
|
464
|
+
return tOr(`breadcrumb.${key}`, fallback)
|
|
467
465
|
}
|
|
468
466
|
|
|
469
467
|
function toggleLabel(target: 'show' | 'edit'): string {
|
|
@@ -0,0 +1,119 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* useUserBox - what the sidebar user box shows (#4157)
|
|
3
|
+
*
|
|
4
|
+
* Shared by AppLayout and DefaultUserInfo: the signed-in user's name,
|
|
5
|
+
* subtitle, initials, avatar picture and profile link, all read from the
|
|
6
|
+
* auth user and the `app` config (`app.userRoute`, `app.userAvatar`).
|
|
7
|
+
* `app.userRoute` is an app route, or an absolute URL opened in a new tab.
|
|
8
|
+
*/
|
|
9
|
+
import { computed, inject, ref, watch, type ComputedRef, type Ref } from 'vue'
|
|
10
|
+
import type { RouteLocationRaw } from 'vue-router'
|
|
11
|
+
import { useAuth } from './useAuth'
|
|
12
|
+
import { prettifyRole } from '../utils/formatters'
|
|
13
|
+
|
|
14
|
+
export interface UserBoxUser {
|
|
15
|
+
username?: string
|
|
16
|
+
name?: string
|
|
17
|
+
email?: string
|
|
18
|
+
role?: string
|
|
19
|
+
avatar?: string | null
|
|
20
|
+
avatarUrl?: string | null
|
|
21
|
+
[key: string]: unknown
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
/** Where the avatar picture is, for a user; null or '' shows the initials. */
|
|
25
|
+
export type UserAvatarResolver = (user: UserBoxUser) => string | null | undefined
|
|
26
|
+
|
|
27
|
+
interface UserBoxAppConfig {
|
|
28
|
+
userRoute?: RouteLocationRaw | null
|
|
29
|
+
userAvatar?: UserAvatarResolver | null
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
/**
|
|
33
|
+
* An absolute URL (`https://…`, `http://…`, `//host/…`, `mailto:…`) rather
|
|
34
|
+
* than an app route. Only these schemes: a route name may hold a colon.
|
|
35
|
+
*/
|
|
36
|
+
export function isExternalUserLink(link: unknown): boolean {
|
|
37
|
+
return typeof link === 'string' && /^(https?:|mailto:|\/\/)/i.test(link.trim())
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
/**
|
|
41
|
+
* The avatar URL of a user: the app's resolver when it has one, else
|
|
42
|
+
* `user.avatar` or `user.avatarUrl`.
|
|
43
|
+
*/
|
|
44
|
+
export function resolveUserAvatar(user: UserBoxUser | null | undefined, resolver?: UserAvatarResolver | null): string | null {
|
|
45
|
+
if (!user) return null
|
|
46
|
+
let url: unknown
|
|
47
|
+
if (resolver) {
|
|
48
|
+
try {
|
|
49
|
+
url = resolver(user)
|
|
50
|
+
} catch (err) {
|
|
51
|
+
console.warn('[qdadm] app.userAvatar threw, showing initials:', err)
|
|
52
|
+
return null
|
|
53
|
+
}
|
|
54
|
+
} else {
|
|
55
|
+
url = user.avatar || user.avatarUrl
|
|
56
|
+
}
|
|
57
|
+
return typeof url === 'string' && url.trim() ? url : null
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
export interface UseUserBoxReturn {
|
|
61
|
+
user: ComputedRef<UserBoxUser | null>
|
|
62
|
+
displayName: ComputedRef<string>
|
|
63
|
+
subtitle: ComputedRef<string>
|
|
64
|
+
initials: ComputedRef<string>
|
|
65
|
+
/** The picture to show, or null for the initials (none, or it failed). */
|
|
66
|
+
avatarUrl: ComputedRef<string | null>
|
|
67
|
+
/** Call from the img's `error` event: the initials come back. */
|
|
68
|
+
avatarFailed: () => void
|
|
69
|
+
/** The profile page, when the app declares one: an app route or an external URL. */
|
|
70
|
+
userRoute: RouteLocationRaw | null
|
|
71
|
+
/** Bind on the profile link: `{ to }` for a route, `{ href, target, rel }` for an external URL. */
|
|
72
|
+
userLink: { is: 'a' | 'RouterLink'; attrs: Record<string, unknown> } | null
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
export function useUserBox(): UseUserBoxReturn {
|
|
76
|
+
const { user: authUser } = useAuth()
|
|
77
|
+
const app = inject<UserBoxAppConfig | null>('qdadmApp', null)
|
|
78
|
+
|
|
79
|
+
const user = computed(() => (authUser.value as UserBoxUser | null) ?? null)
|
|
80
|
+
|
|
81
|
+
const displayName = computed(() => user.value?.username || user.value?.name || 'User')
|
|
82
|
+
|
|
83
|
+
const subtitle = computed(() => {
|
|
84
|
+
if (user.value?.email) return user.value.email
|
|
85
|
+
// raw ROLE_* constants are ugly by default — prettify (#1388)
|
|
86
|
+
return user.value?.role ? prettifyRole(user.value.role) : ''
|
|
87
|
+
})
|
|
88
|
+
|
|
89
|
+
const initials = computed(() => {
|
|
90
|
+
const username = user.value?.username
|
|
91
|
+
if (!username) return '?'
|
|
92
|
+
return username.substring(0, 2).toUpperCase()
|
|
93
|
+
})
|
|
94
|
+
|
|
95
|
+
const resolved = computed(() => resolveUserAvatar(user.value, app?.userAvatar))
|
|
96
|
+
const failed: Ref<string | null> = ref(null)
|
|
97
|
+
// A new URL gets its own chance to load
|
|
98
|
+
watch(resolved, () => (failed.value = null))
|
|
99
|
+
const avatarUrl = computed(() => (resolved.value && resolved.value !== failed.value ? resolved.value : null))
|
|
100
|
+
|
|
101
|
+
const userRoute = app?.userRoute ?? null
|
|
102
|
+
const userLink = !userRoute
|
|
103
|
+
? null
|
|
104
|
+
: isExternalUserLink(userRoute)
|
|
105
|
+
? { is: 'a' as const, attrs: { href: userRoute as string, target: '_blank', rel: 'noopener noreferrer' } }
|
|
106
|
+
: // A bare string is a route name, as for homeRoute; '/…' is a path
|
|
107
|
+
{ is: 'RouterLink' as const, attrs: { to: typeof userRoute === 'string' && !userRoute.startsWith('/') ? { name: userRoute } : userRoute } }
|
|
108
|
+
|
|
109
|
+
return {
|
|
110
|
+
user,
|
|
111
|
+
displayName,
|
|
112
|
+
subtitle,
|
|
113
|
+
initials,
|
|
114
|
+
avatarUrl,
|
|
115
|
+
avatarFailed: () => (failed.value = resolved.value),
|
|
116
|
+
userRoute,
|
|
117
|
+
userLink,
|
|
118
|
+
}
|
|
119
|
+
}
|
|
@@ -198,3 +198,17 @@ describe('I18n — dump', () => {
|
|
|
198
198
|
expect(dumped.core).toBeUndefined()
|
|
199
199
|
})
|
|
200
200
|
})
|
|
201
|
+
|
|
202
|
+
describe('I18n — plural forms in the core bundle (#4147)', () => {
|
|
203
|
+
it('reads the singular for one, by the locale rules', async () => {
|
|
204
|
+
const fr = new I18n({ defaultLocale: 'fr' })
|
|
205
|
+
await fr.bootstrap()
|
|
206
|
+
expect(fr.t('core.task.tray', { count: 1 })).toBe('1 tâche en cours')
|
|
207
|
+
expect(fr.t('core.task.tray', { count: 0 })).toBe('0 tâche en cours')
|
|
208
|
+
expect(fr.t('core.log.lines', { count: 12 })).toBe('12 lignes')
|
|
209
|
+
const en = new I18n()
|
|
210
|
+
await en.bootstrap()
|
|
211
|
+
expect(en.t('core.log.errors', { count: 1 })).toBe('1 error')
|
|
212
|
+
expect(en.t('core.log.errors', { count: 0 })).toBe('0 errors')
|
|
213
|
+
})
|
|
214
|
+
})
|
|
@@ -45,7 +45,7 @@ describe('i18n default providers — generated/.yml sync', () => {
|
|
|
45
45
|
const provider = createDefaultCoreProvider()
|
|
46
46
|
const en = (await provider.load('en')) as BreadcrumbBundle
|
|
47
47
|
const fr = (await provider.load('fr')) as BreadcrumbBundle
|
|
48
|
-
expect(en.breadcrumb).toEqual({ view: 'View', edit: 'Edit' })
|
|
49
|
-
expect(fr.breadcrumb).toEqual({ view: 'Voir', edit: 'Modifier' })
|
|
48
|
+
expect(en.breadcrumb).toEqual({ home: 'Home', dashboard: 'Dashboard', details: 'Details', view: 'View', edit: 'Edit' })
|
|
49
|
+
expect(fr.breadcrumb).toEqual({ home: 'Accueil', dashboard: 'Tableau de bord', details: 'Détails', view: 'Voir', edit: 'Modifier' })
|
|
50
50
|
})
|
|
51
51
|
})
|
|
@@ -15,6 +15,7 @@ export default `core:
|
|
|
15
15
|
submit: Submit
|
|
16
16
|
reset: Reset
|
|
17
17
|
back: Back
|
|
18
|
+
view: View
|
|
18
19
|
next: Next
|
|
19
20
|
previous: Previous
|
|
20
21
|
close: Close
|
|
@@ -25,6 +26,8 @@ export default `core:
|
|
|
25
26
|
refresh: Refresh
|
|
26
27
|
export: Export
|
|
27
28
|
import: Import
|
|
29
|
+
logout: Logout
|
|
30
|
+
profile: My profile
|
|
28
31
|
tooltips:
|
|
29
32
|
saveAndContinue: Save and continue editing
|
|
30
33
|
saveAndReturn: Save and return to list
|
|
@@ -48,6 +51,9 @@ export default `core:
|
|
|
48
51
|
created: Created
|
|
49
52
|
updated: Updated
|
|
50
53
|
confirmDelete: Are you sure you want to delete this item?
|
|
54
|
+
confirmDeleteTitle: Confirm Delete
|
|
55
|
+
confirmDeleteItem: 'Delete {entity} "{label}"?'
|
|
56
|
+
confirmDeleteThis: Are you sure you want to delete this {entity}?
|
|
51
57
|
errors:
|
|
52
58
|
required: Required
|
|
53
59
|
tooShort: Too short (min {min})
|
|
@@ -77,24 +83,24 @@ export default `core:
|
|
|
77
83
|
done: Complete
|
|
78
84
|
stopped: Stopped
|
|
79
85
|
failed: "Failed: {error}"
|
|
80
|
-
lines: "{count} lines"
|
|
86
|
+
lines: "{count} line | {count} lines"
|
|
81
87
|
search: Search the log
|
|
82
88
|
previous: Previous match
|
|
83
89
|
next: Next match
|
|
84
90
|
onlyMatches: Only matching lines
|
|
85
|
-
errors: "{count} errors"
|
|
91
|
+
errors: "{count} error | {count} errors"
|
|
86
92
|
firstError: Go to the next error line
|
|
87
93
|
wrap: Wrap long lines
|
|
88
94
|
follow: Follow the end of the log
|
|
89
95
|
download: Download the log
|
|
90
|
-
newLines: "{count} new lines, resume"
|
|
96
|
+
newLines: "{count} new line, resume | {count} new lines, resume"
|
|
91
97
|
empty: No output yet
|
|
92
98
|
# EntityTimeline (#4111)
|
|
93
99
|
timeline:
|
|
94
100
|
actors: Filter by actor
|
|
95
101
|
loading: Loading…
|
|
96
102
|
empty: Nothing happened yet
|
|
97
|
-
newEvents: "{count} new events"
|
|
103
|
+
newEvents: "{count} new event | {count} new events"
|
|
98
104
|
oldestFirst: Oldest first
|
|
99
105
|
newestFirst: Newest first
|
|
100
106
|
# PayloadViewer / PayloadDiff (#4112)
|
|
@@ -105,14 +111,14 @@ export default `core:
|
|
|
105
111
|
copied: Copied to the clipboard
|
|
106
112
|
copyFailed: Could not copy
|
|
107
113
|
download: Download
|
|
108
|
-
showAll: "Show all {count} rows"
|
|
114
|
+
showAll: "Show {count} row | Show all {count} rows"
|
|
109
115
|
binary: "Binary content, {size}. First bytes:"
|
|
110
116
|
malformed: "Not valid {format} ({error}), shown as text"
|
|
111
117
|
expected: Expected
|
|
112
118
|
captured: Captured
|
|
113
119
|
identical: Identical
|
|
114
|
-
unchanged: "{count} unchanged lines"
|
|
115
|
-
showSame: "Show {count} unchanged rows"
|
|
120
|
+
unchanged: "{count} unchanged line | {count} unchanged lines"
|
|
121
|
+
showSame: "Show {count} unchanged row | Show {count} unchanged rows"
|
|
116
122
|
inline: Inline
|
|
117
123
|
split: Side by side
|
|
118
124
|
# EmailPreview (#4113)
|
|
@@ -129,7 +135,7 @@ export default `core:
|
|
|
129
135
|
html: HTML
|
|
130
136
|
text: Text
|
|
131
137
|
source: Source
|
|
132
|
-
imagesBlocked: "{count} remote images blocked"
|
|
138
|
+
imagesBlocked: "{count} remote image blocked | {count} remote images blocked"
|
|
133
139
|
loadImages: Load images
|
|
134
140
|
blockImages: Block images
|
|
135
141
|
empty: This email has no body
|
|
@@ -153,11 +159,19 @@ export default `core:
|
|
|
153
159
|
start: Start
|
|
154
160
|
dontStart: Do not start
|
|
155
161
|
typeToConfirm: "Type {value} to confirm"
|
|
156
|
-
tray: "{count} running tasks"
|
|
162
|
+
tray: "{count} running task | {count} running tasks"
|
|
157
163
|
trayDone: Recent tasks
|
|
158
164
|
clear: Clear finished
|
|
159
|
-
#
|
|
165
|
+
# NotFoundPage
|
|
166
|
+
notFound:
|
|
167
|
+
title: Page not found
|
|
168
|
+
message: The page you're looking for doesn't exist or has been moved.
|
|
169
|
+
home: Back to Home
|
|
170
|
+
# The breadcrumb (useBreadcrumb, useNavContext, PageNav).
|
|
160
171
|
breadcrumb:
|
|
172
|
+
home: Home
|
|
173
|
+
dashboard: Dashboard
|
|
174
|
+
details: Details
|
|
161
175
|
view: View
|
|
162
176
|
edit: Edit
|
|
163
177
|
`
|
|
@@ -13,6 +13,7 @@ core:
|
|
|
13
13
|
submit: Submit
|
|
14
14
|
reset: Reset
|
|
15
15
|
back: Back
|
|
16
|
+
view: View
|
|
16
17
|
next: Next
|
|
17
18
|
previous: Previous
|
|
18
19
|
close: Close
|
|
@@ -23,6 +24,8 @@ core:
|
|
|
23
24
|
refresh: Refresh
|
|
24
25
|
export: Export
|
|
25
26
|
import: Import
|
|
27
|
+
logout: Logout
|
|
28
|
+
profile: My profile
|
|
26
29
|
tooltips:
|
|
27
30
|
saveAndContinue: Save and continue editing
|
|
28
31
|
saveAndReturn: Save and return to list
|
|
@@ -46,6 +49,9 @@ core:
|
|
|
46
49
|
created: Created
|
|
47
50
|
updated: Updated
|
|
48
51
|
confirmDelete: Are you sure you want to delete this item?
|
|
52
|
+
confirmDeleteTitle: Confirm Delete
|
|
53
|
+
confirmDeleteItem: 'Delete {entity} "{label}"?'
|
|
54
|
+
confirmDeleteThis: Are you sure you want to delete this {entity}?
|
|
49
55
|
errors:
|
|
50
56
|
required: Required
|
|
51
57
|
tooShort: Too short (min {min})
|
|
@@ -75,24 +81,24 @@ core:
|
|
|
75
81
|
done: Complete
|
|
76
82
|
stopped: Stopped
|
|
77
83
|
failed: "Failed: {error}"
|
|
78
|
-
lines: "{count} lines"
|
|
84
|
+
lines: "{count} line | {count} lines"
|
|
79
85
|
search: Search the log
|
|
80
86
|
previous: Previous match
|
|
81
87
|
next: Next match
|
|
82
88
|
onlyMatches: Only matching lines
|
|
83
|
-
errors: "{count} errors"
|
|
89
|
+
errors: "{count} error | {count} errors"
|
|
84
90
|
firstError: Go to the next error line
|
|
85
91
|
wrap: Wrap long lines
|
|
86
92
|
follow: Follow the end of the log
|
|
87
93
|
download: Download the log
|
|
88
|
-
newLines: "{count} new lines, resume"
|
|
94
|
+
newLines: "{count} new line, resume | {count} new lines, resume"
|
|
89
95
|
empty: No output yet
|
|
90
96
|
# EntityTimeline (#4111)
|
|
91
97
|
timeline:
|
|
92
98
|
actors: Filter by actor
|
|
93
99
|
loading: Loading…
|
|
94
100
|
empty: Nothing happened yet
|
|
95
|
-
newEvents: "{count} new events"
|
|
101
|
+
newEvents: "{count} new event | {count} new events"
|
|
96
102
|
oldestFirst: Oldest first
|
|
97
103
|
newestFirst: Newest first
|
|
98
104
|
# PayloadViewer / PayloadDiff (#4112)
|
|
@@ -103,14 +109,14 @@ core:
|
|
|
103
109
|
copied: Copied to the clipboard
|
|
104
110
|
copyFailed: Could not copy
|
|
105
111
|
download: Download
|
|
106
|
-
showAll: "Show all {count} rows"
|
|
112
|
+
showAll: "Show {count} row | Show all {count} rows"
|
|
107
113
|
binary: "Binary content, {size}. First bytes:"
|
|
108
114
|
malformed: "Not valid {format} ({error}), shown as text"
|
|
109
115
|
expected: Expected
|
|
110
116
|
captured: Captured
|
|
111
117
|
identical: Identical
|
|
112
|
-
unchanged: "{count} unchanged lines"
|
|
113
|
-
showSame: "Show {count} unchanged rows"
|
|
118
|
+
unchanged: "{count} unchanged line | {count} unchanged lines"
|
|
119
|
+
showSame: "Show {count} unchanged row | Show {count} unchanged rows"
|
|
114
120
|
inline: Inline
|
|
115
121
|
split: Side by side
|
|
116
122
|
# EmailPreview (#4113)
|
|
@@ -127,7 +133,7 @@ core:
|
|
|
127
133
|
html: HTML
|
|
128
134
|
text: Text
|
|
129
135
|
source: Source
|
|
130
|
-
imagesBlocked: "{count} remote images blocked"
|
|
136
|
+
imagesBlocked: "{count} remote image blocked | {count} remote images blocked"
|
|
131
137
|
loadImages: Load images
|
|
132
138
|
blockImages: Block images
|
|
133
139
|
empty: This email has no body
|
|
@@ -151,10 +157,18 @@ core:
|
|
|
151
157
|
start: Start
|
|
152
158
|
dontStart: Do not start
|
|
153
159
|
typeToConfirm: "Type {value} to confirm"
|
|
154
|
-
tray: "{count} running tasks"
|
|
160
|
+
tray: "{count} running task | {count} running tasks"
|
|
155
161
|
trayDone: Recent tasks
|
|
156
162
|
clear: Clear finished
|
|
157
|
-
#
|
|
163
|
+
# NotFoundPage
|
|
164
|
+
notFound:
|
|
165
|
+
title: Page not found
|
|
166
|
+
message: The page you're looking for doesn't exist or has been moved.
|
|
167
|
+
home: Back to Home
|
|
168
|
+
# The breadcrumb (useBreadcrumb, useNavContext, PageNav).
|
|
158
169
|
breadcrumb:
|
|
170
|
+
home: Home
|
|
171
|
+
dashboard: Dashboard
|
|
172
|
+
details: Details
|
|
159
173
|
view: View
|
|
160
174
|
edit: Edit
|
|
@@ -15,6 +15,7 @@ export default `core:
|
|
|
15
15
|
submit: Valider
|
|
16
16
|
reset: Réinitialiser
|
|
17
17
|
back: Retour
|
|
18
|
+
view: Voir
|
|
18
19
|
next: Suivant
|
|
19
20
|
previous: Précédent
|
|
20
21
|
close: Fermer
|
|
@@ -25,6 +26,8 @@ export default `core:
|
|
|
25
26
|
refresh: Actualiser
|
|
26
27
|
export: Exporter
|
|
27
28
|
import: Importer
|
|
29
|
+
logout: Se déconnecter
|
|
30
|
+
profile: Mon profil
|
|
28
31
|
tooltips:
|
|
29
32
|
saveAndContinue: Enregistrer et continuer la modification
|
|
30
33
|
saveAndReturn: Enregistrer et revenir à la liste
|
|
@@ -48,6 +51,9 @@ export default `core:
|
|
|
48
51
|
created: Créé
|
|
49
52
|
updated: Modifié
|
|
50
53
|
confirmDelete: Êtes-vous sûr de vouloir supprimer cet élément ?
|
|
54
|
+
confirmDeleteTitle: Confirmer la suppression
|
|
55
|
+
confirmDeleteItem: "Supprimer {entity} « {label} » ?"
|
|
56
|
+
confirmDeleteThis: "Êtes-vous sûr de vouloir supprimer cet élément ({entity}) ?"
|
|
51
57
|
errors:
|
|
52
58
|
required: Requis
|
|
53
59
|
tooShort: Trop court (min {min})
|
|
@@ -77,24 +83,24 @@ export default `core:
|
|
|
77
83
|
done: Terminé
|
|
78
84
|
stopped: Arrêté
|
|
79
85
|
failed: "Échec : {error}"
|
|
80
|
-
lines: "{count} lignes"
|
|
86
|
+
lines: "{count} ligne | {count} lignes"
|
|
81
87
|
search: Chercher dans le log
|
|
82
88
|
previous: Occurrence précédente
|
|
83
89
|
next: Occurrence suivante
|
|
84
90
|
onlyMatches: Seulement les lignes trouvées
|
|
85
|
-
errors: "{count} erreurs"
|
|
91
|
+
errors: "{count} erreur | {count} erreurs"
|
|
86
92
|
firstError: Aller à la ligne d'erreur suivante
|
|
87
93
|
wrap: Couper les lignes longues
|
|
88
94
|
follow: Suivre la fin du log
|
|
89
95
|
download: Télécharger le log
|
|
90
|
-
newLines: "{count} nouvelles lignes, reprendre"
|
|
96
|
+
newLines: "{count} nouvelle ligne, reprendre | {count} nouvelles lignes, reprendre"
|
|
91
97
|
empty: Rien pour l'instant
|
|
92
98
|
# EntityTimeline (#4111)
|
|
93
99
|
timeline:
|
|
94
100
|
actors: Filtrer par acteur
|
|
95
101
|
loading: Chargement…
|
|
96
102
|
empty: Rien ne s'est encore passé
|
|
97
|
-
newEvents: "{count} nouveaux événements"
|
|
103
|
+
newEvents: "{count} nouvel événement | {count} nouveaux événements"
|
|
98
104
|
oldestFirst: Plus anciens d'abord
|
|
99
105
|
newestFirst: Plus récents d'abord
|
|
100
106
|
# PayloadViewer / PayloadDiff (#4112)
|
|
@@ -105,14 +111,14 @@ export default `core:
|
|
|
105
111
|
copied: Copié dans le presse-papiers
|
|
106
112
|
copyFailed: Copie impossible
|
|
107
113
|
download: Télécharger
|
|
108
|
-
showAll: "Afficher les {count} lignes"
|
|
114
|
+
showAll: "Afficher {count} ligne | Afficher les {count} lignes"
|
|
109
115
|
binary: "Contenu binaire, {size}. Premiers octets :"
|
|
110
116
|
malformed: "{format} invalide ({error}), affiché comme texte"
|
|
111
117
|
expected: Attendu
|
|
112
118
|
captured: Capturé
|
|
113
119
|
identical: Identiques
|
|
114
|
-
unchanged: "{count} lignes inchangées"
|
|
115
|
-
showSame: "Afficher les {count} lignes inchangées"
|
|
120
|
+
unchanged: "{count} ligne inchangée | {count} lignes inchangées"
|
|
121
|
+
showSame: "Afficher {count} ligne inchangée | Afficher les {count} lignes inchangées"
|
|
116
122
|
inline: En ligne
|
|
117
123
|
split: Côte à côte
|
|
118
124
|
# EmailPreview (#4113)
|
|
@@ -129,7 +135,7 @@ export default `core:
|
|
|
129
135
|
html: HTML
|
|
130
136
|
text: Texte
|
|
131
137
|
source: Source
|
|
132
|
-
imagesBlocked: "{count} images distantes bloquées"
|
|
138
|
+
imagesBlocked: "{count} image distante bloquée | {count} images distantes bloquées"
|
|
133
139
|
loadImages: Charger les images
|
|
134
140
|
blockImages: Bloquer les images
|
|
135
141
|
empty: Ce mail n'a pas de contenu
|
|
@@ -153,11 +159,19 @@ export default `core:
|
|
|
153
159
|
start: Lancer
|
|
154
160
|
dontStart: Ne pas lancer
|
|
155
161
|
typeToConfirm: "Taper {value} pour confirmer"
|
|
156
|
-
tray: "{count} tâches en cours"
|
|
162
|
+
tray: "{count} tâche en cours | {count} tâches en cours"
|
|
157
163
|
trayDone: Tâches récentes
|
|
158
164
|
clear: Effacer les terminées
|
|
159
|
-
#
|
|
165
|
+
# NotFoundPage
|
|
166
|
+
notFound:
|
|
167
|
+
title: Page introuvable
|
|
168
|
+
message: La page demandée n'existe pas ou a été déplacée.
|
|
169
|
+
home: Retour à l'accueil
|
|
170
|
+
# The breadcrumb (useBreadcrumb, useNavContext, PageNav).
|
|
160
171
|
breadcrumb:
|
|
172
|
+
home: Accueil
|
|
173
|
+
dashboard: Tableau de bord
|
|
174
|
+
details: Détails
|
|
161
175
|
view: Voir
|
|
162
176
|
edit: Modifier
|
|
163
177
|
`
|