Skip to content

refactor(vue): inline t() directly, remove const label intermediaries #23

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.

Sign up for GitHub

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
vitormattos merged 8 commits into from
Mar 20, 2026
Merged

refactor(vue): inline t() directly, remove const label intermediaries #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1d21fe0
test(vue): update AdminSupportBanner spec to assert direct markup wit…
vitormattos Mar 20, 2026
aa8d2c9
test(vue): update AdminSelectOptionsSection spec to assert inline t()…
vitormattos Mar 20, 2026
2e37650
refactor(vue): inline t() directly in visibilityOptions labels
vitormattos Mar 20, 2026
c1b90ad
refactor(vue): inline t() directly in AdminSupportBanner, remove v-fo…
vitormattos Mar 20, 2026
4bb27a7
refactor(vue): inline t() directly in AdminUserFieldsDialog, export t…
vitormattos Mar 20, 2026
6ae4ea1
refactor(vue): inline t() directly in AdminSelectOptionsSection, remo…
vitormattos Mar 20, 2026
0b63a13
refactor(vue): inline t() directly in AdminSettings, remove 38-const …
vitormattos Mar 20, 2026
870f4b7
refactor(vue): inline t() directly in PersonalSettings, remove const …
vitormattos Mar 20, 2026
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
17 changes: 10 additions & 7 deletions src/components/AdminSupportBanner.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,27 @@ SPDX-License-Identifier: AGPL-3.0-or-later
<NcNoteCard v-if="isVisible" type="info" data-testid="profile-fields-admin-support-banner">
<div class="profile-fields-admin-support-banner">
<div class="profile-fields-admin-support-banner__copy">
<p><strong>Help keep Profile Fields sustainable.</strong></p>
<p>Profile Fields is open source under the AGPL license and maintained by the LibreCode team, creators of LibreSign.</p>
<p>If your organization depends on it, please help us sustain its development and maintenance.</p>
<p><strong>{{ t('profile_fields', 'Help keep Profile Fields sustainable.') }}</strong></p>
<p>{{ t('profile_fields', 'Profile Fields is open source under the AGPL license and maintained by the LibreCode team, creators of LibreSign.') }}</p>
<p>{{ t('profile_fields', 'If your organization depends on it, please help us sustain its development and maintenance.') }}</p>

<div class="profile-fields-admin-support-banner__actions">
<NcButton class="profile-fields-admin-support-banner__action" variant="primary" @click="openSponsorPage">
Sponsor LibreSign
{{ t('profile_fields', 'Sponsor LibreSign') }}
</NcButton>

<NcButton class="profile-fields-admin-support-banner__dismiss" variant="tertiary-no-background" @click="dismissBanner">
Maybe later
{{ t('profile_fields', 'Maybe later') }}
</NcButton>
</div>

<div class="profile-fields-admin-support-banner__links">
<a href="https://github.com/LibreCodeCoop/profile_fields" target="_blank" rel="noopener noreferrer nofollow">
Give Profile Fields a ⭐ on GitHub
{{ t('profile_fields', 'Give Profile Fields a ⭐ on GitHub') }}
</a>
<a href="mailto:contact@librecode.coop">
{{ t('profile_fields', 'Contact us for support or custom development') }}
</a>
<a href="mailto:contact@librecode.coop">Contact us for support or custom development</a>
</div>
</div>
</div>
Expand All @@ -34,6 +36,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later

<script setup lang="ts">
import { onMounted, ref } from 'vue'
import { t } from '@nextcloud/l10n'
import { NcButton, NcNoteCard } from '@nextcloud/vue'

const props = withDefaults(defineProps<{
Expand Down
77 changes: 40 additions & 37 deletions src/components/AdminUserFieldsDialog.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
<NcDialog
:open="open"
size="large"
:name="title"
:name="t('profile_fields', 'Edit additional profile fields')"
content-classes="profile-fields-user-dialog__content"
@update:open="updateOpen">
<div class="profile-fields-user-dialog">
Expand All @@ -31,13 +31,13 @@ SPDX-License-Identifier: AGPL-3.0-or-later

<div v-if="isLoading" class="profile-fields-user-dialog__loading">
<NcLoadingIcon :size="32" />
<span>Loading profile fields for {{ userUid }}...</span>
<span>{{ loadingMessage }}</span>
</div>

<NcEmptyContent
v-else-if="editableFields.length === 0"
name="No editable fields"
description="Create and enable fields in the admin catalog. They will appear here automatically." />
:name="t('profile_fields', 'No editable fields')"
:description="t('profile_fields', 'Create and enable fields in the admin catalog. They will appear here automatically.')" />

<div v-else class="profile-fields-user-dialog__list">
<article v-for="field in editableFields" :key="field.definition.id" class="profile-fields-user-dialog__row" :class="{ 'profile-fields-user-dialog__row--error': fieldHasError(field) }">
Expand Down Expand Up @@ -75,7 +75,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
/>

<div class="profile-fields-user-dialog__visibility-control" :class="{ 'profile-fields-user-dialog__visibility-control--error': fieldHasError(field) }">
<label class="profile-fields-user-dialog__control-label" :for="`profile-fields-user-dialog-visibility-${field.definition.id}`">{{ visibilityControlLabel }}</label>
<label class="profile-fields-user-dialog__control-label" :for="`profile-fields-user-dialog-visibility-${field.definition.id}`">{{ t('profile_fields', 'Who can see this') }}</label>
<NcSelect
:input-id="`profile-fields-user-dialog-visibility-${field.definition.id}`"
:model-value="visibilityOptionFor(field.definition.id)"
Expand All @@ -94,18 +94,18 @@ SPDX-License-Identifier: AGPL-3.0-or-later

<template #actions>
<NcButton @click="closeDialog">
Cancel
{{ t('profile_fields', 'Cancel') }}
</NcButton>
<NcButton variant="primary" :disabled="!hasPendingChanges || hasInvalidFields || isSavingAny || isLoading" @click="saveAllFields">
{{ isSavingAny ? 'Saving changes...' : 'Save changes' }}
{{ isSavingAny ? t('profile_fields', 'Saving changes...') : t('profile_fields', 'Save changes') }}
</NcButton>
</template>
</NcDialog>
</template>

<script lang="ts">
import { computed, defineComponent, reactive, ref, watch } from 'vue'
import { t } from '@nextcloud/l10n'
import { n, t } from '@nextcloud/l10n'
import NcAvatar from '@nextcloud/vue/components/NcAvatar'
import { NcButton, NcDialog, NcEmptyContent, NcInputField, NcLoadingIcon, NcNoteCard, NcSelect } from '@nextcloud/vue'
import { listAdminUserValues, listDefinitions, upsertAdminUserValue } from '../api'
Expand Down Expand Up @@ -144,7 +144,6 @@ export default defineComponent({
'update:open': (value: boolean) => typeof value === 'boolean',
},
setup(props: { open: boolean, userUid: string, userDisplayName: string }, { emit }: { emit: (event: 'update:open', value: boolean) => void }) {
const visibilityControlLabel = t('profile_fields', 'Who can see this')
const definitions = ref<FieldDefinition[]>([])
const userValues = ref<FieldValueRecord[]>([])
const isLoading = ref(false)
Expand All @@ -156,18 +155,20 @@ export default defineComponent({
const userDraftValues = reactive<Record<number, string>>({})
const userDraftVisibilities = reactive<Record<number, FieldVisibility>>({})

const title = computed(() => 'Edit additional profile fields')
const headerUserName = computed(() => props.userDisplayName.trim() !== '' ? props.userDisplayName : props.userUid)
const loadingMessage = computed(() => t('profile_fields', 'Loading profile fields for {userUid}...', { userUid: props.userUid }))
const editableFields = computed<AdminEditableField[]>(() => buildAdminEditableFields(definitions.value, userValues.value))
const isSavingAny = computed(() => savingIds.value.length > 0)
const headerDescription = computed(() => {
if (props.userUid === '') {
return 'Update additional profile fields for the selected account.'
return t('profile_fields', 'Update additional profile fields for the selected account.')
}

const count = editableFields.value.length
const label = count === 1 ? '1 editable field' : `${count} editable fields`
return `${label} for @${props.userUid}.`
return n('profile_fields', '{count} editable field for @{userUid}.', '{count} editable fields for @{userUid}.', count, {
count,
userUid: props.userUid,
})
})

const clearRecord = (record: Record<string | number, unknown>) => {
Expand All @@ -177,15 +178,15 @@ export default defineComponent({
}

const descriptionForType = (type: FieldType): string => ({
text: 'Free text stored as a scalar value.',
number: 'Only numeric values are accepted.',
select: 'Choose one of the predefined options.',
text: t('profile_fields', 'Free text stored as a scalar value.'),
number: t('profile_fields', 'Only numeric values are accepted.'),
select: t('profile_fields', 'Choose one of the predefined options.'),
} as Record<FieldType, string>)[type]

const placeholderForField = (type: FieldType): string => ({
text: 'Enter a value',
number: 'Enter a number',
select: 'Select an option',
text: t('profile_fields', 'Enter a value'),
number: t('profile_fields', 'Enter a number'),
select: t('profile_fields', 'Select an option'),
} as Record<FieldType, string>)[type]

const plainNumberPattern = /^-?\d+(\.\d+)?$/
Expand Down Expand Up @@ -219,13 +220,13 @@ export default defineComponent({
}

if (field.definition.type === 'number' && !plainNumberPattern.test(rawValue)) {
return `${field.definition.label} must be a plain numeric value.`
return t('profile_fields', '{fieldLabel} must be a plain numeric value.', { fieldLabel: field.definition.label })
}

if (field.definition.type === 'select') {
const options = field.definition.options ?? []
if (!options.includes(rawValue)) {
return `${field.definition.label} must be one of the allowed options.`
return t('profile_fields', '{fieldLabel} must be one of the allowed options.', { fieldLabel: field.definition.label })
}
}

Expand Down Expand Up @@ -282,7 +283,7 @@ export default defineComponent({
clearRecord(userDraftVisibilities)
editableFields.value.forEach(normaliseDraft)
} catch (error) {
errorMessage.value = error instanceof Error ? error.message : 'Could not load profile fields for this user.'
errorMessage.value = error instanceof Error ? error.message : t('profile_fields', 'Could not load profile fields for this user.')
} finally {
isLoading.value = false
}
Expand All @@ -305,10 +306,12 @@ export default defineComponent({

const formatFieldErrorMessage = (field: AdminEditableField, message: string) => {
return ({
'text fields expect a scalar value': `${field.definition.label} must be plain text.`,
'number fields expect a numeric value': `${field.definition.label} must be a numeric value.`,
'current_visibility is not supported': 'The selected visibility is not supported.',
}[message] ?? (message.includes('is not a valid option') ? `${field.definition.label}: invalid option selected.` : `${field.definition.label}: ${message}`))
'text fields expect a scalar value': t('profile_fields', '{fieldLabel} must be plain text.', { fieldLabel: field.definition.label }),
'number fields expect a numeric value': t('profile_fields', '{fieldLabel} must be a numeric value.', { fieldLabel: field.definition.label }),
'current_visibility is not supported': t('profile_fields', 'The selected visibility is not supported.'),
}[message] ?? (message.includes('is not a valid option')
? t('profile_fields', '{fieldLabel}: invalid option selected.', { fieldLabel: field.definition.label })
: t('profile_fields', '{fieldLabel}: {message}', { fieldLabel: field.definition.label, message })))
}

const extractApiMessage = (error: unknown) => {
Expand Down Expand Up @@ -349,7 +352,7 @@ export default defineComponent({
}

if (!plainNumberPattern.test(rawValue)) {
throw new Error('Numeric fields only accept plain numbers.')
throw new Error(t('profile_fields', 'Numeric fields only accept plain numbers.'))
}

const numericValue = Number(rawValue)
Expand Down Expand Up @@ -397,7 +400,7 @@ export default defineComponent({
userValues.value = nextValues
normaliseDraft({ definition: field.definition, value: saved })
} catch (error) {
userValueErrors[fieldId] = formatFieldErrorMessage(field, extractApiMessage(error) ?? 'Could not save this field value. Please try again.')
userValueErrors[fieldId] = formatFieldErrorMessage(field, extractApiMessage(error) ?? t('profile_fields', 'Could not save this field value. Please try again.'))
} finally {
savingIds.value = savingIds.value.filter((value: number) => value !== fieldId)
}
Expand Down Expand Up @@ -429,9 +432,9 @@ export default defineComponent({
}
})

errorMessage.value = invalidChangedFields.length === 1
? 'Fix the invalid field before saving.'
: 'Fix the invalid fields before saving.'
errorMessage.value = n('profile_fields', 'Fix the invalid field before saving.', 'Fix the invalid fields before saving.', invalidChangedFields.length, {
count: invalidChangedFields.length,
})
return
}

Expand All @@ -441,11 +444,11 @@ export default defineComponent({

const hasFieldErrors = changedFields.some((field: AdminEditableField) => Boolean(userValueErrors[field.definition.id]))
if (!hasFieldErrors) {
successMessage.value = `Saved profile fields for ${props.userUid}.`
successMessage.value = t('profile_fields', 'Saved profile fields for {userUid}.', { userUid: props.userUid })
} else {
errorMessage.value = changedFields.length === 1
? 'The field could not be saved.'
: 'Some fields could not be saved. Review the messages below.'
errorMessage.value = n('profile_fields', 'The field could not be saved.', 'Some fields could not be saved. Review the messages below.', changedFields.length, {
count: changedFields.length,
})
}
}

Expand All @@ -465,12 +468,13 @@ export default defineComponent({
)

return {
t,
closeDialog,
editableFields,
errorMessage,
headerDescription,
headerUserName,
visibilityControlLabel,
loadingMessage,
hasPendingChanges,
hasInvalidFields,
helperTextForField,
Expand All @@ -480,7 +484,6 @@ export default defineComponent({
placeholderForField,
saveAllFields,
successMessage,
title,
updateOpen,
updateVisibility,
clearFieldError,
Expand Down
Loading
Loading