diff --git a/apps/meteor/client/components/CreateDiscussion/CreateDiscussion.tsx b/apps/meteor/client/components/CreateDiscussion/CreateDiscussion.tsx
index cd39a187cd895a439c1cf3c4200ce5dd417bee34..b1dcb9d8dfbc902b6934f6fc3520999b95b1941d 100644
--- a/apps/meteor/client/components/CreateDiscussion/CreateDiscussion.tsx
+++ b/apps/meteor/client/components/CreateDiscussion/CreateDiscussion.tsx
@@ -120,7 +120,7 @@ const CreateDiscussion = ({ onClose, defaultParentRoom, parentMessageId, nameSug
<Controller
control={control}
name='parentRoom'
- rules={{ required: t('error-the-field-is-required', { field: t('Discussion_target_channel') }) }}
+ rules={{ required: t('Required_field', { field: t('Discussion_target_channel') }) }}
render={({ field: { name, onBlur, onChange, value } }) => (
<RoomAutoComplete
name={name}
@@ -152,7 +152,7 @@ const CreateDiscussion = ({ onClose, defaultParentRoom, parentMessageId, nameSug
<Controller
name='name'
control={control}
- rules={{ required: t('Field_required') }}
+ rules={{ required: t('Required_field', { field: t('Name') }) }}
render={({ field }) => (
<TextInput
id={discussionNameId}
diff --git a/apps/meteor/client/components/Omnichannel/modals/CloseChatModal.tsx b/apps/meteor/client/components/Omnichannel/modals/CloseChatModal.tsx
index 7c028fb5c876a5ddbc503b1988d8587073ca971b..489eb4a0460213043fb2335b6deb5ea18388972d 100644
--- a/apps/meteor/client/components/Omnichannel/modals/CloseChatModal.tsx
+++ b/apps/meteor/client/components/Omnichannel/modals/CloseChatModal.tsx
@@ -84,11 +84,11 @@ const CloseChatModal = ({
const requestData = transcriptEmail && visitorEmail ? { email: visitorEmail, subject } : undefined;
if (!comment?.trim() && commentRequired) {
- setError('comment', { type: 'custom', message: t('The_field_is_required', t('Comment')) });
+ setError('comment', { type: 'custom', message: t('Required_field', { field: t('Comment') }) });
}
if (transcriptEmail && !subject) {
- setError('subject', { type: 'custom', message: t('The_field_is_required', t('Subject')) });
+ setError('subject', { type: 'custom', message: t('Required_field', { field: t('Subject') }) });
}
if (!tags?.length && tagRequired) {
@@ -154,12 +154,7 @@ const CloseChatModal = ({
<FieldRow>
<TextInput
{...register('comment')}
- error={
- errors.comment &&
- t('error-the-field-is-required', {
- field: t('Comment'),
- })
- }
+ error={errors.comment && t('Required_field', { field: t('Comment') })}
flexGrow={1}
placeholder={t('Please_add_a_comment')}
/>
@@ -206,12 +201,7 @@ const CloseChatModal = ({
<TextInput
{...register('subject', { required: true })}
className='active'
- error={
- errors.subject &&
- t('error-the-field-is-required', {
- field: t('Subject'),
- })
- }
+ error={errors.subject && t('Required_field', { field: t('Subject') })}
flexGrow={1}
/>
</FieldRow>
diff --git a/apps/meteor/client/components/Omnichannel/modals/TranscriptModal.tsx b/apps/meteor/client/components/Omnichannel/modals/TranscriptModal.tsx
index 502d0f9d1af78e73bbc3cb6583ceddb731195ee7..de13ee3aa9a4c0d83fbf8d16ed0d17e00b6b08b5 100644
--- a/apps/meteor/client/components/Omnichannel/modals/TranscriptModal.tsx
+++ b/apps/meteor/client/components/Omnichannel/modals/TranscriptModal.tsx
@@ -74,7 +74,7 @@ const TranscriptModal = ({ email: emailDefault = '', room, onRequest, onSend, on
disabled={!!emailDefault || !!transcriptRequest}
error={errors.email?.message}
flexGrow={1}
- {...register('email', { required: t('The_field_is_required', t('Email')) })}
+ {...register('email', { required: t('Required_field', { field: t('Email') }) })}
/>
</FieldRow>
<FieldError>{errors.email?.message}</FieldError>
@@ -86,7 +86,7 @@ const TranscriptModal = ({ email: emailDefault = '', room, onRequest, onSend, on
disabled={!!transcriptRequest}
error={errors.subject?.message}
flexGrow={1}
- {...register('subject', { required: t('The_field_is_required', t('Subject')) })}
+ {...register('subject', { required: t('Required_field', { field: t('Subject') }) })}
/>
</FieldRow>
<FieldError>{errors.subject?.message}</FieldError>
diff --git a/apps/meteor/client/omnichannel/additionalForms/BusinessHoursMultiple.tsx b/apps/meteor/client/omnichannel/additionalForms/BusinessHoursMultiple.tsx
index 35af90a912d0e292e1a24bc1d1d36cb5961357d6..640dbd3752880e06a7e3ca40e4da99cc4a0b05db 100644
--- a/apps/meteor/client/omnichannel/additionalForms/BusinessHoursMultiple.tsx
+++ b/apps/meteor/client/omnichannel/additionalForms/BusinessHoursMultiple.tsx
@@ -44,7 +44,7 @@ const BusinessHoursMultiple = ({ className }: { className?: ComponentProps<typeo
<Controller
name='name'
control={control}
- rules={{ required: t('error-the-field-is-required', { field: t('Name') }) }}
+ rules={{ required: t('Required_field', { field: t('Name') }) }}
render={({ field }) => <TextInput id={nameField} {...field} aria-describedby={`${departmentsField}-error`} />}
/>
</FieldRow>
diff --git a/apps/meteor/client/omnichannel/cannedResponses/components/cannedResponseForm.tsx b/apps/meteor/client/omnichannel/cannedResponses/components/cannedResponseForm.tsx
index 51c993d2542f3e93ed5639eeded1034762a0c30a..e2bc979f3f4df80be8cdd0c1687bb47615a73855 100644
--- a/apps/meteor/client/omnichannel/cannedResponses/components/cannedResponseForm.tsx
+++ b/apps/meteor/client/omnichannel/cannedResponses/components/cannedResponseForm.tsx
@@ -43,7 +43,7 @@ const CannedResponseForm = () => {
<Controller
name='shortcut'
control={control}
- rules={{ required: t('The_field_is_required', t('Shortcut')) }}
+ rules={{ required: t('Required_field', { field: t('Shortcut') }) }}
render={({ field }) => (
<TextInput
{...field}
@@ -76,7 +76,7 @@ const CannedResponseForm = () => {
<Controller
name='text'
control={control}
- rules={{ required: t('The_field_is_required', t('Message')) }}
+ rules={{ required: t('Required_field', { field: t('Message') }) }}
render={({ field: { value, onChange, name, onBlur } }) => (
<CannedResponsesComposer
id={messageField}
@@ -168,7 +168,7 @@ const CannedResponseForm = () => {
<Controller
name='departmentId'
control={control}
- rules={{ required: t('The_field_is_required', t('Department')) }}
+ rules={{ required: t('Required_field', { field: t('Department') }) }}
render={({ field: { value, onChange } }) => (
<AutoCompleteDepartment
{...(hasMonitorPermission && { onlyMyDepartments: hasMonitorPermission })}
diff --git a/apps/meteor/client/omnichannel/priorities/PriorityEditForm.tsx b/apps/meteor/client/omnichannel/priorities/PriorityEditForm.tsx
index 592cd6b0f932f4b239ba839a66df3c373114efeb..09bfda04fe280857b343da4c9028eee1719780cc 100644
--- a/apps/meteor/client/omnichannel/priorities/PriorityEditForm.tsx
+++ b/apps/meteor/client/omnichannel/priorities/PriorityEditForm.tsx
@@ -47,7 +47,7 @@ const PriorityEditForm = ({ data, onSave, onCancel }: PriorityEditFormProps): Re
const { name } = getValues();
if (!isValid) {
- return dispatchToastMessage({ type: 'error', message: t('The_field_is_required') });
+ return dispatchToastMessage({ type: 'error', message: t('Required_field', { field: t('Name') }) });
}
try {
@@ -77,7 +77,7 @@ const PriorityEditForm = ({ data, onSave, onCancel }: PriorityEditFormProps): Re
<Controller
name='name'
control={control}
- rules={{ required: t('The_field_is_required', t('Name')), validate: (v) => v?.trim() !== '' }}
+ rules={{ required: t('Required_field', { field: t('Name') }), validate: (v) => v?.trim() !== '' }}
render={({ field: { value, onChange } }): ReactElement => (
<StringSettingInput
_id=''
diff --git a/apps/meteor/client/omnichannel/slaPolicies/SlaEdit.tsx b/apps/meteor/client/omnichannel/slaPolicies/SlaEdit.tsx
index 0b4ab02791da9ce9409b514a333a78d045a5d661..0585cbcf4959281bfabb4e3d9990e51fb28a813f 100644
--- a/apps/meteor/client/omnichannel/slaPolicies/SlaEdit.tsx
+++ b/apps/meteor/client/omnichannel/slaPolicies/SlaEdit.tsx
@@ -37,7 +37,7 @@ function SlaEdit({ data, isNew, slaId, reload, ...props }: SlaEditProps): ReactE
const { field: nameField } = useController({
control,
name: 'name',
- rules: { required: t('The_field_is_required', t('Name')) },
+ rules: { required: t('Required_field', { field: t('Name') }) },
});
const { field: dueTimeField } = useController({
@@ -45,7 +45,7 @@ function SlaEdit({ data, isNew, slaId, reload, ...props }: SlaEditProps): ReactE
name: 'dueTimeInMinutes',
rules: {
validate(value) {
- return Number(value || 0) <= 0 ? t('The_field_is_required', t('Estimated_wait_time_in_minutes')) : true;
+ return Number(value || 0) <= 0 ? t('Required_field', { field: t('Estimated_wait_time_in_minutes') }) : true;
},
},
});
@@ -56,7 +56,7 @@ function SlaEdit({ data, isNew, slaId, reload, ...props }: SlaEditProps): ReactE
const { name, description, dueTimeInMinutes } = getValues();
if (!isValid || !name || dueTimeInMinutes === undefined) {
- return dispatchToastMessage({ type: 'error', message: t('The_field_is_required') });
+ return dispatchToastMessage({ type: 'error', message: t('Required_field') });
}
try {
diff --git a/apps/meteor/client/omnichannel/tags/TagEdit.tsx b/apps/meteor/client/omnichannel/tags/TagEdit.tsx
index 767b56e9167516bd9718c6a9679cc42ecca67652..215fe33cdbd1cb1d5806e0f6872653f7dab8b12b 100644
--- a/apps/meteor/client/omnichannel/tags/TagEdit.tsx
+++ b/apps/meteor/client/omnichannel/tags/TagEdit.tsx
@@ -88,7 +88,7 @@ const TagEdit = ({ tagData, currentDepartments }: TagEditProps) => {
<Controller
name='name'
control={control}
- rules={{ required: t('The_field_is_required', 'name') }}
+ rules={{ required: t('Required_field', { field: t('Name') }) }}
render={({ field }) => <TextInput {...field} error={errors?.name?.message} aria-describedby={`${nameField}-error`} />}
/>
</FieldRow>
diff --git a/apps/meteor/client/omnichannel/units/UnitEdit.tsx b/apps/meteor/client/omnichannel/units/UnitEdit.tsx
index e71e8e2a94d0468cd321983fef4c4141e46b2bf0..b2feb1db8a8f4d21ba609ad873dd07462d528b9c 100644
--- a/apps/meteor/client/omnichannel/units/UnitEdit.tsx
+++ b/apps/meteor/client/omnichannel/units/UnitEdit.tsx
@@ -168,7 +168,7 @@ const UnitEdit = ({ unitData, unitMonitors, unitDepartments }: UnitEditProps) =>
<Controller
name='name'
control={control}
- rules={{ required: t('The_field_is_required', t('Name')) }}
+ rules={{ required: t('Required_field', { field: t('Name') }) }}
render={({ field }) => (
<TextInput
id={nameField}
@@ -195,7 +195,7 @@ const UnitEdit = ({ unitData, unitMonitors, unitDepartments }: UnitEditProps) =>
<Controller
name='visibility'
control={control}
- rules={{ required: t('The_field_is_required', t('Visibility')) }}
+ rules={{ required: t('Required_field', { field: t('Visibility') }) }}
render={({ field }) => (
<Select
id={visibilityField}
@@ -220,7 +220,7 @@ const UnitEdit = ({ unitData, unitMonitors, unitDepartments }: UnitEditProps) =>
<Controller
name='departments'
control={control}
- rules={{ required: t('The_field_is_required', t('Departments')) }}
+ rules={{ required: t('Required_field', { field: t('Departments') }) }}
render={({ field: { name, value, onChange, onBlur } }) => (
<PaginatedMultiSelectFiltered
id={departmentsField}
@@ -267,7 +267,7 @@ const UnitEdit = ({ unitData, unitMonitors, unitDepartments }: UnitEditProps) =>
<Controller
name='monitors'
control={control}
- rules={{ required: t('The_field_is_required', t('Monitors')) }}
+ rules={{ required: t('Required_field', { field: t('Monitors') }) }}
render={({ field: { name, value, onChange, onBlur } }) => (
<PaginatedMultiSelectFiltered
id={monitorsField}
diff --git a/apps/meteor/client/sidebar/header/CreateChannel/CreateChannelModal.tsx b/apps/meteor/client/sidebar/header/CreateChannel/CreateChannelModal.tsx
index 27ad314b2ab8e8f7149647e46826b559afb97896..03e1122da7739e829e53f83d535e7a5d80d638d1 100644
--- a/apps/meteor/client/sidebar/header/CreateChannel/CreateChannelModal.tsx
+++ b/apps/meteor/client/sidebar/header/CreateChannel/CreateChannelModal.tsx
@@ -222,7 +222,7 @@ const CreateChannelModal = ({ teamId = '', onClose, reload }: CreateChannelModal
id={nameId}
data-qa-type='channel-name-input'
{...register('name', {
- required: t('error-the-field-is-required', { field: t('Name') }),
+ required: t('Required_field', { field: t('Name') }),
validate: (value) => validateChannelName(value),
})}
error={errors.name?.message}
diff --git a/apps/meteor/client/sidebar/header/CreateTeam/CreateTeamModal.tsx b/apps/meteor/client/sidebar/header/CreateTeam/CreateTeamModal.tsx
index ad1abdcbf399b56d944b98cb7596cd5fc53d4777..3543234bca962d200d1833ace9f02221a4141171 100644
--- a/apps/meteor/client/sidebar/header/CreateTeam/CreateTeamModal.tsx
+++ b/apps/meteor/client/sidebar/header/CreateTeam/CreateTeamModal.tsx
@@ -181,7 +181,7 @@ const CreateTeamModal = ({ onClose }: { onClose: () => void }): ReactElement =>
id={nameId}
aria-invalid={errors.name ? 'true' : 'false'}
{...register('name', {
- required: t('error-the-field-is-required', { field: t('Name') }),
+ required: t('Required_field', { field: t('Name') }),
validate: (value) => validateTeamName(value),
})}
addon={<Icon size='x20' name={isPrivate ? 'team-lock' : 'team'} />}
diff --git a/apps/meteor/client/sidebarv2/header/CreateChannelModal.tsx b/apps/meteor/client/sidebarv2/header/CreateChannelModal.tsx
index 38a1df5a5ec8a635f6b524885e9a2840f3b7f6dc..2ff468f4f72bd5b3550ca7c1b85c2d3a49d7b40c 100644
--- a/apps/meteor/client/sidebarv2/header/CreateChannelModal.tsx
+++ b/apps/meteor/client/sidebarv2/header/CreateChannelModal.tsx
@@ -222,7 +222,7 @@ const CreateChannelModal = ({ teamId = '', onClose, reload }: CreateChannelModal
id={nameId}
data-qa-type='channel-name-input'
{...register('name', {
- required: t('error-the-field-is-required', { field: t('Name') }),
+ required: t('Required_field', { field: t('Name') }),
validate: (value) => validateChannelName(value),
})}
error={errors.name?.message}
diff --git a/apps/meteor/client/sidebarv2/header/CreateTeamModal.tsx b/apps/meteor/client/sidebarv2/header/CreateTeamModal.tsx
index e907558ce27869aae8b41d6bcccb4807d7a810c9..a7e7b506de0fb99c9657a8d6840c12ae6c2038ec 100644
--- a/apps/meteor/client/sidebarv2/header/CreateTeamModal.tsx
+++ b/apps/meteor/client/sidebarv2/header/CreateTeamModal.tsx
@@ -183,7 +183,7 @@ const CreateTeamModal = ({ onClose }: CreateTeamModalProps) => {
id={nameId}
aria-invalid={errors.name ? 'true' : 'false'}
{...register('name', {
- required: t('error-the-field-is-required', { field: t('Name') }),
+ required: t('Required_field', { field: t('Name') }),
validate: (value) => validateTeamName(value),
})}
addon={<Icon size='x20' name={isPrivate ? 'team-lock' : 'team'} />}
diff --git a/apps/meteor/client/views/account/integrations/AccountIntegrationsPage.tsx b/apps/meteor/client/views/account/integrations/AccountIntegrationsPage.tsx
index 2c11b7a384cd5bbc6beba57db0a1d905a759b208..ce9fad8591fa3de87d7d0ef0067e4eb0749ceaf1 100644
--- a/apps/meteor/client/views/account/integrations/AccountIntegrationsPage.tsx
+++ b/apps/meteor/client/views/account/integrations/AccountIntegrationsPage.tsx
@@ -1,6 +1,6 @@
import type { SelectOption } from '@rocket.chat/fuselage';
-import { SelectLegacy, Box, Button, Field, FieldLabel, FieldRow } from '@rocket.chat/fuselage';
-import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
+import { SelectLegacy, Box, Button, Field, FieldLabel, FieldRow, FieldError } from '@rocket.chat/fuselage';
+import { useEffectEvent, useUniqueId } from '@rocket.chat/fuselage-hooks';
import { useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
import React, { useMemo } from 'react';
import { useForm, Controller } from 'react-hook-form';
@@ -13,7 +13,11 @@ import { useRemoveWebDAVAccountIntegrationMutation } from './hooks/useRemoveWebD
const AccountIntegrationsPage = () => {
const { data: webdavAccountIntegrations } = useWebDAVAccountIntegrationsQuery();
- const { handleSubmit, control } = useForm<{ accountSelected: string }>();
+ const {
+ handleSubmit,
+ control,
+ formState: { errors },
+ } = useForm<{ accountSelected: string }>();
const options: SelectOption[] = useMemo(
() => webdavAccountIntegrations?.map(({ _id, ...current }) => [_id, getWebdavServerName(current)]) ?? [],
@@ -36,6 +40,8 @@ const AccountIntegrationsPage = () => {
removeMutation.mutate({ accountSelected });
});
+ const accountSelectedId = useUniqueId();
+
return (
<Page>
<PageHeader title={t('Integrations')} />
@@ -47,22 +53,18 @@ const AccountIntegrationsPage = () => {
<Controller
control={control}
name='accountSelected'
- rules={{ required: true }}
- render={({ field: { onChange, value, name, ref } }) => (
- <SelectLegacy
- ref={ref}
- name={name}
- options={options}
- onChange={onChange}
- value={value}
- placeholder={t('Select_an_option')}
- />
- )}
+ rules={{ required: t('Required_field', { field: t('WebDAV_Accounts') }) }}
+ render={({ field }) => <SelectLegacy {...field} options={options} placeholder={t('Select_an_option')} />}
/>
<Button type='submit' danger>
{t('Remove')}
</Button>
</FieldRow>
+ {errors?.accountSelected && (
+ <FieldError aria-live='assertive' id={`${accountSelectedId}-error`}>
+ {errors.accountSelected.message}
+ </FieldError>
+ )}
</Field>
</Box>
</PageScrollableContentWithShadow>
diff --git a/apps/meteor/client/views/account/profile/AccountProfileForm.tsx b/apps/meteor/client/views/account/profile/AccountProfileForm.tsx
index 0de462cd5bd379db91d22763252311834c03db40..95398b3520493f2fc3673e270ebdae1c027c849c 100644
--- a/apps/meteor/client/views/account/profile/AccountProfileForm.tsx
+++ b/apps/meteor/client/views/account/profile/AccountProfileForm.tsx
@@ -166,7 +166,9 @@ const AccountProfileForm = (props: AllHTMLAttributes<HTMLFormElement>): ReactEle
<Controller
control={control}
name='name'
- rules={{ validate: (name) => (requireName && name === '' ? t('error-the-field-is-required', { field: t('Name') }) : true) }}
+ rules={{
+ required: requireName && t('Required_field', { field: t('Name') }),
+ }}
render={({ field }) => (
<TextInput
{...field}
@@ -196,7 +198,7 @@ const AccountProfileForm = (props: AllHTMLAttributes<HTMLFormElement>): ReactEle
control={control}
name='username'
rules={{
- required: t('error-the-field-is-required', { field: t('Username') }),
+ required: t('Required_field', { field: t('Username') }),
validate: (username) => validateUsername(username),
}}
render={({ field }) => (
@@ -305,7 +307,10 @@ const AccountProfileForm = (props: AllHTMLAttributes<HTMLFormElement>): ReactEle
<Controller
control={control}
name='email'
- rules={{ validate: { validateEmail: (email) => (validateEmail(email) ? undefined : t('error-invalid-email-address')) } }}
+ rules={{
+ required: t('Required_field', { field: t('Email') }),
+ validate: { validateEmail: (email) => (validateEmail(email) ? undefined : t('error-invalid-email-address')) },
+ }}
render={({ field }) => (
<TextInput
{...field}
diff --git a/apps/meteor/client/views/account/security/AccountSecurityPage.tsx b/apps/meteor/client/views/account/security/AccountSecurityPage.tsx
index 06619f0618f572f345bbda81f1a4c5abe15f7075..81435536e9811b828b33ad29686dda31fbf07e8e 100644
--- a/apps/meteor/client/views/account/security/AccountSecurityPage.tsx
+++ b/apps/meteor/client/views/account/security/AccountSecurityPage.tsx
@@ -23,7 +23,7 @@ const AccountSecurityPage = (): ReactElement => {
const methods = useForm({
defaultValues: passwordDefaultValues,
- mode: 'onBlur',
+ mode: 'all',
});
const {
reset,
diff --git a/apps/meteor/client/views/account/security/ChangePassword.tsx b/apps/meteor/client/views/account/security/ChangePassword.tsx
index c70d9e1661759bcdf839354c8a8d119f6a220b31..e5cb61e345477966ca39cdcc00b17afc7e63e606 100644
--- a/apps/meteor/client/views/account/security/ChangePassword.tsx
+++ b/apps/meteor/client/views/account/security/ChangePassword.tsx
@@ -53,13 +53,13 @@ const ChangePassword = (props: AllHTMLAttributes<HTMLFormElement>) => {
control={control}
name='password'
rules={{
+ required: t('Required_field', { field: t('New_password') }),
validate: () => (password?.length && !passwordIsValid ? t('Password_must_meet_the_complexity_requirements') : true),
}}
- render={({ field: { onChange, value } }) => (
+ render={({ field }) => (
<PasswordInput
+ {...field}
id={passwordId}
- onChange={onChange}
- value={value}
error={errors.password?.message}
flexGrow={1}
addon={<Icon name='key' size='x20' />}
@@ -84,12 +84,14 @@ const ChangePassword = (props: AllHTMLAttributes<HTMLFormElement>) => {
<Controller
control={control}
name='confirmationPassword'
- rules={{ validate: (confirmationPassword) => (password !== confirmationPassword ? t('Passwords_do_not_match') : true) }}
- render={({ field: { onChange, value } }) => (
+ rules={{
+ required: t('Required_field', { field: t('Confirm_password') }),
+ validate: (confirmationPassword) => (password !== confirmationPassword ? t('Passwords_do_not_match') : true),
+ }}
+ render={({ field }) => (
<PasswordInput
+ {...field}
id={confirmPasswordId}
- onChange={onChange}
- value={value}
error={errors.confirmationPassword?.message}
flexGrow={1}
addon={<Icon name='key' size='x20' />}
diff --git a/apps/meteor/client/views/account/security/EndToEnd.tsx b/apps/meteor/client/views/account/security/EndToEnd.tsx
index 72213f3202babb27a0d5c68f6252453f5d14f2c5..b2fb982ebb9b4f5344deec6eb2676f5ef2dbb15a 100644
--- a/apps/meteor/client/views/account/security/EndToEnd.tsx
+++ b/apps/meteor/client/views/account/security/EndToEnd.tsx
@@ -1,8 +1,9 @@
import { Box, Margins, PasswordInput, Field, FieldGroup, FieldLabel, FieldRow, FieldError, FieldHint, Button } from '@rocket.chat/fuselage';
+import { useUniqueId } from '@rocket.chat/fuselage-hooks';
import { useToastMessageDispatch, useMethod, useTranslation, useLogout } from '@rocket.chat/ui-contexts';
import type { ComponentProps, ReactElement } from 'react';
import React, { useCallback, useEffect } from 'react';
-import { useForm } from 'react-hook-form';
+import { Controller, useForm } from 'react-hook-form';
import { e2e } from '../../../../app/e2e/client/rocketchat.e2e';
@@ -17,17 +18,17 @@ const EndToEnd = (props: ComponentProps<typeof Box>): ReactElement => {
const resetE2eKey = useMethod('e2e.resetOwnE2EKey');
const {
- register,
handleSubmit,
watch,
resetField,
formState: { errors, isValid },
+ control,
} = useForm({
defaultValues: {
password: '',
passwordConfirm: '',
},
- mode: 'onChange',
+ mode: 'all',
});
const { password } = watch();
@@ -64,37 +65,71 @@ const EndToEnd = (props: ComponentProps<typeof Box>): ReactElement => {
}
}, [password, resetField]);
+ const passwordId = useUniqueId();
+ const e2ePasswordExplanationId = useUniqueId();
+ const passwordConfirmId = useUniqueId();
+
return (
<Box display='flex' flexDirection='column' alignItems='flex-start' mbs={16} {...props}>
<Margins blockEnd={8}>
<Box fontScale='h4'>{t('E2E_Encryption_Password_Change')}</Box>
- <Box dangerouslySetInnerHTML={{ __html: t('E2E_Encryption_Password_Explanation') }} />
+ <Box id={e2ePasswordExplanationId} dangerouslySetInnerHTML={{ __html: t('E2E_Encryption_Password_Explanation') }} />
<FieldGroup w='full'>
<Field>
- <FieldLabel id='New_encryption_password'>{t('New_encryption_password')}</FieldLabel>
+ <FieldLabel htmlFor={passwordId}>{t('New_encryption_password')}</FieldLabel>
<FieldRow>
- <PasswordInput
- {...register('password', { required: true })}
- placeholder={t('New_Password_Placeholder')}
- disabled={!keysExist}
- aria-labelledby='New_encryption_password'
+ <Controller
+ control={control}
+ name='password'
+ rules={{ required: t('Required_field', { field: t('New_encryption_password') }) }}
+ render={({ field }) => (
+ <PasswordInput
+ {...field}
+ id={passwordId}
+ error={errors.password?.message}
+ placeholder={t('New_Password_Placeholder')}
+ disabled={!keysExist}
+ aria-describedby={`${e2ePasswordExplanationId} ${passwordId}-hint ${passwordId}-error`}
+ aria-invalid={errors.password ? 'true' : 'false'}
+ />
+ )}
/>
</FieldRow>
- {!keysExist && <FieldHint>{t('EncryptionKey_Change_Disabled')}</FieldHint>}
+ {!keysExist && <FieldHint id={`${passwordId}-hint`}>{t('EncryptionKey_Change_Disabled')}</FieldHint>}
+ {errors?.password && (
+ <FieldError aria-live='assertive' id={`${passwordId}-error`}>
+ {errors.password.message}
+ </FieldError>
+ )}
</Field>
{hasTypedPassword && (
<Field>
- <FieldLabel id='Confirm_new_encryption_password'>{t('Confirm_new_encryption_password')}</FieldLabel>
- <PasswordInput
- error={errors.passwordConfirm?.message}
- {...register('passwordConfirm', {
- required: true,
- validate: (value: string) => (password !== value ? 'Your passwords do no match' : true),
- })}
- placeholder={t('Confirm_New_Password_Placeholder')}
- aria-labelledby='Confirm_new_encryption_password'
- />
- {errors.passwordConfirm && <FieldError>{errors.passwordConfirm.message}</FieldError>}
+ <FieldLabel htmlFor={passwordConfirmId}>{t('Confirm_new_encryption_password')}</FieldLabel>
+ <FieldRow>
+ <Controller
+ control={control}
+ name='passwordConfirm'
+ rules={{
+ required: t('Required_field', { field: t('Confirm_new_encryption_password') }),
+ validate: (value: string) => (password !== value ? 'Your passwords do no match' : true),
+ }}
+ render={({ field }) => (
+ <PasswordInput
+ {...field}
+ id={passwordConfirmId}
+ error={errors.passwordConfirm?.message}
+ placeholder={t('Confirm_New_Password_Placeholder')}
+ aria-describedby={`${passwordConfirmId}-error`}
+ aria-invalid={errors.password ? 'true' : 'false'}
+ />
+ )}
+ />
+ </FieldRow>
+ {errors.passwordConfirm && (
+ <FieldError aria-live='assertive' id={`${passwordConfirmId}-error`}>
+ {errors.passwordConfirm.message}
+ </FieldError>
+ )}
</Field>
)}
</FieldGroup>
diff --git a/apps/meteor/client/views/admin/customEmoji/AddCustomEmoji.tsx b/apps/meteor/client/views/admin/customEmoji/AddCustomEmoji.tsx
index 59da79508192a311ab93a84da550bd7d26f4a7be..f6f52507d33a2c50503958b43f2d9d38879e5268 100644
--- a/apps/meteor/client/views/admin/customEmoji/AddCustomEmoji.tsx
+++ b/apps/meteor/client/views/admin/customEmoji/AddCustomEmoji.tsx
@@ -1,4 +1,4 @@
-import { Box, Button, ButtonGroup, Margins, TextInput, Field, FieldLabel, FieldRow, FieldError, Icon } from '@rocket.chat/fuselage';
+import { Box, Button, ButtonGroup, Margins, TextInput, Field, FieldLabel, FieldRow, FieldError, IconButton } from '@rocket.chat/fuselage';
import type { ReactElement, ChangeEvent } from 'react';
import React, { useCallback, useState } from 'react';
import { useTranslation } from 'react-i18next';
@@ -82,7 +82,7 @@ const AddCustomEmoji = ({ close, onChange, ...props }: AddCustomEmojiProps): Rea
<FieldRow>
<TextInput value={name} onChange={handleChangeName} placeholder={t('Name')} />
</FieldRow>
- {errors.name && <FieldError>{t('error-the-field-is-required', { field: t('Name') })}</FieldError>}
+ {errors.name && <FieldError>{t('Required_field', { field: t('Name') })}</FieldError>}
</Field>
<Field>
<FieldLabel>{t('Aliases')}</FieldLabel>
@@ -94,12 +94,9 @@ const AddCustomEmoji = ({ close, onChange, ...props }: AddCustomEmojiProps): Rea
<Field>
<FieldLabel alignSelf='stretch' display='flex' justifyContent='space-between' alignItems='center'>
{t('Custom_Emoji')}
- {/* FIXME: replace to IconButton */}
- <Button square onClick={clickUpload}>
- <Icon name='upload' size='x20' />
- </Button>
+ <IconButton secondary small icon='upload' onClick={clickUpload} />
</FieldLabel>
- {errors.emoji && <FieldError>{t('error-the-field-is-required', { field: t('Custom_Emoji') })}</FieldError>}
+ {errors.emoji && <FieldError>{t('Required_field', { field: t('Custom_Emoji') })}</FieldError>}
{newEmojiPreview && (
<Box display='flex' flexDirection='row' mi='neg-x4' justifyContent='center'>
<Margins inline={4}>
diff --git a/apps/meteor/client/views/admin/customEmoji/EditCustomEmoji.tsx b/apps/meteor/client/views/admin/customEmoji/EditCustomEmoji.tsx
index 8f63b2ac7b48119f3374b6ad28feee053e0857be..49ee12b69dd05169ba34bc6033f6ede1de9ff398 100644
--- a/apps/meteor/client/views/admin/customEmoji/EditCustomEmoji.tsx
+++ b/apps/meteor/client/views/admin/customEmoji/EditCustomEmoji.tsx
@@ -150,7 +150,7 @@ const EditCustomEmoji = ({ close, onChange, data, ...props }: EditCustomEmojiPro
<FieldRow>
<TextInput value={name} onChange={handleChangeName} placeholder={t('Name')} />
</FieldRow>
- {errors.name && <FieldError>{t('error-the-field-is-required', { field: t('Name') })}</FieldError>}
+ {errors.name && <FieldError>{t('Required_field', { field: t('Name') })}</FieldError>}
</Field>
<Field>
<FieldLabel>{t('Aliases')}</FieldLabel>
diff --git a/apps/meteor/client/views/admin/customSounds/AddCustomSound.tsx b/apps/meteor/client/views/admin/customSounds/AddCustomSound.tsx
index 82f668a2d7d560a6e23cdfdd0aa4e06658a3374a..430d05ceaa530ac5024bf8f863411a07d9491e49 100644
--- a/apps/meteor/client/views/admin/customSounds/AddCustomSound.tsx
+++ b/apps/meteor/client/views/admin/customSounds/AddCustomSound.tsx
@@ -1,4 +1,4 @@
-import { Field, FieldLabel, FieldRow, TextInput, Box, Icon, Margins, Button, ButtonGroup } from '@rocket.chat/fuselage';
+import { Field, FieldLabel, FieldRow, TextInput, Box, Margins, Button, ButtonGroup, IconButton } from '@rocket.chat/fuselage';
import { useToastMessageDispatch, useMethod, useTranslation } from '@rocket.chat/ui-contexts';
import type { ReactElement, FormEvent } from 'react';
import React, { useState, useCallback } from 'react';
@@ -34,8 +34,8 @@ const AddCustomSound = ({ goToNew, close, onChange, ...props }: AddCustomSoundPr
const soundData = createSoundData(soundFile, name);
const validation = validate(soundData, soundFile) as Array<Parameters<typeof t>[0]>;
- validation.forEach((error) => {
- throw new Error(t('error-the-field-is-required', { field: t(error) }));
+ validation.forEach((invalidFieldName) => {
+ throw new Error(t('Required_field', { field: t(invalidFieldName) }));
});
try {
@@ -97,12 +97,9 @@ const AddCustomSound = ({ goToNew, close, onChange, ...props }: AddCustomSoundPr
</Field>
<Field>
<FieldLabel alignSelf='stretch'>{t('Sound_File_mp3')}</FieldLabel>
- <Box display='flex' flexDirection='row' mbs='none'>
+ <Box display='flex' flexDirection='row' mbs='none' alignItems='center'>
<Margins inline={4}>
- {/* FIXME: replace to IconButton */}
- <Button square onClick={clickUpload}>
- <Icon name='upload' size='x20' />
- </Button>
+ <IconButton secondary small icon='upload' onClick={clickUpload} />
{sound?.name || t('None')}
</Margins>
</Box>
@@ -111,7 +108,7 @@ const AddCustomSound = ({ goToNew, close, onChange, ...props }: AddCustomSoundPr
<ContextualbarFooter>
<ButtonGroup stretch>
<Button onClick={close}>{t('Cancel')}</Button>
- <Button primary onClick={handleSave} disabled={name === ''}>
+ <Button primary onClick={handleSave}>
{t('Save')}
</Button>
</ButtonGroup>
diff --git a/apps/meteor/client/views/admin/customSounds/EditSound.tsx b/apps/meteor/client/views/admin/customSounds/EditSound.tsx
index b358d0bb7c84db773015391fee00099699ce091f..1274e9deda35ba67142a5e4e5e4de8914fdae685 100644
--- a/apps/meteor/client/views/admin/customSounds/EditSound.tsx
+++ b/apps/meteor/client/views/admin/customSounds/EditSound.tsx
@@ -76,10 +76,10 @@ function EditSound({ close, onChange, data, ...props }: EditSoundProps): ReactEl
}
}
- validation.forEach((error) =>
+ validation.forEach((invalidFieldName) =>
dispatchToastMessage({
type: 'error',
- message: t('error-the-field-is-required', { field: t(error) }),
+ message: t('Required_field', { field: t(invalidFieldName) }),
}),
);
},
@@ -131,9 +131,9 @@ function EditSound({ close, onChange, data, ...props }: EditSoundProps): ReactEl
</Field>
<Field>
<FieldLabel alignSelf='stretch'>{t('Sound_File_mp3')}</FieldLabel>
- <Box display='flex' flexDirection='row' mbs='none'>
+ <Box display='flex' flexDirection='row' mbs='none' alignItems='center'>
<Margins inline={4}>
- <IconButton icon='upload' secondary onClick={clickUpload} />
+ <IconButton secondary small icon='upload' onClick={clickUpload} />
{sound?.name || 'none'}
</Margins>
</Box>
diff --git a/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusForm.tsx b/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusForm.tsx
index 78c2618b4c53a4c7c091b472aae7dca07c46562d..07376208aaef86c7e1862f3b7bbca206298f7e1f 100644
--- a/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusForm.tsx
+++ b/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusForm.tsx
@@ -28,9 +28,10 @@ const CustomUserStatusForm = ({ onClose, onReload, status }: CustomUserStatusFor
register,
control,
handleSubmit,
- formState: { isDirty, errors },
+ formState: { errors },
} = useForm({
defaultValues: { name: status?.name ?? '', statusType: status?.statusType ?? '' },
+ mode: 'all',
});
const saveStatus = useEndpoint('POST', _id ? '/v1/custom-user-status.update' : '/v1/custom-user-status.create');
@@ -94,9 +95,9 @@ const CustomUserStatusForm = ({ onClose, onReload, status }: CustomUserStatusFor
<Field>
<FieldLabel>{t('Name')}</FieldLabel>
<FieldRow>
- <TextInput {...register('name', { required: true })} placeholder={t('Name')} />
+ <TextInput {...register('name', { required: t('Required_field', { field: t('Name') }) })} placeholder={t('Name')} />
</FieldRow>
- {errors?.name && <FieldError>{t('error-the-field-is-required', { field: t('Name') })}</FieldError>}
+ {errors.name && <FieldError>{errors.name.message}</FieldError>}
</Field>
<Field>
<FieldLabel>{t('Presence')}</FieldLabel>
@@ -104,18 +105,18 @@ const CustomUserStatusForm = ({ onClose, onReload, status }: CustomUserStatusFor
<Controller
name='statusType'
control={control}
- rules={{ required: true }}
+ rules={{ required: t('Required_field', { field: t('Presence') }) }}
render={({ field }): ReactElement => <Select {...field} placeholder={t('Presence')} options={presenceOptions} />}
/>
</FieldRow>
- {errors?.statusType && <FieldError>{t('error-the-field-is-required', { field: t('Presence') })}</FieldError>}
+ {errors.statusType && <FieldError>{errors.statusType.message}</FieldError>}
</Field>
</FieldGroup>
</ContextualbarScrollableContent>
<ContextualbarFooter>
<ButtonGroup stretch>
<Button onClick={onClose}>{t('Cancel')}</Button>
- <Button form={formId} primary type='submit' disabled={!isDirty}>
+ <Button form={formId} primary type='submit'>
{t('Save')}
</Button>
</ButtonGroup>
diff --git a/apps/meteor/client/views/admin/emailInbox/EmailInboxForm.tsx b/apps/meteor/client/views/admin/emailInbox/EmailInboxForm.tsx
index c5cbd6f6aa1dd7da630ede987abae329ccf9e9c4..3537eddf9cc5749ec0feb74f0b0e66c5421fac6e 100644
--- a/apps/meteor/client/views/admin/emailInbox/EmailInboxForm.tsx
+++ b/apps/meteor/client/views/admin/emailInbox/EmailInboxForm.tsx
@@ -66,6 +66,7 @@ const EmailInboxForm = ({ inboxData }: { inboxData?: IEmailInboxPayload }): Reac
imapSecure: inboxData?.imap.secure ?? false,
imapRetries: inboxData?.imap.maxRetries ?? 10,
},
+ mode: 'all',
});
const handleDelete = useMutableCallback(() => {
@@ -153,7 +154,7 @@ const EmailInboxForm = ({ inboxData }: { inboxData?: IEmailInboxPayload }): Reac
}
if (!validateEmail(email)) {
- return t('Validate_email_address');
+ return t('error-invalid-email-address');
}
const { emailInbox } = await emailAlreadyExistsAction({ email });
@@ -211,7 +212,7 @@ const EmailInboxForm = ({ inboxData }: { inboxData?: IEmailInboxPayload }): Reac
<Controller
name='name'
control={control}
- rules={{ required: t('error-the-field-is-required', { field: t('Name') }) }}
+ rules={{ required: t('Required_field', { field: t('Name') }) }}
render={({ field }) => (
<TextInput
id={nameField}
@@ -239,7 +240,7 @@ const EmailInboxForm = ({ inboxData }: { inboxData?: IEmailInboxPayload }): Reac
name='email'
control={control}
rules={{
- required: t('error-the-field-is-required', { field: t('Email') }),
+ required: t('Required_field', { field: t('Email') }),
validate: (value) => checkEmailExists(value),
}}
render={({ field }) => (
@@ -313,7 +314,7 @@ const EmailInboxForm = ({ inboxData }: { inboxData?: IEmailInboxPayload }): Reac
<Controller
name='smtpServer'
control={control}
- rules={{ required: t('error-the-field-is-required', { field: t('Server') }) }}
+ rules={{ required: t('Required_field', { field: t('Server') }) }}
render={({ field }) => (
<TextInput
id={smtpServerField}
@@ -340,7 +341,7 @@ const EmailInboxForm = ({ inboxData }: { inboxData?: IEmailInboxPayload }): Reac
<Controller
name='smtpPort'
control={control}
- rules={{ required: t('error-the-field-is-required', { field: t('Port') }) }}
+ rules={{ required: t('Required_field', { field: t('Port') }) }}
render={({ field }) => (
<NumberInput
id={smtpPortField}
@@ -367,7 +368,7 @@ const EmailInboxForm = ({ inboxData }: { inboxData?: IEmailInboxPayload }): Reac
<Controller
name='smtpUsername'
control={control}
- rules={{ required: t('error-the-field-is-required', { field: t('Username') }) }}
+ rules={{ required: t('Required_field', { field: t('Username') }) }}
render={({ field }) => (
<TextInput
id={smtpUsernameField}
@@ -394,7 +395,7 @@ const EmailInboxForm = ({ inboxData }: { inboxData?: IEmailInboxPayload }): Reac
<Controller
name='smtpPassword'
control={control}
- rules={{ required: t('error-the-field-is-required', { field: t('Password') }) }}
+ rules={{ required: t('Required_field', { field: t('Password') }) }}
render={({ field }) => (
<PasswordInput
id={smtpPasswordField}
@@ -435,7 +436,7 @@ const EmailInboxForm = ({ inboxData }: { inboxData?: IEmailInboxPayload }): Reac
<Controller
name='imapServer'
control={control}
- rules={{ required: t('error-the-field-is-required', { field: t('Server') }) }}
+ rules={{ required: t('Required_field', { field: t('Server') }) }}
render={({ field }) => (
<TextInput
id={imapServerField}
@@ -462,7 +463,7 @@ const EmailInboxForm = ({ inboxData }: { inboxData?: IEmailInboxPayload }): Reac
<Controller
name='imapPort'
control={control}
- rules={{ required: t('error-the-field-is-required', { field: t('Port') }) }}
+ rules={{ required: t('Required_field', { field: t('Port') }) }}
render={({ field }) => (
<NumberInput
id={imapPortField}
@@ -489,7 +490,7 @@ const EmailInboxForm = ({ inboxData }: { inboxData?: IEmailInboxPayload }): Reac
<Controller
name='imapUsername'
control={control}
- rules={{ required: t('error-the-field-is-required', { field: t('Username') }) }}
+ rules={{ required: t('Required_field', { field: t('Username') }) }}
render={({ field }) => (
<TextInput
id={imapUsernameField}
@@ -516,7 +517,7 @@ const EmailInboxForm = ({ inboxData }: { inboxData?: IEmailInboxPayload }): Reac
<Controller
name='imapPassword'
control={control}
- rules={{ required: t('error-the-field-is-required', { field: t('Password') }) }}
+ rules={{ required: t('Required_field', { field: t('Password') }) }}
render={({ field }) => (
<PasswordInput
id={imapPasswordField}
@@ -543,7 +544,7 @@ const EmailInboxForm = ({ inboxData }: { inboxData?: IEmailInboxPayload }): Reac
<Controller
name='imapRetries'
control={control}
- rules={{ required: t('error-the-field-is-required', { field: t('Max_Retry') }) }}
+ rules={{ required: t('Required_field', { field: t('Max_Retry') }) }}
render={({ field }) => (
<NumberInput
id={imapRetriesField}
diff --git a/apps/meteor/client/views/admin/integrations/incoming/IncomingWebhookForm.tsx b/apps/meteor/client/views/admin/integrations/incoming/IncomingWebhookForm.tsx
index bd43c76b2138180bf0e3a08039f3bde27fe250d4..c463324b42cc9c75790a7291bcfdee8da4b94441 100644
--- a/apps/meteor/client/views/admin/integrations/incoming/IncomingWebhookForm.tsx
+++ b/apps/meteor/client/views/admin/integrations/incoming/IncomingWebhookForm.tsx
@@ -167,7 +167,7 @@ const IncomingWebhookForm = ({ webhookData }: { webhookData?: Serialized<IIncomi
<Controller
name='channel'
control={control}
- rules={{ required: t('The_field_is_required', t('Post_to_Channel')) }}
+ rules={{ required: t('Required_field', { field: t('Post_to_Channel') }) }}
render={({ field }) => (
<TextInput
id={channelField}
@@ -201,7 +201,7 @@ const IncomingWebhookForm = ({ webhookData }: { webhookData?: Serialized<IIncomi
<Controller
name='username'
control={control}
- rules={{ required: t('The_field_is_required', t('Post_to_Channel')) }}
+ rules={{ required: t('Required_field', { field: t('Post_to_Channel') }) }}
render={({ field }) => (
<TextInput
id={usernameField}
diff --git a/apps/meteor/client/views/admin/integrations/outgoing/OutgoingWebhookForm.tsx b/apps/meteor/client/views/admin/integrations/outgoing/OutgoingWebhookForm.tsx
index 65c53386e6a106e636f7d1e149443b40a02037e8..d6cebbc0c6511760f10e6b39c991ba8cf80857c7 100644
--- a/apps/meteor/client/views/admin/integrations/outgoing/OutgoingWebhookForm.tsx
+++ b/apps/meteor/client/views/admin/integrations/outgoing/OutgoingWebhookForm.tsx
@@ -248,7 +248,7 @@ const OutgoingWebhookForm = () => {
<Controller
name='urls'
control={control}
- rules={{ required: t('The_field_is_required', t('URLs')) }}
+ rules={{ required: t('Required_field', { field: t('URLs') }) }}
render={({ field }) => (
<TextAreaInput
id={urlsField}
@@ -286,7 +286,7 @@ const OutgoingWebhookForm = () => {
<Controller
name='username'
control={control}
- rules={{ required: t('The_field_is_required', t('Post_as')) }}
+ rules={{ required: t('Required_field', { field: t('Post_as') }) }}
render={({ field }) => (
<TextInput
id={usernameField}
@@ -373,7 +373,7 @@ const OutgoingWebhookForm = () => {
<Controller
name='token'
control={control}
- rules={{ required: t('The_field_is_required', t('Token')) }}
+ rules={{ required: t('Required_field', { field: t('Token') }) }}
render={({ field }) => (
<TextInput
id={tokenField}
diff --git a/apps/meteor/client/views/admin/mailer/MailerPage.tsx b/apps/meteor/client/views/admin/mailer/MailerPage.tsx
index 9f0c8e7627adc8ad0b25b0c97814aa3bd3f449b6..19e6424ea9e9afe5570f8cb48fd81a5a2d296115 100644
--- a/apps/meteor/client/views/admin/mailer/MailerPage.tsx
+++ b/apps/meteor/client/views/admin/mailer/MailerPage.tsx
@@ -84,7 +84,8 @@ const MailerPage = () => {
id={fromEmailId}
placeholder={t('Type_your_email')}
{...register('fromEmail', {
- validate: (fromEmail) => (!validateEmail(fromEmail) ? t('Invalid_email') : true),
+ required: t('Required_field', { field: t('From') }),
+ validate: (fromEmail) => (validateEmail(fromEmail) ? undefined : t('error-invalid-email-address')),
})}
error={errors.fromEmail?.message}
aria-required='true'
@@ -138,7 +139,7 @@ const MailerPage = () => {
<FieldRow>
<TextInput
id={subjectId}
- {...register('subject', { required: t('error-the-field-is-required', { field: t('Subject') }) })}
+ {...register('subject', { required: t('Required_field', { field: t('Subject') }) })}
aria-describedby={`${subjectId}-error`}
error={errors.subject?.message}
aria-required='true'
@@ -159,7 +160,7 @@ const MailerPage = () => {
<TextAreaInput
id={emailBodyId}
{...register('emailBody', {
- required: t('error-the-field-is-required', { field: t('Email_body') }),
+ required: t('Required_field', { field: t('Email_body') }),
validate: (emailBody) => (emailBody?.indexOf('[unsubscribe]') === -1 ? t('error-missing-unsubscribe-link') : true),
})}
rows={10}
diff --git a/apps/meteor/client/views/admin/oauthApps/EditOauthApp.tsx b/apps/meteor/client/views/admin/oauthApps/EditOauthApp.tsx
index 79d2fbe11140392dababc5ab6ab1ec4815f7be6f..2d9cb51e848fc930a6b5902f8ac4d674f38de418 100644
--- a/apps/meteor/client/views/admin/oauthApps/EditOauthApp.tsx
+++ b/apps/meteor/client/views/admin/oauthApps/EditOauthApp.tsx
@@ -48,6 +48,7 @@ const EditOauthApp = ({ onChange, data, ...props }: EditOauthAppProps): ReactEle
active: data.active,
redirectUri: Array.isArray(data.redirectUri) ? data.redirectUri.join('\n') : data.redirectUri,
},
+ mode: 'all',
});
const setModal = useSetModal();
@@ -118,7 +119,7 @@ const EditOauthApp = ({ onChange, data, ...props }: EditOauthAppProps): ReactEle
<TextInput {...register('name', { required: true })} />
</FieldRow>
<FieldHint>{t('Give_the_application_a_name_This_will_be_seen_by_your_users')}</FieldHint>
- {errors?.name && <FieldError>{t('error-the-field-is-required', { field: t('Name') })}</FieldError>}
+ {errors?.name && <FieldError>{t('Required_field', { field: t('Name') })}</FieldError>}
</Field>
<Field>
<FieldLabel>{t('Redirect_URI')}</FieldLabel>
@@ -126,7 +127,7 @@ const EditOauthApp = ({ onChange, data, ...props }: EditOauthAppProps): ReactEle
<TextAreaInput rows={5} {...register('redirectUri', { required: true })} />
</FieldRow>
<FieldHint>{t('After_OAuth2_authentication_users_will_be_redirected_to_this_URL')}</FieldHint>
- {errors?.redirectUri && <FieldError>{t('error-the-field-is-required', { field: t('Redirect_URI') })}</FieldError>}
+ {errors?.redirectUri && <FieldError>{t('Required_field', { field: t('Redirect_URI') })}</FieldError>}
</Field>
<Field>
<FieldLabel>{t('Client_ID')}</FieldLabel>
diff --git a/apps/meteor/client/views/admin/oauthApps/OAuthAddApp.tsx b/apps/meteor/client/views/admin/oauthApps/OAuthAddApp.tsx
index 9a66e46e6b3984c98ee9e312bd0126fdee945078..0982a99ccd9223d1b6eedc12e32b03592a30d34e 100644
--- a/apps/meteor/client/views/admin/oauthApps/OAuthAddApp.tsx
+++ b/apps/meteor/client/views/admin/oauthApps/OAuthAddApp.tsx
@@ -69,10 +69,10 @@ const OAuthAddApp = (): ReactElement => {
<Field>
<FieldLabel>{t('Application_Name')}</FieldLabel>
<FieldRow>
- <TextInput {...register('name', { required: true })} />
+ <TextInput {...register('name', { required: t('Required_field', { field: t('Name') }) })} />
</FieldRow>
<FieldHint>{t('Give_the_application_a_name_This_will_be_seen_by_your_users')}</FieldHint>
- {errors?.name && <FieldError>{t('error-the-field-is-required', { field: t('Name') })}</FieldError>}
+ {errors?.name && <FieldError>{errors.name.message}</FieldError>}
</Field>
<Field>
<FieldLabel>{t('Redirect_URI')}</FieldLabel>
@@ -80,7 +80,7 @@ const OAuthAddApp = (): ReactElement => {
<TextAreaInput rows={5} {...register('redirectUri', { required: true })} />
</FieldRow>
<FieldHint>{t('After_OAuth2_authentication_users_will_be_redirected_to_this_URL')}</FieldHint>
- {errors?.redirectUri && <FieldError>{t('error-the-field-is-required', { field: t('Redirect_URI') })}</FieldError>}
+ {errors?.redirectUri && <FieldError>{t('Required_field', { field: t('Redirect_URI') })}</FieldError>}
</Field>
<Field>
<FieldRow>
diff --git a/apps/meteor/client/views/admin/permissions/RoleForm.tsx b/apps/meteor/client/views/admin/permissions/RoleForm.tsx
index 59ef726dcb2cd406817166139306b48b7e602703..bba5dfe95e3890f4b78816b026fdfc40e42e7a08 100644
--- a/apps/meteor/client/views/admin/permissions/RoleForm.tsx
+++ b/apps/meteor/client/views/admin/permissions/RoleForm.tsx
@@ -33,9 +33,13 @@ const RoleForm = ({ className, editing = false, isProtected = false, isDisabled
<Field className={className}>
<FieldLabel>{t('Role')}</FieldLabel>
<FieldRow>
- <TextInput disabled={editing || isDisabled} placeholder={t('Role')} {...register('name', { required: true })} />
+ <TextInput
+ disabled={editing || isDisabled}
+ placeholder={t('Role')}
+ {...register('name', { required: t('Required_field', { field: t('Role') }) })}
+ />
</FieldRow>
- {errors?.name && <FieldError>{t('error-the-field-is-required', { field: t('Role') })}</FieldError>}
+ {errors?.name && <FieldError>{errors.name.message}</FieldError>}
</Field>
<Field className={className}>
<FieldLabel>{t('Description')}</FieldLabel>
diff --git a/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRolePage.tsx b/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRolePage.tsx
index 4bfb2afc81d3585e133713181d23ec7f8e59a01b..3e3c6988e6cf4fc13fcbada028653a030d345bd2 100644
--- a/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRolePage.tsx
+++ b/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRolePage.tsx
@@ -70,7 +70,7 @@ const UsersInRolePage = ({ role }: { role: IRole }): ReactElement => {
<Controller
control={control}
name='rid'
- rules={{ required: t('error-the-field-is-required', { field: t('Room') }) }}
+ rules={{ required: t('Required_field', { field: t('Room') }) }}
render={({ field: { onChange, value } }) => (
<RoomAutoComplete
id={roomFieldId}
@@ -98,7 +98,7 @@ const UsersInRolePage = ({ role }: { role: IRole }): ReactElement => {
<Controller
control={control}
name='users'
- rules={{ required: t('error-the-field-is-required', { field: t('Users') }) }}
+ rules={{ required: t('Required_field', { field: t('Users') }) }}
render={({ field: { onChange, value } }) => (
<UserAutoCompleteMultiple
id={usersFieldId}
diff --git a/apps/meteor/client/views/admin/rooms/EditRoom.tsx b/apps/meteor/client/views/admin/rooms/EditRoom.tsx
index 1a993979eec8d64a94f1067e0ff1f818330ffc97..fa40f74cfadbf393d3b4ba809e32d22b02e2e8c9 100644
--- a/apps/meteor/client/views/admin/rooms/EditRoom.tsx
+++ b/apps/meteor/client/views/admin/rooms/EditRoom.tsx
@@ -156,7 +156,7 @@ const EditRoom = ({ room, onChange, onDelete }: EditRoomProps) => {
<FieldRow>
<Controller
name='roomName'
- rules={{ required: t('The_field_is_required', t('Name')) }}
+ rules={{ required: t('Required_field', { field: t('Name') }) }}
control={control}
render={({ field }) => (
<TextInput
diff --git a/apps/meteor/client/views/admin/settings/groups/OAuthGroupPage/CreateOAuthModal.tsx b/apps/meteor/client/views/admin/settings/groups/OAuthGroupPage/CreateOAuthModal.tsx
index 146ace1aac82699974619716d7260681a9800a7f..98357b149383eab94a9007c1c56f4ebb07f5b5fe 100644
--- a/apps/meteor/client/views/admin/settings/groups/OAuthGroupPage/CreateOAuthModal.tsx
+++ b/apps/meteor/client/views/admin/settings/groups/OAuthGroupPage/CreateOAuthModal.tsx
@@ -18,7 +18,7 @@ const CreateOAuthModal = ({ onConfirm, onClose }: CreateOAuthModalProps): ReactE
const handleConfirm = (e: SyntheticEvent): void => {
e.preventDefault();
if (!text.length) {
- setError(t('Name_cant_be_empty'));
+ setError(t('Required_field', { field: t('Name') }));
return;
}
onConfirm(text);
diff --git a/apps/meteor/client/views/admin/users/AdminUserForm.tsx b/apps/meteor/client/views/admin/users/AdminUserForm.tsx
index a55cc29eb648b73b219773c6528d8017285a0e38..a0ee877af551cd77cb582b575514d6ddf68269a5 100644
--- a/apps/meteor/client/views/admin/users/AdminUserForm.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUserForm.tsx
@@ -221,8 +221,8 @@ const AdminUserForm = ({ userData, onReload, context, refetchUserFormData, roleD
control={control}
name='email'
rules={{
- required: t('Email_is_required'),
- validate: (email) => (validateEmail(email) ? undefined : t('ensure_email_address_valid')),
+ required: t('Required_field', { field: t('Email') }),
+ validate: (email) => (validateEmail(email) ? undefined : t('error-invalid-email-address')),
}}
render={({ field }) => (
<TextInput
@@ -286,7 +286,7 @@ const AdminUserForm = ({ userData, onReload, context, refetchUserFormData, roleD
<Controller
control={control}
name='name'
- rules={{ required: t('The_field_is_required', t('Name')) }}
+ rules={{ required: t('Required_field', { field: t('Name') }) }}
render={({ field }) => (
<TextInput
{...field}
@@ -311,7 +311,7 @@ const AdminUserForm = ({ userData, onReload, context, refetchUserFormData, roleD
<Controller
control={control}
name='username'
- rules={{ required: t('The_field_is_required', t('Username')) }}
+ rules={{ required: t('Required_field', { field: t('Username') }) }}
render={({ field }) => (
<TextInput
{...field}
@@ -366,7 +366,7 @@ const AdminUserForm = ({ userData, onReload, context, refetchUserFormData, roleD
<Controller
control={control}
name='roles'
- rules={{ required: t('The_field_is_required', t('Roles')) }}
+ rules={{ required: t('Required_field', { field: t('Roles') }) }}
render={({ field: { onChange, value } }) => (
<MultiSelectFiltered
id={rolesId}
diff --git a/apps/meteor/client/views/admin/users/AdminUserSetRandomPasswordContent.tsx b/apps/meteor/client/views/admin/users/AdminUserSetRandomPasswordContent.tsx
index 25d7a52a6ad49d5ba765fb4fc2e7334a1b306ef9..034d7d2efb0f893fb279c4e263d25dbc44bb7bb9 100644
--- a/apps/meteor/client/views/admin/users/AdminUserSetRandomPasswordContent.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUserSetRandomPasswordContent.tsx
@@ -57,7 +57,7 @@ const AdminUserSetRandomPasswordContent = ({
name='password'
rules={{
validate: () => (password?.length && !passwordIsValid ? t('Password_must_meet_the_complexity_requirements') : true),
- required: isNewUserPage && t('The_field_is_required', t('Password')),
+ required: isNewUserPage && t('Required_field', { field: t('Password') }),
}}
render={({ field }) => (
<PasswordInput
@@ -83,7 +83,7 @@ const AdminUserSetRandomPasswordContent = ({
control={control}
name='passwordConfirmation'
rules={{
- required: isNewUserPage && t('The_field_is_required', t('Confirm_password')),
+ required: isNewUserPage && t('Required_field', { field: t('Confirm_password') }),
deps: ['password'],
validate: (confirmationPassword) => (password !== confirmationPassword ? t('Invalid_confirm_pass') : true),
}}
diff --git a/apps/meteor/client/views/audit/components/AuditForm.tsx b/apps/meteor/client/views/audit/components/AuditForm.tsx
index f616ebed5174271b5a1c43c9c06c74171f09d19a..dffaf959f3cd85bb4fcecd0c5010313e7561398c 100644
--- a/apps/meteor/client/views/audit/components/AuditForm.tsx
+++ b/apps/meteor/client/views/audit/components/AuditForm.tsx
@@ -50,7 +50,7 @@ const AuditForm = ({ type, onSubmit, setSelectedRoom }: AuditFormProps) => {
<FieldLabel>{t('Date')}</FieldLabel>
<FieldRow>
<DateRangePicker value={dateRangeField.value} onChange={dateRangeField.onChange} display='flex' flexGrow={1} />
- {dateRangeFieldState.error?.type === 'required' && <FieldError>{t('The_field_is_required', t('Date'))}</FieldError>}
+ {dateRangeFieldState.error?.type === 'required' && <FieldError>{t('Required_field', { field: t('Date') })}</FieldError>}
{dateRangeFieldState.error?.type === 'validate' && <FieldError>{dateRangeFieldState.error.message}</FieldError>}
</FieldRow>
</Field>
diff --git a/apps/meteor/client/views/audit/components/tabs/DirectTab.tsx b/apps/meteor/client/views/audit/components/tabs/DirectTab.tsx
index 540f97ebaea862907498471e356b75391781f1cf..ce2b7e044d3a30232c455311538fbf126cfee345 100644
--- a/apps/meteor/client/views/audit/components/tabs/DirectTab.tsx
+++ b/apps/meteor/client/views/audit/components/tabs/DirectTab.tsx
@@ -39,7 +39,7 @@ const DirectTab = ({ form: { control } }: DirectTabProps): ReactElement => {
placeholder={t('Username_Placeholder')}
/>
</FieldRow>
- {usersFieldState.error?.type === 'required' && <FieldError>{t('The_field_is_required', t('Users'))}</FieldError>}
+ {usersFieldState.error?.type === 'required' && <FieldError>{t('Required_field', { field: t('Users') })}</FieldError>}
{usersFieldState.error?.type === 'validate' && <FieldError>{usersFieldState.error.message}</FieldError>}
</Field>
);
diff --git a/apps/meteor/client/views/audit/components/tabs/OmnichannelTab.tsx b/apps/meteor/client/views/audit/components/tabs/OmnichannelTab.tsx
index 8fbeb800ec24baef0cb815268fb572e4057a3cee..c756b372488c2c3fd6f69aa3dd222b20cda10341 100644
--- a/apps/meteor/client/views/audit/components/tabs/OmnichannelTab.tsx
+++ b/apps/meteor/client/views/audit/components/tabs/OmnichannelTab.tsx
@@ -39,7 +39,7 @@ const OmnichannelTab = ({ form: { control } }: OmnichannelTabProps): ReactElemen
placeholder={t('Username_Placeholder')}
/>
</FieldRow>
- {visitorFieldState.error?.type === 'required' && <FieldError>{t('The_field_is_required', t('Visitor'))}</FieldError>}
+ {visitorFieldState.error?.type === 'required' && <FieldError>{t('Required_field', { field: t('Visitor') })}</FieldError>}
{visitorFieldState.error?.type === 'validate' && <FieldError>{visitorFieldState.error.message}</FieldError>}
</Field>
<Field flexShrink={1} marginInlineStart={8}>
@@ -48,7 +48,7 @@ const OmnichannelTab = ({ form: { control } }: OmnichannelTabProps): ReactElemen
<AutoCompleteAgent
error={(() => {
if (agentFieldState.error?.type === 'required') {
- return t('The_field_is_required', t('Agent'));
+ return t('Required_field', { field: t('Agent') });
}
return agentFieldState.error?.message;
@@ -58,7 +58,7 @@ const OmnichannelTab = ({ form: { control } }: OmnichannelTabProps): ReactElemen
placeholder={t('Username_Placeholder')}
/>
</FieldRow>
- {agentFieldState.error?.type === 'required' && <FieldError>{t('The_field_is_required', t('Agent'))}</FieldError>}
+ {agentFieldState.error?.type === 'required' && <FieldError>{t('Required_field', { field: t('Agent') })}</FieldError>}
{agentFieldState.error?.type === 'validate' && <FieldError>{agentFieldState.error.message}</FieldError>}
</Field>
</>
diff --git a/apps/meteor/client/views/audit/components/tabs/RoomsTab.tsx b/apps/meteor/client/views/audit/components/tabs/RoomsTab.tsx
index bc5de9ae780bfb9643ae0af15f24cd0a3826d321..d58cc3ccb70d002fca58092e2352ae848e0ef18d 100644
--- a/apps/meteor/client/views/audit/components/tabs/RoomsTab.tsx
+++ b/apps/meteor/client/views/audit/components/tabs/RoomsTab.tsx
@@ -34,7 +34,7 @@ const RoomsTab = ({ form: { control }, setSelectedRoom }: RoomsTabProps) => {
}
/>
</FieldRow>
- {ridFieldState.error?.type === 'required' && <FieldError>{t('The_field_is_required', t('Channel_name'))}</FieldError>}
+ {ridFieldState.error?.type === 'required' && <FieldError>{t('Required_field', { field: t('Channel_name') })}</FieldError>}
{ridFieldState.error?.type === 'validate' && <FieldError>{ridFieldState.error.message}</FieldError>}
</Field>
);
diff --git a/apps/meteor/client/views/audit/components/tabs/UsersTab.tsx b/apps/meteor/client/views/audit/components/tabs/UsersTab.tsx
index 48ff06b1c6994c94db33fe9d86d62876b8b8401d..652f7a739a66b86434299d3075cbd61042658c09 100644
--- a/apps/meteor/client/views/audit/components/tabs/UsersTab.tsx
+++ b/apps/meteor/client/views/audit/components/tabs/UsersTab.tsx
@@ -22,7 +22,7 @@ const UsersTab = ({ form: { control } }: UsersTabProps): ReactElement => {
required: true,
validate: (value) => {
if (value.length < 1) {
- return t('The_field_is_required', t('Users'));
+ return t('Required_field', { field: t('Users') });
}
},
},
@@ -39,7 +39,7 @@ const UsersTab = ({ form: { control } }: UsersTabProps): ReactElement => {
placeholder={t('Username_Placeholder')}
/>
</FieldRow>
- {usersFieldState.error?.type === 'required' && <FieldError>{t('The_field_is_required', t('Users'))}</FieldError>}
+ {usersFieldState.error?.type === 'required' && <FieldError>{t('Required_field', { field: t('Users') })}</FieldError>}
{usersFieldState.error?.type === 'validate' && <FieldError>{usersFieldState.error.message}</FieldError>}
</Field>
);
diff --git a/apps/meteor/client/views/omnichannel/customFields/EditCustomFields.tsx b/apps/meteor/client/views/omnichannel/customFields/EditCustomFields.tsx
index 2e01ffc802cd3407d30e160b4b5d4272cc3836d2..7d48b657aae8c899a434199ca2267bf1a5ddd8bc 100644
--- a/apps/meteor/client/views/omnichannel/customFields/EditCustomFields.tsx
+++ b/apps/meteor/client/views/omnichannel/customFields/EditCustomFields.tsx
@@ -112,7 +112,7 @@ const EditCustomFields = ({ customFieldData }: { customFieldData?: Serialized<IL
name='field'
control={control}
rules={{
- required: t('The_field_is_required', t('Field')),
+ required: t('Required_field', { field: t('Field') }),
validate: (value) => (!/^[0-9a-zA-Z-_]+$/.test(value) ? t('error-invalid-custom-field-name') : undefined),
}}
render={({ field }) => (
@@ -141,7 +141,7 @@ const EditCustomFields = ({ customFieldData }: { customFieldData?: Serialized<IL
<Controller
name='label'
control={control}
- rules={{ required: t('The_field_is_required', t('Label')) }}
+ rules={{ required: t('Required_field', { field: t('Label') }) }}
render={({ field }) => (
<TextInput
id={labelField}
diff --git a/apps/meteor/client/views/omnichannel/departments/EditDepartment.tsx b/apps/meteor/client/views/omnichannel/departments/EditDepartment.tsx
index c1aed1dbe7aed2f6b672903f1af23e29a41b5746..52bb159b2e0417f2b43dbac2ba7e33830e7a3c41 100644
--- a/apps/meteor/client/views/omnichannel/departments/EditDepartment.tsx
+++ b/apps/meteor/client/views/omnichannel/departments/EditDepartment.tsx
@@ -258,7 +258,7 @@ function EditDepartment({ data, id, title, allowedToForwardData }: EditDepartmen
flexGrow={1}
error={errors.name?.message as string}
placeholder={t('Name')}
- {...register('name', { required: t('The_field_is_required', 'name') })}
+ {...register('name', { required: t('Required_field', { field: t('Name') }) })}
/>
</FieldRow>
{errors.name && (
@@ -296,7 +296,7 @@ function EditDepartment({ data, id, title, allowedToForwardData }: EditDepartmen
addon={<Icon name='mail' size='x20' />}
placeholder={t('Email')}
{...register('email', {
- required: t('The_field_is_required', 'email'),
+ required: t('Required_field', { field: t('Email') }),
validate: (email) => validateEmail(email) || t('error-invalid-email-address'),
})}
aria-describedby={`${emailField}-error`}
@@ -442,7 +442,7 @@ function EditDepartment({ data, id, title, allowedToForwardData }: EditDepartmen
<Controller
control={control}
name='chatClosingTags'
- rules={{ required: t('The_field_is_required', 'tags') }}
+ rules={{ required: t('Required_field', 'tags') }}
render={({ field: { value, onChange } }) => (
<DepartmentTags
id={chatClosingTagsField}
diff --git a/apps/meteor/client/views/omnichannel/directory/contacts/contextualBar/ContactNewEdit.tsx b/apps/meteor/client/views/omnichannel/directory/contacts/contextualBar/ContactNewEdit.tsx
index 4d025f1f25b5ae87d1c67138651d789c5532ed7c..f4d2e8119c39f3b57c7e87ced402b3cd285aa615 100644
--- a/apps/meteor/client/views/omnichannel/directory/contacts/contextualBar/ContactNewEdit.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/contacts/contextualBar/ContactNewEdit.tsx
@@ -122,7 +122,7 @@ const ContactNewEdit = ({ id, data, close }: ContactNewEditProps): ReactElement
return !contact || contact._id === id;
};
- const validateName = (v: string): string | boolean => (!v.trim() ? t('The_field_is_required', t('Name')) : true);
+ const validateName = (v: string): string | boolean => (!v.trim() ? t('Required_field', { field: t('Name') }) : true);
const handleContactManagerChange = async (userId: string): Promise<void> => {
setUserId(userId);
diff --git a/apps/meteor/client/views/omnichannel/triggers/EditTrigger.tsx b/apps/meteor/client/views/omnichannel/triggers/EditTrigger.tsx
index 60124362e97b8b1da0d0233c9bb806f4c3ba5615..6545d859a9f88f7b00a200cc5b8b1f0d855b5984 100644
--- a/apps/meteor/client/views/omnichannel/triggers/EditTrigger.tsx
+++ b/apps/meteor/client/views/omnichannel/triggers/EditTrigger.tsx
@@ -169,7 +169,7 @@ const EditTrigger = ({ triggerData }: { triggerData?: Serialized<ILivechatTrigge
<Controller
name='name'
control={control}
- rules={{ required: t('The_field_is_required', t('Name')) }}
+ rules={{ required: t('Required_field', { field: t('Name') }) }}
render={({ field }) => (
<TextInput
{...field}
diff --git a/apps/meteor/client/views/omnichannel/triggers/actions/ActionExternalServiceUrl.tsx b/apps/meteor/client/views/omnichannel/triggers/actions/ActionExternalServiceUrl.tsx
index 16c98520bc3806f74ce8934687c87a273784fc4e..6b8f11b9203e7acbb745fe9cd97a8bd5cb4945de 100644
--- a/apps/meteor/client/views/omnichannel/triggers/actions/ActionExternalServiceUrl.tsx
+++ b/apps/meteor/client/views/omnichannel/triggers/actions/ActionExternalServiceUrl.tsx
@@ -69,7 +69,7 @@ export const ActionExternalServiceUrl = ({ control, trigger, index, disabled, ..
control={control}
defaultValue=''
rules={{
- required: t('The_field_is_required', t('External_service_url')),
+ required: t('Required_field', { field: t('External_service_url') }),
validate: testExternalService,
deps: serviceTimeoutFieldName,
}}
diff --git a/apps/meteor/client/views/omnichannel/triggers/actions/ExternalServiceActionForm.tsx b/apps/meteor/client/views/omnichannel/triggers/actions/ExternalServiceActionForm.tsx
index c684a2b2744b5afd109c21f9e746f8dddd7d2938..c53cd1e076ab6d95ab59ab4d078c770d3e8d5c76 100644
--- a/apps/meteor/client/views/omnichannel/triggers/actions/ExternalServiceActionForm.tsx
+++ b/apps/meteor/client/views/omnichannel/triggers/actions/ExternalServiceActionForm.tsx
@@ -46,7 +46,7 @@ export const ExternalServiceActionForm = ({ control, trigger, index, ...props }:
name={timeoutFieldName}
defaultValue={10000}
rules={{
- required: t('The_field_is_required', t('Timeout_in_miliseconds')),
+ required: t('Required_field', { field: t('Timeout_in_miliseconds') }),
min: { value: 0, message: t('Timeout_in_miliseconds_cant_be_negative_number') },
}}
render={({ field }) => {
diff --git a/apps/meteor/client/views/omnichannel/triggers/actions/SendMessageActionForm.tsx b/apps/meteor/client/views/omnichannel/triggers/actions/SendMessageActionForm.tsx
index e267f873135dd0fc85fc48ea7161530ff74077ca..c48083054e40d37456a4271232f03f0506045063 100644
--- a/apps/meteor/client/views/omnichannel/triggers/actions/SendMessageActionForm.tsx
+++ b/apps/meteor/client/views/omnichannel/triggers/actions/SendMessageActionForm.tsx
@@ -34,7 +34,7 @@ export const SendMessageActionForm = ({ control, index, ...props }: SendMessageA
control={control}
name={name}
defaultValue=''
- rules={{ required: t('The_field_is_required', t('Message')) }}
+ rules={{ required: t('Required_field', { field: t('Message') }) }}
render={({ field }) => (
<TextAreaInput
error={messageError?.message}
diff --git a/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfo.tsx b/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfo.tsx
index b49ddb845cdda16d5583e09731af7e4541d80adc..b2aac49927a171d42ec14bcb794dfc46e26734d6 100644
--- a/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfo.tsx
+++ b/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfo.tsx
@@ -256,7 +256,7 @@ const EditRoomInfo = ({ room, onClickClose, onClickBack }: EditRoomInfoProps) =>
name='roomName'
control={control}
rules={{
- required: t('error-the-field-is-required', { field: t('Name') }),
+ required: t('Required_field', { field: t('Name') }),
validate: (value) => validateName(value),
}}
render={({ field }) => (
diff --git a/apps/meteor/client/views/room/contextualBar/UserInfo/ReportUserModal.tsx b/apps/meteor/client/views/room/contextualBar/UserInfo/ReportUserModal.tsx
index d62ebb96befabfe5fdb5665f86b9d31d68c4f1a0..5f94f7c407b0b8e39c6f5c445433a6a51613bb5a 100644
--- a/apps/meteor/client/views/room/contextualBar/UserInfo/ReportUserModal.tsx
+++ b/apps/meteor/client/views/room/contextualBar/UserInfo/ReportUserModal.tsx
@@ -1,4 +1,5 @@
import { Box, FieldGroup, Field, FieldLabel, FieldRow, FieldError, TextAreaInput } from '@rocket.chat/fuselage';
+import { useUniqueId } from '@rocket.chat/fuselage-hooks';
import { UserAvatar } from '@rocket.chat/ui-avatar';
import type { ComponentProps } from 'react';
import React from 'react';
@@ -8,14 +9,14 @@ import { useTranslation } from 'react-i18next';
import GenericModal from '../../../../components/GenericModal/GenericModal';
type ReportUserModalProps = {
- onConfirm: (description: string) => void;
+ onConfirm: (reasonForReport: string) => void;
onClose: () => void;
displayName: string;
username: string;
};
type ReportUserModalsFields = {
- description: string;
+ reasonForReport: string;
};
const ReportUserModal = ({ username, displayName, onConfirm, onClose }: ReportUserModalProps) => {
@@ -25,16 +26,18 @@ const ReportUserModal = ({ username, displayName, onConfirm, onClose }: ReportUs
formState: { errors },
} = useForm<ReportUserModalsFields>({
defaultValues: {
- description: '',
+ reasonForReport: '',
},
});
const { t } = useTranslation();
+ const reasonForReportId = useUniqueId();
+
return (
<GenericModal
wrapperFunction={(props: ComponentProps<typeof Box>) => (
- <Box is='form' onSubmit={handleSubmit(({ description }) => onConfirm(description))} {...props} />
+ <Box is='form' onSubmit={handleSubmit(({ reasonForReport }) => onConfirm(reasonForReport))} {...props} />
)}
variant='danger'
title={t('Report_User')}
@@ -44,7 +47,7 @@ const ReportUserModal = ({ username, displayName, onConfirm, onClose }: ReportUs
>
<FieldGroup>
<Field>
- <FieldLabel>
+ <FieldLabel htmlFor={reasonForReportId}>
<Box mbe='x12' display='flex' alignItems='center'>
<UserAvatar username={username} />
<Box mis='x12' fontScale='p1' fontWeight='700'>
@@ -56,12 +59,13 @@ const ReportUserModal = ({ username, displayName, onConfirm, onClose }: ReportUs
<TextAreaInput
rows={3}
placeholder={t('Why_do_you_want_to_report_question_mark')}
- {...register('description', { required: t('Please_fill_out_reason_for_report') })}
+ {...register('reasonForReport', { required: t('Required_field', { field: t('Reason_for_report') }) })}
width='full'
mbe='x4'
+ aria-label={t('Reason_for_report')}
/>
</FieldRow>
- {errors.description && <FieldError>{errors.description.message}</FieldError>}
+ {errors.reasonForReport && <FieldError>{errors.reasonForReport.message}</FieldError>}
</Field>
</FieldGroup>
</GenericModal>
diff --git a/apps/meteor/client/views/room/modals/FileUploadModal/FileUploadModal.tsx b/apps/meteor/client/views/room/modals/FileUploadModal/FileUploadModal.tsx
index 312776397b32c9dace5f1346c2ec00794e163025..23135d9b961e8ef0e9ec4578761d3645cb19863c 100644
--- a/apps/meteor/client/views/room/modals/FileUploadModal/FileUploadModal.tsx
+++ b/apps/meteor/client/views/room/modals/FileUploadModal/FileUploadModal.tsx
@@ -47,7 +47,7 @@ const FileUploadModal = ({
if (!name) {
return dispatchToastMessage({
type: 'error',
- message: t('error-the-field-is-required', { field: t('Name') }),
+ message: t('Required_field', { field: t('Upload_file_name') }),
});
}
@@ -99,7 +99,7 @@ const FileUploadModal = ({
<FieldRow>
<TextInput value={name} onChange={handleName} />
</FieldRow>
- {!name && <FieldError>{t('error-the-field-is-required', { field: t('Name') })}</FieldError>}
+ {!name && <FieldError>{t('Required_field', { field: t('Upload_file_name') })}</FieldError>}
</Field>
{showDescription && (
<Field>
@@ -116,7 +116,7 @@ const FileUploadModal = ({
<Button secondary onClick={onClose}>
{t('Cancel')}
</Button>
- <Button primary type='submit' disabled={!name}>
+ <Button primary type='submit'>
{t('Send')}
</Button>
</Modal.FooterControllers>
diff --git a/apps/meteor/client/views/room/webdav/AddWebdavAccountModal.tsx b/apps/meteor/client/views/room/webdav/AddWebdavAccountModal.tsx
index 7e003f79a208ce74bd77e1836be46eb60abb95a7..63ebaecc5eb690bab23b91de640b57ed68ce351a 100644
--- a/apps/meteor/client/views/room/webdav/AddWebdavAccountModal.tsx
+++ b/apps/meteor/client/views/room/webdav/AddWebdavAccountModal.tsx
@@ -55,23 +55,32 @@ const AddWebdavAccountModal = ({ onClose, onConfirm }: AddWebdavAccountModalProp
<Field>
<FieldLabel>{t('Webdav_Server_URL')}</FieldLabel>
<FieldRow>
- <TextInput placeholder={t('Webdav_Server_URL')} {...register('serverURL', { required: true })} />
+ <TextInput
+ placeholder={t('Webdav_Server_URL')}
+ {...register('serverURL', { required: t('Required_field', { field: t('Webdav_Server_URL') }) })}
+ />
</FieldRow>
- {errors.serverURL && <FieldError>{t('error-the-field-is-required', { field: t('Webdav_Server_URL') })}</FieldError>}
+ {errors.serverURL && <FieldError>{errors.serverURL.message}</FieldError>}
</Field>
<Field>
<FieldLabel>{t('Username')}</FieldLabel>
<FieldRow>
- <TextInput placeholder={t('Username')} {...register('username', { required: true })} />
+ <TextInput
+ placeholder={t('Username')}
+ {...register('username', { required: t('Required_field', { field: t('Username') }) })}
+ />
</FieldRow>
- {errors.username && <FieldError>{t('error-the-field-is-required', { field: t('Username') })}</FieldError>}
+ {errors.username && <FieldError>{errors.username.message}</FieldError>}
</Field>
<Field>
<FieldLabel>{t('Password')}</FieldLabel>
<FieldRow>
- <PasswordInput placeholder={t('Password')} {...register('password', { required: true })} />
+ <PasswordInput
+ placeholder={t('Password')}
+ {...register('password', { required: t('Required_field', { field: t('Password') }) })}
+ />
</FieldRow>
- {errors.password && <FieldError>{t('error-the-field-is-required', { field: t('Password') })}</FieldError>}
+ {errors.password && <FieldError>{errors.password.message}</FieldError>}
</Field>
</FieldGroup>
</Modal.Content>
diff --git a/apps/meteor/client/views/room/webdav/SaveToWebdavModal.tsx b/apps/meteor/client/views/room/webdav/SaveToWebdavModal.tsx
index c51763bee733245117b0473af0f8a259732a8b70..e64a4e33c1bbdf7fada38374bcf795d9c9cbe075 100644
--- a/apps/meteor/client/views/room/webdav/SaveToWebdavModal.tsx
+++ b/apps/meteor/client/views/room/webdav/SaveToWebdavModal.tsx
@@ -30,7 +30,7 @@ const SaveToWebdavModal = ({ onClose, data }: SaveToWebdavModalProps): ReactElem
control,
handleSubmit,
formState: { errors },
- } = useForm<{ accountId: string }>();
+ } = useForm<{ accountId: string }>({ mode: 'all' });
const enabled = useSetting<boolean>('Webdav_Integration_Enabled', false);
@@ -98,13 +98,13 @@ const SaveToWebdavModal = ({ onClose, data }: SaveToWebdavModalProps): ReactElem
<Controller
name='accountId'
control={control}
- rules={{ required: true }}
+ rules={{ required: t('Required_field', { field: t('Select_a_webdav_server') }) }}
render={({ field }): ReactElement => (
<Select {...field} options={accountsOptions} id={accountIdField} placeholder={t('Select_an_option')} />
)}
/>
</FieldRow>
- {errors.accountId && <FieldError>{t('Field_required')}</FieldError>}
+ {errors.accountId && <FieldError>{errors.accountId.message}</FieldError>}
</Field>
</FieldGroup>
)}
diff --git a/apps/meteor/client/views/root/MainLayout/RegisterUsername.tsx b/apps/meteor/client/views/root/MainLayout/RegisterUsername.tsx
index bfbbce5d37e16f08a69a5698bc2c4362968f6518..fd1691bcb16d433f535df772e3f8268dc38c5d63 100644
--- a/apps/meteor/client/views/root/MainLayout/RegisterUsername.tsx
+++ b/apps/meteor/client/views/root/MainLayout/RegisterUsername.tsx
@@ -105,7 +105,10 @@ const RegisterUsername = () => {
<Field>
<FieldLabel id='username-label'>{t('Username')}</FieldLabel>
<FieldRow>
- <TextInput aria-labelledby='username-label' {...register('username', { required: t('Username_cant_be_empty') })} />
+ <TextInput
+ aria-labelledby='username-label'
+ {...register('username', { required: t('Required_field', { field: t('Username') }) })}
+ />
</FieldRow>
{errors.username && (
<FieldError>
diff --git a/apps/meteor/tests/e2e/omnichannel/omnichannel-contact-center.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-contact-center.spec.ts
index d0e7b7133423e21141258fcc384a332f352c6f4f..d3c667e20f823f5b61a9aa4e2c909af0042bf4ee 100644
--- a/apps/meteor/tests/e2e/omnichannel/omnichannel-contact-center.spec.ts
+++ b/apps/meteor/tests/e2e/omnichannel/omnichannel-contact-center.spec.ts
@@ -42,7 +42,7 @@ const URL = {
};
const ERROR = {
- nameRequired: 'The field Name is required.',
+ nameRequired: 'Name required',
invalidEmail: 'Invalid email address',
existingEmail: 'Email already exists',
existingPhone: 'Phone already exists',
diff --git a/apps/meteor/tests/e2e/omnichannel/omnichannel-departaments.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-departaments.spec.ts
index 872eafdfb2a2a1ecc09a110da0bc893a660ff67d..023d11de47570dfdfa4047156ab32e23a07236eb 100644
--- a/apps/meteor/tests/e2e/omnichannel/omnichannel-departaments.spec.ts
+++ b/apps/meteor/tests/e2e/omnichannel/omnichannel-departaments.spec.ts
@@ -8,8 +8,8 @@ import { createDepartment, deleteDepartment } from '../utils/omnichannel/departm
import { test, expect } from '../utils/test';
const ERROR = {
- requiredName: 'The field name is required.',
- requiredEmail: 'The field email is required.',
+ requiredName: 'Name required',
+ requiredEmail: 'Email required',
invalidEmail: 'Invalid email address',
};
diff --git a/apps/meteor/tests/e2e/omnichannel/omnichannel-priorities.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-priorities.spec.ts
index 1da1837572e592233b02c2d3cf6a70524945f639..9ee1d8d99fd9fa6a579dc77dc731f398eaff92ba 100644
--- a/apps/meteor/tests/e2e/omnichannel/omnichannel-priorities.spec.ts
+++ b/apps/meteor/tests/e2e/omnichannel/omnichannel-priorities.spec.ts
@@ -8,7 +8,7 @@ import { test, expect } from '../utils/test';
const PRIORITY_NAME = faker.person.firstName();
const ERROR = {
- fieldNameRequired: 'The field Name is required.',
+ fieldNameRequired: 'Name required',
};
test.skip(!IS_EE, 'Omnichannel Priorities > Enterprise Only');
diff --git a/apps/meteor/tests/e2e/omnichannel/omnichannel-sla-policies.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-sla-policies.spec.ts
index 35a371c61ba6761835b6cd68e4a3a8e593ad8ad4..d5b5544e9ace3b8ab117963874cd24a29bb24837 100644
--- a/apps/meteor/tests/e2e/omnichannel/omnichannel-sla-policies.spec.ts
+++ b/apps/meteor/tests/e2e/omnichannel/omnichannel-sla-policies.spec.ts
@@ -6,8 +6,8 @@ import { OmnichannelSlaPolicies } from '../page-objects/omnichannel-sla-policies
import { test, expect } from '../utils/test';
const ERROR = {
- nameRequired: 'The field Name is required.',
- estimatedWaitTimeRequired: 'The field Estimated wait time (time in minutes) is required.',
+ nameRequired: 'Name required',
+ estimatedWaitTimeRequired: 'Estimated wait time (time in minutes) required',
};
const INITIAL_SLA = {
diff --git a/packages/i18n/src/locales/af.i18n.json b/packages/i18n/src/locales/af.i18n.json
index 40ab367489b6830bf9679dc37d4bdf701e4e4809..661360c109b2dd240f625a4ccc385e244b11af98 100644
--- a/packages/i18n/src/locales/af.i18n.json
+++ b/packages/i18n/src/locales/af.i18n.json
@@ -2367,7 +2367,6 @@
"The_application_name_is_required": "Die aansoek naam is nodig",
"The_channel_name_is_required": "Die kanaal naam is nodig",
"The_emails_are_being_sent": "Die e-posse word gestuur.",
- "The_field_is_required": "Die veld%s is nodig.",
"The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Die grootte van die prentjie sal nie werk nie omdat ons ImageMagick of GraphicsMagick nie op u bediener geïnstalleer het nie.",
"The_redirectUri_is_required": "Die redirectUri is nodig",
"The_server_will_restart_in_s_seconds": "Die bediener sal herbegin in%s sekondes",
diff --git a/packages/i18n/src/locales/ar.i18n.json b/packages/i18n/src/locales/ar.i18n.json
index d3a86879f71632896ab0a5aa0fabc36116a40ab4..6d3d406e6c81e3d72d0e8cd205c42224c70bfb85 100644
--- a/packages/i18n/src/locales/ar.i18n.json
+++ b/packages/i18n/src/locales/ar.i18n.json
@@ -4126,8 +4126,7 @@
"The_application_name_is_required": "اسم التطبيق مطلوب",
"The_channel_name_is_required": "اسم القناة مطلوب",
"The_emails_are_being_sent": "يتم إرسال رسائل البريد الإلكتروني.",
- "The_empty_room__roomName__will_be_removed_automatically": "ستتم إزالة الغرÙØ© الÙارغة <span style=\"font-weight: bold;\">{{roomName}}</span> will be تلقائيًا.",
- "The_field_is_required": "الØقل %s مطلوب.",
+ "The_empty_room__roomName__will_be_removed_automatically": "ستتم إزالة الغرÙØ© الÙارغة <span style=\"font-weight: bold;\">{{roomName}}</span> will be تلقائيًا.",
"The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "لن يعمل تغيير Øجم الصورة لأننا لا نستطيع اكتشا٠تثبيت ImageMagick أو GraphicsMagick على الخادم الخاص بك.",
"The_message_is_a_discussion_you_will_not_be_able_to_recover": "الرسالة عبارة عن مناقشة أنك لن تتمكن من استعادة الرسائل!",
"The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "تم تعطيل إشعارات الهات٠المØمول لجميع المستخدمين، انتقل إلى \"المسؤول > منبثق\" لتمكين البوابة المنبثقة مرة أخرى",
diff --git a/packages/i18n/src/locales/az.i18n.json b/packages/i18n/src/locales/az.i18n.json
index 118be4b37920a95925b81ade73e3fcd6fa8932f5..7b1c3f48fa1c98a44c840c7a53df18aca228a506 100644
--- a/packages/i18n/src/locales/az.i18n.json
+++ b/packages/i18n/src/locales/az.i18n.json
@@ -2366,8 +2366,7 @@
"Thank_you_for_your_feedback": "ÆlaqÉ™ üçün təşəkkür edirik",
"The_application_name_is_required": "ÆrizÉ™ adı tÉ™lÉ™b olunur",
"The_channel_name_is_required": "Kanal adı tələb olunur",
- "The_emails_are_being_sent": "E-poçt göndərilir.",
- "The_field_is_required": "%s sahə tələb olunur.",
+ "The_emails_are_being_sent": "E-poçt göndərilir.",
"The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "ImageMagick və ya GraphicsMagick-i serverinizdə yükləməyəcəyimiz üçün şəkil ölçüsünün işləməyəcəyi.",
"The_redirectUri_is_required": "RedirectUri tələb olunur",
"The_server_will_restart_in_s_seconds": "Server%s saniyə ərzində yenidən başlayacaq",
diff --git a/packages/i18n/src/locales/be-BY.i18n.json b/packages/i18n/src/locales/be-BY.i18n.json
index 8586884687555b7b924a81c694cf1b3ae04d87ad..daea286edfed4dd6a4f44019f636f83485703264 100644
--- a/packages/i18n/src/locales/be-BY.i18n.json
+++ b/packages/i18n/src/locales/be-BY.i18n.json
@@ -2384,8 +2384,7 @@
"Thank_you_for_your_feedback": "ДзÑкуй за ваш водгук",
"The_application_name_is_required": "Ð†Ð¼Ñ Ð¿Ñ€Ñ‹ÐºÐ»Ð°Ð´Ð°Ð½Ð½Ñ Ð¿Ð°Ñ‚Ñ€Ð°Ð±ÑƒÐµÑ†Ñ†Ð°",
"The_channel_name_is_required": "Ðазва канала патрабуецца",
- "The_emails_are_being_sent": "ЛіÑÑ‚Ñ‹ былі адпраўленыÑ.",
- "The_field_is_required": "Поле %s патрабуецца.",
+ "The_emails_are_being_sent": "ЛіÑÑ‚Ñ‹ былі адпраўленыÑ.",
"The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "ЗмÑніць памер малюнка не будзе працаваць, таму што мы не можам выÑвіць ImageMagick або GraphicsMagick уÑталÑваны на вашым Ñерверы.",
"The_redirectUri_is_required": "RedirectUri патрабуецца",
"The_server_will_restart_in_s_seconds": "Сервер будзе перазагружаны у %s Ñекунд",
diff --git a/packages/i18n/src/locales/bg.i18n.json b/packages/i18n/src/locales/bg.i18n.json
index ac7c8ddcd0002b68c1904eb805c9fc054a39a13d..f7bc5ad2cf8ff32b4baf5d7141358bb69b4cb351 100644
--- a/packages/i18n/src/locales/bg.i18n.json
+++ b/packages/i18n/src/locales/bg.i18n.json
@@ -2363,8 +2363,7 @@
"Thank_you_for_your_feedback": "Благодарим Ви за обратната връзка",
"The_application_name_is_required": "Името на приложението е задължително",
"The_channel_name_is_required": "Името на канала е задължително",
- "The_emails_are_being_sent": "Изпращат Ñе имейлите.",
- "The_field_is_required": "Полето %s е задължително.",
+ "The_emails_are_being_sent": "Изпращат Ñе имейлите.",
"The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Размерът на изображението нÑма да работи, защото не можем да открием ImageMagick или GraphicsMagick, инÑталирани на Ð²Ð°ÑˆÐ¸Ñ Ñървър.",
"The_redirectUri_is_required": "Ðеобходимо е пренаÑочването",
"The_server_will_restart_in_s_seconds": "Сървъра ще бъде реÑтартиран Ñлед %s Ñекунди",
diff --git a/packages/i18n/src/locales/bs.i18n.json b/packages/i18n/src/locales/bs.i18n.json
index ebe0b045c418ad18577e1914b9340140d804eda9..85e70bbb0abcf029a60ca63d2d2213385110eca9 100644
--- a/packages/i18n/src/locales/bs.i18n.json
+++ b/packages/i18n/src/locales/bs.i18n.json
@@ -2360,8 +2360,7 @@
"Thank_you_for_your_feedback": "Hvala vam na povratnim informacijama",
"The_application_name_is_required": "Naziv aplikacije je potreban",
"The_channel_name_is_required": "Ime sobe je potrebno",
- "The_emails_are_being_sent": "E-mailovi su poslani.",
- "The_field_is_required": "Polje %s je traženo.",
+ "The_emails_are_being_sent": "E-mailovi su poslani.",
"The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Promjena veliÄine slike neće raditi, jer ne možemo provjeriti da je ImageMagick ili GraphicsMagick instaliran na vaÅ¡em poslužitelju.",
"The_redirectUri_is_required": "RedirectUri je potrebno",
"The_server_will_restart_in_s_seconds": "Poslužitelj će se ponovno pokrenuti u %s sekundi",
diff --git a/packages/i18n/src/locales/ca.i18n.json b/packages/i18n/src/locales/ca.i18n.json
index 3f74fc967416a5d8b3ff006b84387de7e4e8da3c..f4d304e08633d2a7963a1cd0af1d26b24ce40727 100644
--- a/packages/i18n/src/locales/ca.i18n.json
+++ b/packages/i18n/src/locales/ca.i18n.json
@@ -4044,8 +4044,7 @@
"The_application_name_is_required": "El nom de laplicació és obligatori.",
"The_channel_name_is_required": "Es requereix el nom del canal",
"The_emails_are_being_sent": "Els missatges de correu-e s'estan enviant.",
- "The_empty_room__roomName__will_be_removed_automatically": "La sala buida <span style=\"font-weight: bold;\">{{roomName}}</span> s'eliminarà automà ticament.",
- "The_field_is_required": "El camp %s és obligatori.",
+ "The_empty_room__roomName__will_be_removed_automatically": "La sala buida <span style=\"font-weight: bold;\">{{roomName}}</span> s'eliminarà automà ticament.",
"The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "L'ajust de mida de les imatges no funcionarà perquè no podem detectar ni ImageMagick ni GraphicsMagick al servidor.",
"The_message_is_a_discussion_you_will_not_be_able_to_recover": "El missatge és una discussió, no podrà recuperar els missatges!",
"The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "Les notificacions mòbils es deshabilitaron per a tots els usuaris, aneu a \"Admin> Push\" per habilitar Push inici novament",
diff --git a/packages/i18n/src/locales/cs.i18n.json b/packages/i18n/src/locales/cs.i18n.json
index 914d6c35d48545359bfac09582d143377f84b16c..a742249127660d3fd1f0d8f1f447d0ef390d40ce 100644
--- a/packages/i18n/src/locales/cs.i18n.json
+++ b/packages/i18n/src/locales/cs.i18n.json
@@ -3413,8 +3413,7 @@
"The_application_name_is_required": "Název aplikace je vyžadován",
"The_channel_name_is_required": "Název mÃstnosti je vyžadován",
"The_emails_are_being_sent": "Tyto e-maily jsou odesÃlány.",
- "The_empty_room__roomName__will_be_removed_automatically": "Prázdná mÃstnost <span style=\"font-weight: bold;\">{{roomName}}</span> bude automaticky odstranÄ›na.",
- "The_field_is_required": "Pole %s je povinné.",
+ "The_empty_room__roomName__will_be_removed_automatically": "Prázdná mÃstnost <span style=\"font-weight: bold;\">{{roomName}}</span> bude automaticky odstranÄ›na.",
"The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Nelze změnit velikost obrázku, protože na serveru nebyl nalezen ImageMagick ani GraphicsMagick.",
"The_message_is_a_discussion_you_will_not_be_able_to_recover": "Zpráva je diskuse, ze které nebudete moci obnovit zprávy!",
"The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "Mobilnà oznámenà byla deaktivována všem uživatelům, v admin sekci \"Notifikace\" znovu aktivujte Push Gateway",
diff --git a/packages/i18n/src/locales/cy.i18n.json b/packages/i18n/src/locales/cy.i18n.json
index f9c7b4d7ec8704a92bb708e4790c9d8c07d41154..7f63d511201ff65db49777545dd57c85894f90d4 100644
--- a/packages/i18n/src/locales/cy.i18n.json
+++ b/packages/i18n/src/locales/cy.i18n.json
@@ -2361,8 +2361,7 @@
"Thank_you_for_your_feedback": "Diolch i chi am eich adborth",
"The_application_name_is_required": "Mae angen enw'r cais",
"The_channel_name_is_required": "Mae angen enw'r sianel",
- "The_emails_are_being_sent": "Mae'r negeseuon e-bost yn cael eu hanfon.",
- "The_field_is_required": "Mae'r maes %s yn ofynnol.",
+ "The_emails_are_being_sent": "Mae'r negeseuon e-bost yn cael eu hanfon.",
"The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Ni fydd maint y delwedd yn gweithio oherwydd na allwn ganfod ImageMagick neu GraphicsMagick ar eich gweinydd.",
"The_redirectUri_is_required": "Mae angen y redirectUri",
"The_server_will_restart_in_s_seconds": "Bydd y gweinydd yn ailgychwyn yn %s eiliad",
diff --git a/packages/i18n/src/locales/da.i18n.json b/packages/i18n/src/locales/da.i18n.json
index a675ab4843c0a4e920126b9b4d9f3539c15fe20b..2aabbfcd8642197b3d0254ab3d62f1d3a43f30b8 100644
--- a/packages/i18n/src/locales/da.i18n.json
+++ b/packages/i18n/src/locales/da.i18n.json
@@ -3521,8 +3521,7 @@
"The_application_name_is_required": "Ansøgningsnavnet er påkrævet",
"The_channel_name_is_required": "Kanalnavnet er påkrævet",
"The_emails_are_being_sent": "E-mailsne bliver sendt.",
- "The_empty_room__roomName__will_be_removed_automatically": "Det tomme rum <span style=\"font-weight: bold;\">{{roomName}}</span> fjernes automatisk.",
- "The_field_is_required": "Feltet%s er påkrævet.",
+ "The_empty_room__roomName__will_be_removed_automatically": "Det tomme rum <span style=\"font-weight: bold;\">{{roomName}}</span> fjernes automatisk.",
"The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Billedforstørrelsen fungerer ikke, fordi vi ikke kan opdage ImageMagick eller GraphicsMagick installeret på din server.",
"The_message_is_a_discussion_you_will_not_be_able_to_recover": "Meddelelsen er en diskussion og du vil derfor ikke kunne gendanne meddelelserne!",
"The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "Mobilmeddelelser blev deaktiveret for alle brugere. Tilgå \"Admin > Push\" for at aktivere Push Gateway igen",
diff --git a/packages/i18n/src/locales/de-AT.i18n.json b/packages/i18n/src/locales/de-AT.i18n.json
index 0be8030f5738e1686f4561cf69b2c458dac8d30f..bbe960596a282fe056e5611ab56b41fe123951d8 100644
--- a/packages/i18n/src/locales/de-AT.i18n.json
+++ b/packages/i18n/src/locales/de-AT.i18n.json
@@ -2368,8 +2368,7 @@
"Thank_you_for_your_feedback": "Vielen Dank für Ihre Rückmeldung.",
"The_application_name_is_required": "Es muss ein Name für diese Anwendung angegeben werden.",
"The_channel_name_is_required": "Ein Name für den Raum muss angegeben werden.",
- "The_emails_are_being_sent": "Die E-Mails werden gesendet.",
- "The_field_is_required": "Das Feld %s ist erforderlich.",
+ "The_emails_are_being_sent": "Die E-Mails werden gesendet.",
"The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Die automatische Skalierung der Bilder funktioniert nicht, da ImageMagick oder GraphicsMagick nicht auf dem Server installiert sind.",
"The_redirectUri_is_required": "Es muss eine Weiterleitung-URL angegeben werden.",
"The_server_will_restart_in_s_seconds": "Der Server wird in %s Sekunden neu gestartet",
diff --git a/packages/i18n/src/locales/de-IN.i18n.json b/packages/i18n/src/locales/de-IN.i18n.json
index 41da8fb3c809e11538dfedecb271c7cf69709fc9..edccd128e31494215cc000c32edec5ecb7f682e8 100644
--- a/packages/i18n/src/locales/de-IN.i18n.json
+++ b/packages/i18n/src/locales/de-IN.i18n.json
@@ -2661,8 +2661,7 @@
"Thank_you_for_your_feedback": "Vielen Dank für Deine Rückmeldung",
"The_application_name_is_required": "Es muss ein Name für diese Anwendung angegeben werden",
"The_channel_name_is_required": "Ein Name für den Kanal muss angegeben werden",
- "The_emails_are_being_sent": "E-Mails werden gesendet",
- "The_field_is_required": "Das Feld %s ist erforderlich",
+ "The_emails_are_being_sent": "E-Mails werden gesendet",
"The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Die automatische Skalierung der Bilder funktioniert nicht, da ImageMagick oder GraphicsMagick nicht auf dem Server installiert sind.",
"The_message_is_a_discussion_you_will_not_be_able_to_recover": "Diese Nachricht ist eine Diskussion. Wenn Du diese löschst, wirst Du die Nachrichten der Diskussion nicht mehr auffinden können.",
"The_peer__peer__does_not_exist": "Der Peer <em>{{peer}}</ em> ist nicht vorhanden.",
diff --git a/packages/i18n/src/locales/de.i18n.json b/packages/i18n/src/locales/de.i18n.json
index 72963c308e67dc767c284af91ceeb291c40e9d8c..59e3290141869ca6c5766abdcdf6d83b0e955703 100644
--- a/packages/i18n/src/locales/de.i18n.json
+++ b/packages/i18n/src/locales/de.i18n.json
@@ -4635,8 +4635,7 @@
"The_application_name_is_required": "Es muss ein Name für diese Anwendung angegeben werden",
"The_channel_name_is_required": "Ein Name für den Channel muss angegeben werden",
"The_emails_are_being_sent": "E-Mails werden gesendet",
- "The_empty_room__roomName__will_be_removed_automatically": "Der leere Raum <span style=\"font-weight: bold;\">{{roomName}}</span> wird automatisch entfernt.",
- "The_field_is_required": "Das Feld %s ist erforderlich",
+ "The_empty_room__roomName__will_be_removed_automatically": "Der leere Raum <span style=\"font-weight: bold;\">{{roomName}}</span> wird automatisch entfernt.",
"The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Die automatische Skalierung der Bilder funktioniert nicht, da ImageMagick oder GraphicsMagick nicht auf dem Server installiert sind.",
"The_message_is_a_discussion_you_will_not_be_able_to_recover": "Diese Nachricht ist eine Diskussion. Wenn Sie diese löschen, werden Sie die Nachrichten der Diskussion nicht mehr auffinden können.",
"The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "Die mobilen Benachrichtigungen wurden für alle Benutzer deaktiviert, wechseln Sie zu \"Admin > Push\", um das Push-Gateway erneut zu aktivieren",
diff --git a/packages/i18n/src/locales/el.i18n.json b/packages/i18n/src/locales/el.i18n.json
index 731a56695f7a0e3b56238f22dbe6b189438c21ae..3e335c6638d36cc0dfbe60a519a668a73e88ff46 100644
--- a/packages/i18n/src/locales/el.i18n.json
+++ b/packages/i18n/src/locales/el.i18n.json
@@ -2373,8 +2373,7 @@
"Thank_you_for_your_feedback": "ΕυχαÏιστοÏμε για τα σχόλιά σας",
"The_application_name_is_required": "Το όνομα της εφαÏμογής απαιτείται",
"The_channel_name_is_required": "Το όνομα του ÎºÎ±Î½Î±Î»Î¹Î¿Ï Î±Ï€Î±Î¹Ï„ÎµÎ¯Ï„Î±Î¹",
- "The_emails_are_being_sent": "Τα μηνÏματα ηλεκτÏÎ¿Î½Î¹ÎºÎ¿Ï Ï„Î±Ï‡Ï…Î´Ïομείου που αποστÎλλονται.",
- "The_field_is_required": "Το πεδίο %s απαιτείται.",
+ "The_emails_are_being_sent": "Τα μηνÏματα ηλεκτÏÎ¿Î½Î¹ÎºÎ¿Ï Ï„Î±Ï‡Ï…Î´Ïομείου που αποστÎλλονται.",
"The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Το μÎγεθος της εικόνας δεν θα λειτουÏγήσει, επειδή δεν μποÏεί να ανιχνεÏσει ImageMagick ή GraphicsMagick εγκατεστημÎνο στον server σας.",
"The_redirectUri_is_required": "Η redirectUri απαιτείται",
"The_server_will_restart_in_s_seconds": "Ο διακομιστής θα κάνει επανεκκίνηση στο %s δευτεÏόλεπτα",
diff --git a/packages/i18n/src/locales/en.i18n.json b/packages/i18n/src/locales/en.i18n.json
index 849582f934b7edf388ccd48591fa0e67007fa639..796e9d0519ff0561f8f45c36363d95708edf560d 100644
--- a/packages/i18n/src/locales/en.i18n.json
+++ b/packages/i18n/src/locales/en.i18n.json
@@ -1682,7 +1682,7 @@
"Direct_Message": "Direct message",
"Livechat_Facebook_Enabled": "Facebook integration enabled",
"Direct_message_creation_description": "Select one or more people to message",
- "Direct_message_creation_error": "Please select at least one person",
+ "Direct_message_creation_error": "Select at least one person",
"Direct_message_creation_description_hint": "More people cannot be added once created",
"Direct_message_someone": "Direct message someone",
"Direct_message_you_have_joined": "You have joined a new direct message with",
@@ -4239,7 +4239,6 @@
"Please_fill_all_the_information": "Please fill all the information",
"Please_fill_an_email": "Please fill an email",
"Please_fill_name_and_email": "Please fill name and email",
- "Please_fill_out_reason_for_report": "Please fill out the reason for the report",
"Please_select_an_user": "Please select an user",
"Please_select_enabled_yes_or_no": "Please select an option for Enabled",
"Please_select_visibility": "Please select a visibility",
@@ -4390,6 +4389,7 @@
"Real_Time_Monitoring": "Real-time Monitoring",
"RealName_Change_Disabled": "Your Rocket.Chat administrator has disabled the changing of names",
"Reason_for_joining": "Reason for joining",
+ "Reason_for_report": "Reason for report",
"Reason_To_Join": "Reason to Join",
"Receive_alerts": "Receive alerts",
"Receive_Group_Mentions": "Receive @all and @here mentions",
@@ -4583,6 +4583,7 @@
"Robot_Instructions_File_Content": "Robots.txt File Contents",
"Root": "Root",
"Required_action": "Required action",
+ "Required_field": "{{field}} required",
"Default_Referrer_Policy": "Default Referrer Policy",
"Default_Referrer_Policy_Description": "This controls the 'referrer' header that's sent when requesting embedded media from other servers. For more information, refer to [this link from MDN](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Referrer-Policy). Remember, a full page refresh is required for this to take effect",
"No_feature_to_preview": "No feature to preview",
@@ -5279,7 +5280,6 @@
"The_channel_name_is_required": "The channel name is required",
"The_emails_are_being_sent": "The emails are being sent.",
"The_empty_room__roomName__will_be_removed_automatically": "The empty room <span style=\"font-weight: bold;\">{{roomName}}</span> will be removed automatically.",
- "The_field_is_required": "The field %s is required.",
"The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "The image resize will not work because we can not detect ImageMagick or GraphicsMagick installed on your server.",
"The_message_is_a_discussion_you_will_not_be_able_to_recover": "The message is a discussion you will not be able to recover the messages!",
"The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "The mobile notifications were disabled to all users, go to \"Admin > Push\" to enable the Push Gateway again",
diff --git a/packages/i18n/src/locales/eo.i18n.json b/packages/i18n/src/locales/eo.i18n.json
index 1558424c94456a2f98668a825fc723bad325e73c..907767a7f7da1e4ac48a5edad3b6207e7327c764 100644
--- a/packages/i18n/src/locales/eo.i18n.json
+++ b/packages/i18n/src/locales/eo.i18n.json
@@ -2366,8 +2366,7 @@
"Thank_you_for_your_feedback": "Dankon pro viaj sugestoj",
"The_application_name_is_required": "La aplika nomo estas postulita",
"The_channel_name_is_required": "La kanala nomo estas postulita",
- "The_emails_are_being_sent": "La retpoÅtoj estas senditaj.",
- "The_field_is_required": "La kampo%s estas postulita.",
+ "The_emails_are_being_sent": "La retpoÅtoj estas senditaj.",
"The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "La regrandigo de bildoj ne funkcios ĉar ni ne povas detekti ImageMagick aŠGraphicsMagick instalitan sur via servilo.",
"The_redirectUri_is_required": "La redirectUri estas postulita",
"The_server_will_restart_in_s_seconds": "La servilo rekomencos en%s sekundoj",
diff --git a/packages/i18n/src/locales/es.i18n.json b/packages/i18n/src/locales/es.i18n.json
index a276a3c5169057f39d2a74ec5b9c3be6928c2a9a..4a690dd7a4b225f604b09981daa84ff7d4b5d1ca 100644
--- a/packages/i18n/src/locales/es.i18n.json
+++ b/packages/i18n/src/locales/es.i18n.json
@@ -4109,8 +4109,7 @@
"The_application_name_is_required": "El nombre de la aplicación es obligatorio",
"The_channel_name_is_required": "El nombre del canal es obligatorio",
"The_emails_are_being_sent": "Los correos electrónicos se están enviando.",
- "The_empty_room__roomName__will_be_removed_automatically": "La sala vacÃa <span style=\"font-weight: bold;\">{{roomName}}</span> se eliminará automáticamente.",
- "The_field_is_required": "El campo %s es obligatorio.",
+ "The_empty_room__roomName__will_be_removed_automatically": "La sala vacÃa <span style=\"font-weight: bold;\">{{roomName}}</span> se eliminará automáticamente.",
"The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "El ajuste de tamaño de las imágenes no funcionará porque no detectamos ImageMagick o GraphicsMagick instalados en tu servidor.",
"The_message_is_a_discussion_you_will_not_be_able_to_recover": "El mensaje es una discusión, asà que no podrás recuperar los mensajes",
"The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "Las notificaciones móviles se han deshabilitado para todos los usuarios. Ve a \"Administración\" > \"Push\" para habilitar puerta de enlace push nuevamente",
diff --git a/packages/i18n/src/locales/fa.i18n.json b/packages/i18n/src/locales/fa.i18n.json
index c4850a7d30eba94be2450ced92102a99f8983ecb..b14bc31d7733ea10e95b45b9a856dc63be38ba5b 100644
--- a/packages/i18n/src/locales/fa.i18n.json
+++ b/packages/i18n/src/locales/fa.i18n.json
@@ -2702,7 +2702,6 @@
"The_application_name_is_required": "نام نرم اÙزار مورد نیاز است",
"The_channel_name_is_required": "نام کانال نیاز است",
"The_emails_are_being_sent": "ایمیل در Øال ارسال.",
- "The_field_is_required": "زمینه به %s مورد نیاز است.",
"The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "تغییر اندازه تصویر به کار نخواهد کرد زیرا ما نمی توانیم تشخیص ImageMagick را یا GraphicsMagick بر روی سرور خود نصب شده است.",
"The_redirectUri_is_required": "redirectUri مورد نیاز است",
"The_server_will_restart_in_s_seconds": "سرور در %s ثانیه راه اندازی مجدد خواهد",
diff --git a/packages/i18n/src/locales/fi.i18n.json b/packages/i18n/src/locales/fi.i18n.json
index 17b5f65eab31b0103b8c2e0b960c61cb6b729043..26ba8019aeb1a6ba70c05a076d747abd7c09f2da 100644
--- a/packages/i18n/src/locales/fi.i18n.json
+++ b/packages/i18n/src/locales/fi.i18n.json
@@ -4727,8 +4727,7 @@
"The_application_will_be_able_to": "<1>{{appName}}</1> voi:",
"The_channel_name_is_required": "Kanavan nimi on pakollinen",
"The_emails_are_being_sent": "Sähköpostiviestejä lähetetään.",
- "The_empty_room__roomName__will_be_removed_automatically": "Tyhjä huone <span style=\"font-weight: bold;\">{{roomName}}</span> poistetaan automaattisesti.",
- "The_field_is_required": "Kenttä %s on pakollinen.",
+ "The_empty_room__roomName__will_be_removed_automatically": "Tyhjä huone <span style=\"font-weight: bold;\">{{roomName}}</span> poistetaan automaattisesti.",
"The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Kuvien koon muuttaminen ei toimi, koska ImageMagickia tai GraphicsMagickia ei havaittu asennettuna palvelimessa.",
"The_message_is_a_discussion_you_will_not_be_able_to_recover": "Viesti on keskustelu, et voi palauttaa näitä viestejä!",
"The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "Mobiili-ilmoitukset oli poistettu käytöstä kaikilta käyttäjiltä. Ota Push Gateway uudelleen käyttöön kohdassa \"Admin > Push\"",
diff --git a/packages/i18n/src/locales/fr.i18n.json b/packages/i18n/src/locales/fr.i18n.json
index 84d33eaf533092e2d8b21026073dfe3d8c3f31a5..80e4504d208537439f85a562a69ebc9d41519aa8 100644
--- a/packages/i18n/src/locales/fr.i18n.json
+++ b/packages/i18n/src/locales/fr.i18n.json
@@ -4121,8 +4121,7 @@
"The_application_name_is_required": "Le nom de l'application est requis",
"The_channel_name_is_required": "Le nom du canal est obligatoire",
"The_emails_are_being_sent": "Les e-mails sont en cours d'envoi.",
- "The_empty_room__roomName__will_be_removed_automatically": "Le salon vide <span style=\"font-weight: bold;\">{{roomName}}</span> sera supprimé automatiquement.",
- "The_field_is_required": "Le champ %s est requis.",
+ "The_empty_room__roomName__will_be_removed_automatically": "Le salon vide <span style=\"font-weight: bold;\">{{roomName}}</span> sera supprimé automatiquement.",
"The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Le redimensionnement de l'image ne fonctionnera pas car nous n'avons pas trouvé ImageMagick ou GraphicsMagick installé sur votre serveur.",
"The_message_is_a_discussion_you_will_not_be_able_to_recover": "Le message est une discussion, vous ne pourrez pas récupérer les messages.",
"The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "Les notifications mobiles ont été désactivées pour tous les utilisateurs, accédez à \"Admin > Push\" pour réactiver la passerelle Push",
diff --git a/packages/i18n/src/locales/he.i18n.json b/packages/i18n/src/locales/he.i18n.json
index 33a4b920b4b21a149ff5cde98b1a4b6182ff439b..499e2ca41d2dd1eb13cb074a4cca744f3cb55ef7 100644
--- a/packages/i18n/src/locales/he.i18n.json
+++ b/packages/i18n/src/locales/he.i18n.json
@@ -1304,8 +1304,7 @@
"Thank_you_for_your_feedback": "תודה לך על המשוב",
"The_application_name_is_required": "×©× ×”×פליקציה × ×“×¨×©",
"The_channel_name_is_required": "×©× ×”×¢×¨×•×¥ × ×“×¨×©",
- "The_emails_are_being_sent": "×”××™×ž×™×™×œ×™× × ×©×œ×—×™×.",
- "The_field_is_required": "השדה %s ×”×•× ×—×•×‘×”.",
+ "The_emails_are_being_sent": "×”××™×ž×™×™×œ×™× × ×©×œ×—×™×.",
"The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "×©×™× ×•×™ גודל ×”×ª×ž×•× ×” ×œ× ×™×¢×‘×•×“ ×›×™ ×× ×—× ×• ×œ× ×™×›×•×œ×™× ×œ×–×”×•×ª ImageMagick ×ו GraphicsMagick מותקן על השרת שלך.",
"The_redirectUri_is_required": "RedirectUri × ×“×¨×©",
"The_server_will_restart_in_s_seconds": "השרת יפעיל ×ת עצמו מחדש בעוד ",
diff --git a/packages/i18n/src/locales/hi-IN.i18n.json b/packages/i18n/src/locales/hi-IN.i18n.json
index 1049d8495d867fd787b1ba72e48603cb82441807..090e081e83fa2e898b2b0d91528fce98c036b80d 100644
--- a/packages/i18n/src/locales/hi-IN.i18n.json
+++ b/packages/i18n/src/locales/hi-IN.i18n.json
@@ -4010,7 +4010,6 @@
"Please_fill_all_the_information": "कृपया सारी जानकारी à¤à¤°à¥‡à¤‚",
"Please_fill_an_email": "कृपया à¤à¤• ईमेल à¤à¤°à¥‡à¤‚",
"Please_fill_name_and_email": "कृपया नाम और ईमेल à¤à¤°à¥‡à¤‚",
- "Please_fill_out_reason_for_report": "कृपया रिपोरà¥à¤Ÿ का कारण à¤à¤°à¥‡à¤‚",
"Please_select_an_user": "कृपया à¤à¤• उपयोगकरà¥à¤¤à¤¾ चà¥à¤¨à¥‡à¤‚",
"Please_select_enabled_yes_or_no": "कृपया सकà¥à¤·à¤® के लिठà¤à¤• विकलà¥à¤ª चà¥à¤¨à¥‡à¤‚",
"Please_select_visibility": "कृपया à¤à¤• दृशà¥à¤¯à¤¤à¤¾ चà¥à¤¨à¥‡à¤‚",
@@ -4988,8 +4987,7 @@
"The_application_will_be_able_to": "<1>{{appName}}</1> यह करने में सकà¥à¤·à¤® होगा:",
"The_channel_name_is_required": "चैनल का नाम आवशà¥à¤¯à¤• है",
"The_emails_are_being_sent": "ईमेल à¤à¥‡à¤œà¥‡ जा रहे हैं.",
- "The_empty_room__roomName__will_be_removed_automatically": "खाली कमरा <span style=\"font-weight: bold;\">{{roomName}}</span> सà¥à¤µà¤šà¤¾à¤²à¤¿à¤¤ रूप से हटा दिया जाà¤à¤—ा।",
- "The_field_is_required": "फ़ीलà¥à¤¡ %s आवशà¥à¤¯à¤• है.",
+ "The_empty_room__roomName__will_be_removed_automatically": "खाली कमरा <span style=\"font-weight: bold;\">{{roomName}}</span> सà¥à¤µà¤šà¤¾à¤²à¤¿à¤¤ रूप से हटा दिया जाà¤à¤—ा।",
"The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "छवि का आकार बदलना काम नहीं करेगा कà¥à¤¯à¥‹à¤‚कि हम आपके सरà¥à¤µà¤° पर सà¥à¤¥à¤¾à¤ªà¤¿à¤¤ ImageMagick या गà¥à¤°à¤¾à¤«à¤¼à¤¿à¤•à¥à¤¸Magick का पता नहीं लगा सकते हैं।",
"The_message_is_a_discussion_you_will_not_be_able_to_recover": "संदेश à¤à¤• चरà¥à¤šà¤¾ है आप संदेशों को पà¥à¤¨à¤°à¥à¤ªà¥à¤°à¤¾à¤ªà¥à¤¤ नहीं कर पाà¤à¤‚गे!",
"The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "मोबाइल सूचनाà¤à¤‚ सà¤à¥€ उपयोगकरà¥à¤¤à¤¾à¤“ं के लिठअकà¥à¤·à¤® कर दी गई थीं, पà¥à¤¶ गेटवे को फिर से सकà¥à¤·à¤® करने के लिठ\"à¤à¤¡à¤®à¤¿à¤¨ > पà¥à¤¶\" पर जाà¤à¤‚",
diff --git a/packages/i18n/src/locales/hr.i18n.json b/packages/i18n/src/locales/hr.i18n.json
index 84c4295d5201c570696bb8fcace1f58f1f0c7c52..c9547b1042e91d16f789d7e66ad9458ed0909234 100644
--- a/packages/i18n/src/locales/hr.i18n.json
+++ b/packages/i18n/src/locales/hr.i18n.json
@@ -2501,7 +2501,6 @@
"The_application_name_is_required": "Naziv aplikacije je potreban",
"The_channel_name_is_required": "Ime sobe je potrebno",
"The_emails_are_being_sent": "E-mailovi su poslani.",
- "The_field_is_required": "Polje %s je traženo.",
"The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Promjena veliÄine slike neće raditi, jer ne možemo provjeriti da je ImageMagick ili GraphicsMagick instaliran na vaÅ¡em poslužitelju.",
"The_redirectUri_is_required": "RedirectUri je potrebno",
"The_server_will_restart_in_s_seconds": "Poslužitelj će se ponovno pokrenuti u %s sekundi",
diff --git a/packages/i18n/src/locales/hu.i18n.json b/packages/i18n/src/locales/hu.i18n.json
index f7f85536c183c39268d2eb75f33a3ee284088220..a281e3b2c64be3649b5506841739d94500ad1470 100644
--- a/packages/i18n/src/locales/hu.i18n.json
+++ b/packages/i18n/src/locales/hu.i18n.json
@@ -4540,8 +4540,7 @@
"The_application_name_is_required": "Az alkalmazás neve kötelező",
"The_channel_name_is_required": "A csatorna neve kötelező",
"The_emails_are_being_sent": "Az e-mailek elküldésre kerültek.",
- "The_empty_room__roomName__will_be_removed_automatically": "Az üres <span style=\"font-weight: bold;\">{{roomName}}</span> szoba automatikusan el lesz távolÃtva.",
- "The_field_is_required": "A(z) %s mező kötelező.",
+ "The_empty_room__roomName__will_be_removed_automatically": "Az üres <span style=\"font-weight: bold;\">{{roomName}}</span> szoba automatikusan el lesz távolÃtva.",
"The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "A kép átméretezése nem fog működni, mert nem észlelhetÅ‘ a kiszolgálóra telepÃtett ImageMagick vagy GraphicsMagick program.",
"The_message_is_a_discussion_you_will_not_be_able_to_recover": "Az üzenet egy megbeszélés, nem lesz képes helyreállÃtani az üzeneteket!",
"The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "A mobil értesÃtések le lettek tiltva az összes felhasználó számára. Menjen az „Adminisztráció → Leküldés†menüponthoz a leküldéses átjáró újbóli engedélyezéséhez.",
diff --git a/packages/i18n/src/locales/id.i18n.json b/packages/i18n/src/locales/id.i18n.json
index 1abc2fadd68c4689fdf9207c9c3cf58a8551c826..6eb8dd75ec6ef9c9abe8c87c40d1a310dad1926b 100644
--- a/packages/i18n/src/locales/id.i18n.json
+++ b/packages/i18n/src/locales/id.i18n.json
@@ -2374,7 +2374,6 @@
"The_application_name_is_required": "Nama aplikasi diperlukan",
"The_channel_name_is_required": "Nama channel diperlukan",
"The_emails_are_being_sent": "Email telah dikirim.",
- "The_field_is_required": "Kolom %s wajib diisi",
"The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Gambar resize tidak akan bekerja karena kita tidak dapat mendeteksi ImageMagick atau GraphicsMagick diinstal pada server Anda.",
"The_redirectUri_is_required": "The redirectUri diperlukan",
"The_server_will_restart_in_s_seconds": "server akan restart%s detik",
diff --git a/packages/i18n/src/locales/it.i18n.json b/packages/i18n/src/locales/it.i18n.json
index 160dbe3cf40ed7fc146e491c335daa464a8e0bb2..f4bbf05e2faf0640787a3ab8fd649091e80971b0 100644
--- a/packages/i18n/src/locales/it.i18n.json
+++ b/packages/i18n/src/locales/it.i18n.json
@@ -2920,8 +2920,7 @@
"Thank_you_for_your_feedback": "Grazie per il tuo feedback",
"The_application_name_is_required": "Il nome dell'applicazione è richiesta",
"The_channel_name_is_required": "Il nome del canale è richiesto",
- "The_emails_are_being_sent": "Le email verranno inviate.",
- "The_field_is_required": "Il campo %s è richiesto.",
+ "The_emails_are_being_sent": "Le email verranno inviate.",
"The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Il ridimensionamento dell'immagine non funzionerà se non rileva ImageMagick or GraphicsMagick installato sul tuo server.",
"The_redirectUri_is_required": "Il redirectUri é richiesto",
"The_server_will_restart_in_s_seconds": "Il server si riavvierà in %s secondi",
diff --git a/packages/i18n/src/locales/ja.i18n.json b/packages/i18n/src/locales/ja.i18n.json
index 982f9495d914bcdd2e8bb191759da0e41de63bdf..dcdf00bf7ed6497390393f4c454fba3db7a1d667 100644
--- a/packages/i18n/src/locales/ja.i18n.json
+++ b/packages/i18n/src/locales/ja.i18n.json
@@ -4070,8 +4070,7 @@
"The_application_name_is_required": "アプリケーションåã¯å¿…é ˆã§ã™",
"The_channel_name_is_required": "ãƒãƒ£ãƒãƒ«åã¯å¿…é ˆã§ã™",
"The_emails_are_being_sent": "メールをé€ä¿¡ä¸ã§ã™ã€‚",
- "The_empty_room__roomName__will_be_removed_automatically": "空ã®ãƒ«ãƒ¼ãƒ <span style=\"font-weight: bold;\">{{roomName}}</span>ã¯è‡ªå‹•çš„ã«å‰Šé™¤ã•ã‚Œã¾ã™ã€‚",
- "The_field_is_required": "%s é …ç›®ã¯ã€å¿…é ˆã§ã™ã€‚",
+ "The_empty_room__roomName__will_be_removed_automatically": "空ã®ãƒ«ãƒ¼ãƒ <span style=\"font-weight: bold;\">{{roomName}}</span>ã¯è‡ªå‹•çš„ã«å‰Šé™¤ã•ã‚Œã¾ã™ã€‚",
"The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "サーãƒãƒ¼ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚ŒãŸImageMagickã¾ãŸã¯GraphicsMagickを検出ã§ããªã„ãŸã‚ã€ç”»åƒã®ã‚µã‚¤ã‚ºå¤‰æ›´ãŒæ©Ÿèƒ½ã—ã¾ã›ã‚“。",
"The_message_is_a_discussion_you_will_not_be_able_to_recover": "ã“ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã¯ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’復元ã§ããªã„ディスカッションã§ã™ï¼",
"The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "ã™ã¹ã¦ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã«å¯¾ã—ã¦ãƒ¢ãƒã‚¤ãƒ«é€šçŸ¥ãŒç„¡åŠ¹ã«ãªã‚Šã¾ã—ãŸã€‚［管ç†ï¼½>［プッシュ］ã«ç§»å‹•ã—ã¦ã€ãƒ—ッシュゲートウェイをå†åº¦æœ‰åŠ¹ã«ã—ã¦ãã ã•ã„",
diff --git a/packages/i18n/src/locales/ka-GE.i18n.json b/packages/i18n/src/locales/ka-GE.i18n.json
index 3c550632cc4c8052f9afa1ccedb6bd731a1f3914..8f2098ff495f56908f13e53c84e136480f90ee69 100644
--- a/packages/i18n/src/locales/ka-GE.i18n.json
+++ b/packages/i18n/src/locales/ka-GE.i18n.json
@@ -3165,7 +3165,6 @@
"The_channel_name_is_required": "სáƒáƒáƒ˜áƒ áƒáƒ áƒáƒ ხის სáƒáƒ®áƒ”ლი",
"The_emails_are_being_sent": "ელ.ფáƒáƒ¡áƒ¢áƒ იგზáƒáƒ•áƒœáƒ”ბáƒ.",
"The_empty_room__roomName__will_be_removed_automatically": "ცáƒáƒ იელი áƒáƒ—áƒáƒ®áƒ˜ <span style=\"font-weight: bold;\">{{roomName}}</span> áƒáƒ•áƒ¢áƒáƒ›áƒáƒ¢áƒ£áƒ áƒáƒ“ მáƒáƒ˜áƒ®áƒ¡áƒœáƒ”ბáƒ.",
- "The_field_is_required": "ველი %s áƒáƒ£áƒªáƒ˜áƒšáƒ”ბელიáƒ.",
"The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "სურáƒáƒ—ის ზáƒáƒ›áƒ˜áƒ¡ შეცვლრáƒáƒ იმუშáƒáƒ•áƒ”ბს, რáƒáƒ“გáƒáƒœ ჩვენ ვერვპáƒáƒ£áƒšáƒáƒ‘თ თქვენს სერვერზე დáƒáƒ§áƒ”ნებულ ImageMagick áƒáƒœ GraphicsMagick-ს.",
"The_message_is_a_discussion_you_will_not_be_able_to_recover": "შეტყáƒáƒ‘ინებრáƒáƒ ის გáƒáƒœáƒ®áƒ˜áƒšáƒ•áƒ დრთქვენ ვერშეძლებთ შეტყáƒáƒ‘ინებების áƒáƒ¦áƒ“გენáƒáƒ¡",
"The_redirectUri_is_required": "გáƒáƒ“áƒáƒ›áƒ˜áƒ¡áƒáƒ›áƒáƒ თების ლინკირსáƒáƒáƒ˜áƒ áƒ",
diff --git a/packages/i18n/src/locales/km.i18n.json b/packages/i18n/src/locales/km.i18n.json
index 997ee66a00e7684796ec740a9491516f1b5ee56d..8927c7f3335bdc92481e94bd392098332cfa2638 100644
--- a/packages/i18n/src/locales/km.i18n.json
+++ b/packages/i18n/src/locales/km.i18n.json
@@ -2691,8 +2691,7 @@
"Thank_you_for_your_feedback": "សូមអរគុណសម្រាប់មážáž·ážšáž”ស់អ្នក",
"The_application_name_is_required": "ឈ្មោះកម្មវិធីនáŸáŸ‡áž‚ឺážáŸ’រូវបានទាមទារ",
"The_channel_name_is_required": "ឈ្មោះឆានែលនáŸáŸ‡áž‚ឺážáŸ’រូវបានទាមទារ",
- "The_emails_are_being_sent": "áž“áŸáŸ‡â€‹áž¢áŸŠáž¸áž˜áŸ‚ល​ážáŸ’រូវ​បាន​បញ្ជូន​។",
- "The_field_is_required": "ចន្លោះ %s ážáŸ’រូវ​បំពáŸáž‰",
+ "The_emails_are_being_sent": "áž“áŸáŸ‡â€‹áž¢áŸŠáž¸áž˜áŸ‚ល​ážáŸ’រូវ​បាន​បញ្ជូន​។",
"The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "ប្ដូរទំហំរូបភាពនឹងមិនធ្វើការដោយសារážáŸ‚យើងមិនអាចរកឃើញ ImageMagick ឬ GraphicsMagick ដែលបានដំឡើងនៅលើម៉ាស៊ីនបម្រើរបស់អ្នក។",
"The_redirectUri_is_required": "redirectUri áž“áŸáŸ‡áž‚ឺážáŸ’រូវបានទាមទារ",
"The_server_will_restart_in_s_seconds": "ម៉ាស៊ីនបម្រើនáŸáŸ‡áž“ឹងចាប់ផ្ដើមឡើងវិញនៅក្នុង %s វិនាទី",
diff --git a/packages/i18n/src/locales/ko.i18n.json b/packages/i18n/src/locales/ko.i18n.json
index ad5818ab9f85d8c3e77d7d16e3c4ee0d549cbc03..5df1f0db78bafba8d2fedc09a75b5f57dc5560d7 100644
--- a/packages/i18n/src/locales/ko.i18n.json
+++ b/packages/i18n/src/locales/ko.i18n.json
@@ -3470,8 +3470,7 @@
"The_application_name_is_required": "ì‘ìš©í”„ë¡œê·¸ëž¨ëª…ì´ í•„ìš”í•©ë‹ˆë‹¤.",
"The_channel_name_is_required": "채ë„ëª…ì´ í•„ìš”í•©ë‹ˆë‹¤.",
"The_emails_are_being_sent": "ì´ë©”ì¼ì„ ì „ì†¡ 중입니다.",
- "The_empty_room__roomName__will_be_removed_automatically": "사용하지 않는 대화방 <span style=\"font-weight: bold;\">{{roomName}}</span>ì€ ìžë™ìœ¼ë¡œ ì œê±°ë©ë‹ˆë‹¤.",
- "The_field_is_required": "%s 필드는 필수 í•ëª©ìž…니다.",
+ "The_empty_room__roomName__will_be_removed_automatically": "사용하지 않는 대화방 <span style=\"font-weight: bold;\">{{roomName}}</span>ì€ ìžë™ìœ¼ë¡œ ì œê±°ë©ë‹ˆë‹¤.",
"The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "ì„œë²„ì— ImageMagick ë˜ëŠ” GraphicMagickì´ ì„¤ì¹˜ë˜ì–´ 있지 ì•Šì•„ ì´ë¯¸ì§€ í¬ê¸°ë¥¼ ìž¬ì¡°ì •í• ìˆ˜ 없습니다.",
"The_message_is_a_discussion_you_will_not_be_able_to_recover": "ê·¸ 메시지는 메시지 복구가 불가능한 í† ë¡ ìž…ë‹ˆë‹¤.",
"The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "ëª¨ë°”ì¼ ì•Œë¦¼ì´ ëª¨ë“ ì‚¬ìš©ìžì—게 사용 중지ë˜ì—ˆìŠµë‹ˆë‹¤. \"관리ìž> 푸시\"ë¡œ ì´ë™í•˜ì—¬ 푸시 게ì´íŠ¸ì›¨ì´ë¥¼ 다시 사용으로 변경하ì‹ì‹œì˜¤.",
diff --git a/packages/i18n/src/locales/ku.i18n.json b/packages/i18n/src/locales/ku.i18n.json
index 9b4a4d1aaeb2b9aec3d61e51899108484578d922..a4c5e7108a2f99200cf4918f8b4a51ac9cf529a5 100644
--- a/packages/i18n/src/locales/ku.i18n.json
+++ b/packages/i18n/src/locales/ku.i18n.json
@@ -2360,8 +2360,7 @@
"Thank_you_for_your_feedback": "Spas ji bo we Deng xwe",
"The_application_name_is_required": "Navê sepanê pêwîst e",
"The_channel_name_is_required": "The name kanala pêwîst e",
- "The_emails_are_being_sent": "Mailan têne şandin.",
- "The_field_is_required": "Li qadê %s tê xwestin.",
+ "The_emails_are_being_sent": "Mailan têne şandin.",
"The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Mezinahiyê image xebata wê ne ji ber ku em nikarin bi durustî .Pêşîn an GraphicsMagick li ser server te sazkirin.",
"The_redirectUri_is_required": "The redirectUri pêwîst e",
"The_server_will_restart_in_s_seconds": "ڕاژەکارەکە هەڵ ئەبێتەوە لە %s چرکەدا",
diff --git a/packages/i18n/src/locales/lo.i18n.json b/packages/i18n/src/locales/lo.i18n.json
index d427b251e8632d245bae733aa5e1b098d46f640c..547e9274a6ff6c62ad17608a6d4b8ec07a97ddba 100644
--- a/packages/i18n/src/locales/lo.i18n.json
+++ b/packages/i18n/src/locales/lo.i18n.json
@@ -2403,8 +2403,7 @@
"Thank_you_for_your_feedback": "ຂà»â€‹àº‚àºàºšâ€‹à»ƒàºˆâ€‹àº—່ານ​ສà»àº²â€‹àº¥àº±àºšâ€‹àºàº²àº™â€‹àº•à»àº²â€‹àº™àº´â€‹àº•àº´â€‹àºŠàº»àº¡â€‹àº‚àºàº‡â€‹àº—່ານ​",
"The_application_name_is_required": "ຊື່ຄà»àº²àº®à»‰àºàº‡àºªàº°àº«àº¡àº±àºà»àº¡à»ˆàº™àºˆà»àº²à»€àº›àº±àº™àº•à»‰àºàº‡",
"The_channel_name_is_required": "ຊື່ຊ່àºàº‡àº—າງàºàº²àº™àºˆà»àº²à»€àº›àº±àº™àº•à»‰àºàº‡",
- "The_emails_are_being_sent": "àºàºµà»€àº¡àº§à»„ດ້ຖືàºàºªàº»à»ˆàº‡à»„ປà»àº¥à»‰àº§.",
- "The_field_is_required": "ພາàºàºªàº°àº«àº™àº²àº¡ %s à»àº¡à»ˆàº™àº•à»‰àºàº‡àºàº²àº™.",
+ "The_emails_are_being_sent": "àºàºµà»€àº¡àº§à»„ດ້ຖືàºàºªàº»à»ˆàº‡à»„ປà»àº¥à»‰àº§.",
"The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "àºàº²àº™ resize ຮູບພາບຈະບà»à»ˆà»€àº®àº±àº”ວຽàºà»€àºžàº²àº°àº§à»ˆàº²àºžàº§àºà»€àº®àº»àº²àºšà»à»ˆàºªàº²àº¡àº²àº”àºàº§àº”ພົບ ImageMagick ຫຼື GraphicsMagick àºàº²àº™àº•àº´àº”ຕັ້ງໃນເຄື່àºàº‡à»àº¡à»ˆàº‚່າàºàº‚àºàº‡àº—່ານ.",
"The_redirectUri_is_required": "The redirectUri ຈà»àº²à»€àº›àº±àº™àº•à»‰àºàº‡àº¡àºµ",
"The_server_will_restart_in_s_seconds": "ເຄື່àºàº‡à»àº¡à»ˆàº‚່າàºàº‚àºàº‡àºˆàº°à»€àº¥àºµà»ˆàº¡àºàº²àº™à»€àº®àº±àº”ວຽàºà»ƒàº™ %s ວິນາທີ",
diff --git a/packages/i18n/src/locales/lt.i18n.json b/packages/i18n/src/locales/lt.i18n.json
index 88fb66dc554fba9d9d30efe7afc25a9292b6a707..7408a8eeb762b0fe716b30e8b241933ad780f763 100644
--- a/packages/i18n/src/locales/lt.i18n.json
+++ b/packages/i18n/src/locales/lt.i18n.json
@@ -2421,8 +2421,7 @@
"Thank_you_for_your_feedback": "Dėkojame už jūsų atsiliepimus",
"The_application_name_is_required": "BÅ«tina nurodyti programos pavadinimÄ…",
"The_channel_name_is_required": "Reikalingas kanalo pavadinimas",
- "The_emails_are_being_sent": "El. LaiÅ¡kai siunÄiami.",
- "The_field_is_required": "Laukas%s reikalingas.",
+ "The_emails_are_being_sent": "El. LaiÅ¡kai siunÄiami.",
"The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Vaizdo dydžio keitimas neveiks, nes negalime nustatyti serverio \"ImageMagick\" ar \"GraphicsMagick\".",
"The_redirectUri_is_required": "Reikia redirectUri",
"The_server_will_restart_in_s_seconds": "Serveris bus paleistas iš naujo po%s sekundžių",
diff --git a/packages/i18n/src/locales/lv.i18n.json b/packages/i18n/src/locales/lv.i18n.json
index 544eac3dbeb337c7692bbceb5e04ebcc40ecb1a2..a9e38267b01c04259e39e06cc97f909b418a85d0 100644
--- a/packages/i18n/src/locales/lv.i18n.json
+++ b/packages/i18n/src/locales/lv.i18n.json
@@ -2375,8 +2375,7 @@
"Thank_you_for_your_feedback": "Paldies par jūsu atsauksmēm",
"The_application_name_is_required": "Pieteikuma nosaukums ir nepieciešams",
"The_channel_name_is_required": "Ir nepiecieÅ¡ams kanÄla nosaukums",
- "The_emails_are_being_sent": "E-pasta ziņojumi tiek nosūtīti.",
- "The_field_is_required": "Nepieciešams %s lauks.",
+ "The_emails_are_being_sent": "E-pasta ziņojumi tiek nosūtīti.",
"The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "AttÄ“la izmÄ“ru maiņa nestrÄdÄs, jo mÄ“s nevaram atrast jÅ«su serverÄ« uzinstalÄ“tu ImageMagick vai GraphicsMagick.",
"The_redirectUri_is_required": "Nepieciešams RedirectUri ",
"The_server_will_restart_in_s_seconds": "Serveris restartēsies pēc %s sekundēm",
diff --git a/packages/i18n/src/locales/mn.i18n.json b/packages/i18n/src/locales/mn.i18n.json
index 60e18063b49f21e912e67e774c7bbf201811c5d2..407c86309db89f7105739bdf38eea43622554ad8 100644
--- a/packages/i18n/src/locales/mn.i18n.json
+++ b/packages/i18n/src/locales/mn.i18n.json
@@ -2361,8 +2361,7 @@
"Thank_you_for_your_feedback": "Таны Ñанал Ñ…Ò¯ÑÑлтÑнд баÑрлалаа",
"The_application_name_is_required": "Програмын нÑÑ€ шаардлагатай",
"The_channel_name_is_required": "Сувгийн нÑÑ€ шаардлагатай",
- "The_emails_are_being_sent": "Ð-мÑйл илгÑÑж байна.",
- "The_field_is_required": "%s талбар шаардлагатай.",
+ "The_emails_are_being_sent": "Ð-мÑйл илгÑÑж байна.",
"The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "ImageMagick ÑÑвÑл GraphicsMagick-г Ñервер дÑÑÑ€ÑÑ Ñуулгаж чаддаггүй болохоор зургийн Ñ…ÑмжÑÑг өөрчлөх боломжгүй.",
"The_redirectUri_is_required": "RedirectUri шаардлагатай",
"The_server_will_restart_in_s_seconds": "Сервер%s Ñекундын дараа дахин ÑхлүүлÑÑ… болно",
diff --git a/packages/i18n/src/locales/ms-MY.i18n.json b/packages/i18n/src/locales/ms-MY.i18n.json
index 524260560a3f8720620542e0b1d14140824957b9..9e203c69baf3ffa6c6a3e5ae2d7c8b755974c888 100644
--- a/packages/i18n/src/locales/ms-MY.i18n.json
+++ b/packages/i18n/src/locales/ms-MY.i18n.json
@@ -2372,8 +2372,7 @@
"Thank_you_for_your_feedback": "Terima kasih atas maklum balas anda",
"The_application_name_is_required": "Nama permohonan diperlukan",
"The_channel_name_is_required": "Nama saluran diperlukan",
- "The_emails_are_being_sent": "E-mel yang sedang dihantar.",
- "The_field_is_required": "Medan ini %s diperlukan",
+ "The_emails_are_being_sent": "E-mel yang sedang dihantar.",
"The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "The saiz semula imej tidak akan berfungsi kerana kita tidak dapat mengesan ImageMagick atau GraphicsMagick dipasang pada pelayan anda.",
"The_redirectUri_is_required": "The redirectUri diperlukan",
"The_server_will_restart_in_s_seconds": "Server akan memulakan semula dalam %s saat",
diff --git a/packages/i18n/src/locales/nl.i18n.json b/packages/i18n/src/locales/nl.i18n.json
index bf7f7ffb780c824fbcde8d2af66282f2d69b4316..9796181ae1bbca22fd152bffc87bb526e8346daf 100644
--- a/packages/i18n/src/locales/nl.i18n.json
+++ b/packages/i18n/src/locales/nl.i18n.json
@@ -4109,8 +4109,7 @@
"The_application_name_is_required": "De naam van de applicatie is vereist",
"The_channel_name_is_required": "De naam van het kanaal is vereist",
"The_emails_are_being_sent": "De e-mails worden verzonden.",
- "The_empty_room__roomName__will_be_removed_automatically": "De lege kamer <span style=\"font-weight: bold;\">{{roomName}}</span> wordt automatisch verwijderd.",
- "The_field_is_required": "Het veld %s is vereist.",
+ "The_empty_room__roomName__will_be_removed_automatically": "De lege kamer <span style=\"font-weight: bold;\">{{roomName}}</span> wordt automatisch verwijderd.",
"The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Het wijzigen van de grootte van de afbeelding zal niet werken omdat we ImageMagick of GraphicsMagick niet kunnen detecteren die op uw server zijn geïnstalleerd.",
"The_message_is_a_discussion_you_will_not_be_able_to_recover": "Het bericht is een discussie, u kunt de berichten niet herstellen!",
"The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "De mobiele meldingen werden voor alle gebruikers uitgeschakeld, ga naar \"Admin > Push\" om de Push Gateway weer in te schakelen",
diff --git a/packages/i18n/src/locales/no.i18n.json b/packages/i18n/src/locales/no.i18n.json
index 5bdbf2fb89cc2fe4d2b134d79e0915d2a88d56a5..a89485a5f6c313ea1160e4b6fd3a33e0c072b1fb 100644
--- a/packages/i18n/src/locales/no.i18n.json
+++ b/packages/i18n/src/locales/no.i18n.json
@@ -3962,8 +3962,7 @@
"The_application_name_is_required": "Programnavnet kreves",
"The_application_will_be_able_to": "<1>{{appName}}</1> vil kunne:",
"The_channel_name_is_required": "Kanalnavnet er påkrevd",
- "The_emails_are_being_sent": "E-postene blir sendt.",
- "The_field_is_required": "Feltet%s er påkrevd.",
+ "The_emails_are_being_sent": "E-postene blir sendt.",
"The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Bildestørrelsen fungerer ikke fordi vi ikke kan oppdage ImageMagick eller GraphicsMagick installert på serveren din.",
"The_message_is_a_discussion_you_will_not_be_able_to_recover": "Meldingen er en diskusjon, du vil ikke kunne gjenopprette meldingene!",
"The_necessary_browser_permissions_for_location_sharing_are_not_granted": "De nødvendige nettlesertillatelsene for posisjonsdeling ble ikke gitt",
diff --git a/packages/i18n/src/locales/pl.i18n.json b/packages/i18n/src/locales/pl.i18n.json
index b7d60c54ee2c274a5c15a0f69c52ee283b6bfa27..e909624ad4a97af3ef5432024d05fa380ca659ed 100644
--- a/packages/i18n/src/locales/pl.i18n.json
+++ b/packages/i18n/src/locales/pl.i18n.json
@@ -4543,8 +4543,7 @@
"The_application_name_is_required": "Wymagana jest nazwa aplikacji",
"The_channel_name_is_required": "Wymagana jest nazwa pokoju",
"The_emails_are_being_sent": "Wiadomości e-mail są wysyłane.",
- "The_empty_room__roomName__will_be_removed_automatically": "Pusty pokój <span style=\"font-weight: bold;\">{{roomName}}</span> zostanie automatycznie usunięty.",
- "The_field_is_required": "Pole %s jest wymagane.",
+ "The_empty_room__roomName__will_be_removed_automatically": "Pusty pokój <span style=\"font-weight: bold;\">{{roomName}}</span> zostanie automatycznie usunięty.",
"The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Zmiana rozmiaru obrazu nie będzie działać, ponieważ nie możemy wykryć zainstalowanego ImageMagick lub GraphicsMagick na serwerze.",
"The_message_is_a_discussion_you_will_not_be_able_to_recover": "Wiadomość jest dyskusją, której nie będziesz w stanie odzyskać!",
"The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "Powiadomienia mobilne zostały wyłączone dla wszystkich użytkowników, idź do \"Admin>Push\" aby uruchomić ponownie bramę push",
diff --git a/packages/i18n/src/locales/pt-BR.i18n.json b/packages/i18n/src/locales/pt-BR.i18n.json
index dc62318cb230db05339a366952b5b848e4ff4efa..b2575a19067180b07018325e3666446c6c919cee 100644
--- a/packages/i18n/src/locales/pt-BR.i18n.json
+++ b/packages/i18n/src/locales/pt-BR.i18n.json
@@ -4223,8 +4223,7 @@
"The_application_name_is_required": "O nome do aplicativo é obrigatório",
"The_channel_name_is_required": "O nome do canal é obrigatório",
"The_emails_are_being_sent": "Os e-mails estão sendo enviados.",
- "The_empty_room__roomName__will_be_removed_automatically": "A sala vazia <span style=\"font-weight: bold;\">{{roomName}}</span> será removida automaticamente.",
- "The_field_is_required": "O campo %s é obrigatório.",
+ "The_empty_room__roomName__will_be_removed_automatically": "A sala vazia <span style=\"font-weight: bold;\">{{roomName}}</span> será removida automaticamente.",
"The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "O redimensionamento da imagem não vai funcionar porque não conseguimos detectar se o ImageMagick ou GraphicsMagick está instalado no seu servidor.",
"The_message_is_a_discussion_you_will_not_be_able_to_recover": "A mensagem é uma discussão, você não poderá recuperar as mensagens!",
"The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "As notificações móveis foram desativadas para todos os usuários, vá para \"Admin > Push\" para ativar o Push Gateway novamente",
diff --git a/packages/i18n/src/locales/pt.i18n.json b/packages/i18n/src/locales/pt.i18n.json
index 8f4acc81dbddcf70c0dc72e1692a2af4c8680843..84d840b92a53ac6119785d3b4f986732bd93d721 100644
--- a/packages/i18n/src/locales/pt.i18n.json
+++ b/packages/i18n/src/locales/pt.i18n.json
@@ -2729,8 +2729,7 @@
"Thank_you_for_your_feedback": "Obrigado pelo sua opinião",
"The_application_name_is_required": "O nome da aplicação é obrigatório",
"The_channel_name_is_required": "O nome do canal é obrigatório",
- "The_emails_are_being_sent": "Os emails estão a ser enviados.",
- "The_field_is_required": "O campo %s é obrigatório.",
+ "The_emails_are_being_sent": "Os emails estão a ser enviados.",
"The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "O redimensionamento da imagem não vai funcionar porque não conseguimos detectar ImageMagick ou GraphicsMagick instalado no seu servidor.",
"The_message_is_a_discussion_you_will_not_be_able_to_recover": "A mensagem é uma discussão, não poderá recuperar as mensagens!",
"The_peer__peer__does_not_exist": "O par <em>{{peer}}</em> não existe.",
diff --git a/packages/i18n/src/locales/ro.i18n.json b/packages/i18n/src/locales/ro.i18n.json
index aefc4d07065fa07328347cf3da1358d8bdc1c43b..7266b1883386e04ede2b8f84a294a1bcb341d65e 100644
--- a/packages/i18n/src/locales/ro.i18n.json
+++ b/packages/i18n/src/locales/ro.i18n.json
@@ -2364,8 +2364,7 @@
"Thank_you_for_your_feedback": "Vă mulțumim pentru feedback",
"The_application_name_is_required": "Este nevoie de numele aplicației",
"The_channel_name_is_required": "Este nevoie de numele canalului",
- "The_emails_are_being_sent": "E-mail-urile sunt trimise.",
- "The_field_is_required": "Este nevoie de câmpul %s.",
+ "The_emails_are_being_sent": "E-mail-urile sunt trimise.",
"The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Redimensionarea imaginii nu va funcționa, deoarece nu putem detecta ImageMagick sau GraphicsMagick instalat pe server.",
"The_redirectUri_is_required": "URI de redirectare este necesar",
"The_server_will_restart_in_s_seconds": "Serverul va reporni în %s secunde",
diff --git a/packages/i18n/src/locales/ru.i18n.json b/packages/i18n/src/locales/ru.i18n.json
index 1829f7f2eb08b0a00399a286192a8bd8848d6fba..6edc8030513fea101bd9da724ea3f18d234c2348 100644
--- a/packages/i18n/src/locales/ru.i18n.json
+++ b/packages/i18n/src/locales/ru.i18n.json
@@ -4294,8 +4294,7 @@
"The_application_name_is_required": "ТребуетÑÑ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ðµ приложениÑ",
"The_channel_name_is_required": "ТребуетÑÑ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ðµ канала",
"The_emails_are_being_sent": "ПиÑьма отправлÑÑŽÑ‚ÑÑ.",
- "The_empty_room__roomName__will_be_removed_automatically": "ПуÑтой чат <span style=\"font-weight: bold;\">{{roomName}}</span> будет удален автоматичеÑки.",
- "The_field_is_required": "Поле %s обÑзательно.",
+ "The_empty_room__roomName__will_be_removed_automatically": "ПуÑтой чат <span style=\"font-weight: bold;\">{{roomName}}</span> будет удален автоматичеÑки.",
"The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Изменить размер Ð¸Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ Ð½Ðµ получитÑÑ, потому что мы не можем обнаружить уÑтановленные на вашем Ñервере ImageMagick или GraphicsMagick.",
"The_message_is_a_discussion_you_will_not_be_able_to_recover": "Сообщение обÑуждениÑ, вы не Ñможете воÑÑтановить ÑообщениÑ!",
"The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "Мобильные ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð±Ñ‹Ð»Ð¸ отключены Ð´Ð»Ñ Ð²Ñех пользователей, перейдите в \"Admin > Push\", чтобы Ñнова включить Push Gateway",
diff --git a/packages/i18n/src/locales/sk-SK.i18n.json b/packages/i18n/src/locales/sk-SK.i18n.json
index f5bc7bfcbc585c379343c678482262e828fc4076..d6cf085ad9722d1504f2c53587cdbaf4658e5c7f 100644
--- a/packages/i18n/src/locales/sk-SK.i18n.json
+++ b/packages/i18n/src/locales/sk-SK.i18n.json
@@ -2375,8 +2375,7 @@
"Thank_you_for_your_feedback": "Ďakujeme vám za vašu spätnú väzbu",
"The_application_name_is_required": "Názov aplikácie je povinný",
"The_channel_name_is_required": "Názov kanála je povinný",
- "The_emails_are_being_sent": "Posielajú sa e-maily.",
- "The_field_is_required": "Je potrebné pole%s.",
+ "The_emails_are_being_sent": "Posielajú sa e-maily.",
"The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Zmena veľkosti obrázka nebude fungovať, pretože na vašom serveri nemôžeme nájsť aplikácie ImageMagick alebo GraphicsMagick.",
"The_redirectUri_is_required": "Vyžaduje sa presmerovanie",
"The_server_will_restart_in_s_seconds": "Server sa reštartuje v%s",
diff --git a/packages/i18n/src/locales/sl-SI.i18n.json b/packages/i18n/src/locales/sl-SI.i18n.json
index 668bb94dc2c56438ec81e5575456b41dcf8d650d..64900b03860dfeebda64f3961e005b8cdc833a5d 100644
--- a/packages/i18n/src/locales/sl-SI.i18n.json
+++ b/packages/i18n/src/locales/sl-SI.i18n.json
@@ -2355,8 +2355,7 @@
"Thank_you_for_your_feedback": "Hvala za vaše mnenje",
"The_application_name_is_required": "Ime aplikacije je obvezno",
"The_channel_name_is_required": "Ime kanala je obvezno",
- "The_emails_are_being_sent": "PoÅ¡iljanje e-poÅ¡tnih sporoÄil.",
- "The_field_is_required": "Polje %s je obvezno.",
+ "The_emails_are_being_sent": "PoÅ¡iljanje e-poÅ¡tnih sporoÄil.",
"The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Velikost slike ne bo delovala, ker ne moremo zaznati ImageMagick ali GraphicsMagick, nameÅ¡Äenega na vaÅ¡em strežniku.",
"The_redirectUri_is_required": "Preusmeritveni uri (redirectUri) je zahtevan",
"The_server_will_restart_in_s_seconds": "Strežnik se bo znova zagnal v %s sekundah",
diff --git a/packages/i18n/src/locales/sq.i18n.json b/packages/i18n/src/locales/sq.i18n.json
index 312494da2e8d54b8d7463bef848b80b5581f573a..c5fb06df952989f592d495bdb139fc1fe84fbca4 100644
--- a/packages/i18n/src/locales/sq.i18n.json
+++ b/packages/i18n/src/locales/sq.i18n.json
@@ -2365,8 +2365,7 @@
"Thank_you_for_your_feedback": "Faleminderit për komentin tuaj",
"The_application_name_is_required": "Emri i aplikimit është e nevojshme",
"The_channel_name_is_required": "Emri kanal është e nevojshme",
- "The_emails_are_being_sent": "Email janë duke u dërguar.",
- "The_field_is_required": "Fusha %s është e nevojshme.",
+ "The_emails_are_being_sent": "Email janë duke u dërguar.",
"The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Imazhi resize nuk do të funksionojë, sepse ne nuk mund të zbulojë ImageMagick ose GraphicsMagick instaluar në serverin tuaj.",
"The_redirectUri_is_required": "RedirectUri është e nevojshme",
"The_server_will_restart_in_s_seconds": "Serveri do të rifillojë në %s sekonda",
diff --git a/packages/i18n/src/locales/sr.i18n.json b/packages/i18n/src/locales/sr.i18n.json
index e26e8bd3862fbf9aed4e355bd9c7315b6105beed..d60ff9ce80fe9ff5c42649f2420deb0735ea538c 100644
--- a/packages/i18n/src/locales/sr.i18n.json
+++ b/packages/i18n/src/locales/sr.i18n.json
@@ -2170,8 +2170,7 @@
"Thank_you_for_your_feedback": "Хвала на повратним информацијама",
"The_application_name_is_required": "Име апликације је потребно",
"The_channel_name_is_required": "Име канала је потребно",
- "The_emails_are_being_sent": "Е-поруке Ñе шаљу.",
- "The_field_is_required": "је обавезно поље %s.",
+ "The_emails_are_being_sent": "Е-поруке Ñе шаљу.",
"The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "РеÑизе Ñлика неће радити, јер не можемо открити ИмагеМагицк или грапхицÑмагицк инÑталиран на вашем Ñерверу.",
"The_redirectUri_is_required": "РедирецтУри је потребна",
"The_server_will_restart_in_s_seconds": "Сервер ће Ñе поново покренути у %s Ñекунди",
diff --git a/packages/i18n/src/locales/sv.i18n.json b/packages/i18n/src/locales/sv.i18n.json
index 4e436fe6c5383e76dcaec6fffa3801fb6fef9832..4f091bb77fa5a9d66b4e03ed82f846f06828fa84 100644
--- a/packages/i18n/src/locales/sv.i18n.json
+++ b/packages/i18n/src/locales/sv.i18n.json
@@ -4735,8 +4735,7 @@
"The_application_will_be_able_to": "<1>{{appName}}</1> kommer att kunna:",
"The_channel_name_is_required": "Kanalnamnet krävs ",
"The_emails_are_being_sent": "E-postmeddelandena skickas.",
- "The_empty_room__roomName__will_be_removed_automatically": "Det tomma rummet <span style=\"font-weight: bold;\">{{roomName}}</span> tas bort automatiskt.",
- "The_field_is_required": "Fältet %s krävs.",
+ "The_empty_room__roomName__will_be_removed_automatically": "Det tomma rummet <span style=\"font-weight: bold;\">{{roomName}}</span> tas bort automatiskt.",
"The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Det kommer inte att gå att ändra storlek på bilden, eftersom vi inte kan hitta ImageMagick eller GraphicsMagick på din server.",
"The_message_is_a_discussion_you_will_not_be_able_to_recover": "Meddelandet är en diskussion. Du kan inte återskapa meddelandena.",
"The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "Mobilaviseringar inaktiverades för alla användare. Gå till \"Administration > Push\" om du vill aktivera en gateway för pushmeddelanden igen",
diff --git a/packages/i18n/src/locales/ta-IN.i18n.json b/packages/i18n/src/locales/ta-IN.i18n.json
index 7a2c562d4fffdff620eee874bdd51d4cbadad901..c4c941c40d7b044707c9989d0f1d7da8da0a90f5 100644
--- a/packages/i18n/src/locales/ta-IN.i18n.json
+++ b/packages/i18n/src/locales/ta-IN.i18n.json
@@ -2366,7 +2366,6 @@
"The_application_name_is_required": "விணà¯à®£à®ªà¯à®ª பெயர௠தேவை",
"The_channel_name_is_required": "சேனல௠பெயர௠தேவைபà¯à®ªà®Ÿà¯à®•à®¿à®±à®¤à¯",
"The_emails_are_being_sent": "மினà¯à®©à®žà¯à®šà®²à¯à®•à®³à¯ˆ அனà¯à®ªà¯à®ªà®¿ வைகà¯à®•à®ªà¯à®ªà®Ÿà¯à®•à®¿à®©à¯à®±à®©à®°à¯.",
- "The_field_is_required": "தà¯à®±à¯ˆà®¯à®¿à®²à¯% கள௠தேவை.",
"The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "நாஙà¯à®•à®³à¯ ImageMagick அலà¯à®²à®¤à¯ GraphicsMagick உஙà¯à®•à®³à¯ சரà¯à®µà®°à®¿à®²à¯ நிறà¯à®µà®ªà¯à®ªà®Ÿà¯à®Ÿ கணà¯à®Ÿà®±à®¿à®¯ à®®à¯à®Ÿà®¿à®¯à®¾à®¤à¯, à®à®©à¯†à®©à®¿à®²à¯ படஅளவை இயஙà¯à®•à®¾à®¤à¯.",
"The_redirectUri_is_required": "redirecturi தேவை",
"The_server_will_restart_in_s_seconds": "சரà¯à®µà®°à¯ %s வினாடிகள௠மீணà¯à®Ÿà¯à®®à¯ தொடஙà¯à®•à¯à®®à¯",
diff --git a/packages/i18n/src/locales/th-TH.i18n.json b/packages/i18n/src/locales/th-TH.i18n.json
index 7d393a3034fb55634dddc4f278c9792133f26c50..520f6ce3a20f2bd498d0b8b5e4b67b58f7be9ca7 100644
--- a/packages/i18n/src/locales/th-TH.i18n.json
+++ b/packages/i18n/src/locales/th-TH.i18n.json
@@ -2359,8 +2359,7 @@
"Thank_you_for_your_feedback": "ขà¸à¸šà¸„ุณสำหรับความคิดเห็นขà¸à¸‡à¸„ุณ",
"The_application_name_is_required": "ต้à¸à¸‡à¸£à¸°à¸šà¸¸à¸Šà¸·à¹ˆà¸à¹à¸à¹‡à¸žà¸žà¸¥à¸´à¹€à¸„ชัน",
"The_channel_name_is_required": "ต้à¸à¸‡à¸£à¸°à¸šà¸¸à¸Šà¸·à¹ˆà¸à¸Šà¹ˆà¸à¸‡",
- "The_emails_are_being_sent": "à¸à¸³à¸¥à¸±à¸‡à¸ªà¹ˆà¸‡à¸à¸µà¹€à¸¡à¸¥",
- "The_field_is_required": "ต้à¸à¸‡à¸£à¸°à¸šà¸¸à¸Ÿà¸´à¸¥à¸”์%s",
+ "The_emails_are_being_sent": "à¸à¸³à¸¥à¸±à¸‡à¸ªà¹ˆà¸‡à¸à¸µà¹€à¸¡à¸¥",
"The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "à¸à¸²à¸£à¸›à¸£à¸±à¸šà¸‚นาดภาพจะไม่ทำงานเนื่à¸à¸‡à¸ˆà¸²à¸à¹€à¸£à¸²à¹„ม่สามารถตรวจพบ ImageMagick หรืภGraphicsMagick ที่ติดตั้งบนเซิร์ฟเวà¸à¸£à¹Œà¸‚à¸à¸‡à¸„ุณ",
"The_redirectUri_is_required": "จำเป็นต้à¸à¸‡à¸¡à¸µ redirectUri",
"The_server_will_restart_in_s_seconds": "เซิร์ฟเวà¸à¸£à¹Œà¸ˆà¸°à¸£à¸µà¸ªà¸•à¸²à¸£à¹Œà¸—เป็น %s วินาที",
diff --git a/packages/i18n/src/locales/tr.i18n.json b/packages/i18n/src/locales/tr.i18n.json
index 59b0c8927e2359556aae6a308f85ffa3b4bb6723..c3e879031912156a257438fbfd1f9866688cd8f2 100644
--- a/packages/i18n/src/locales/tr.i18n.json
+++ b/packages/i18n/src/locales/tr.i18n.json
@@ -2801,8 +2801,7 @@
"Thank_you_for_your_feedback": "Görüşleriniz için teşekkür ederiz",
"The_application_name_is_required": "Uygulama adı gerekli",
"The_channel_name_is_required": "Kanal adı gerekli",
- "The_emails_are_being_sent": "E-postalar gönderiliyor.",
- "The_field_is_required": "%s alanı gerekli.",
+ "The_emails_are_being_sent": "E-postalar gönderiliyor.",
"The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Biz ImageMagick veya GraphicsMagick sunucunuzda yüklü algılayamaz çünkü resim boyutlandırmak çalışmaz.",
"The_message_is_a_discussion_you_will_not_be_able_to_recover": "Bu ileti bir tartışma olduğu için iletileri geri getiremeyeceksiniz!",
"The_peer__peer__does_not_exist": "<em>{{peer}}</em> adında bir eş yok.",
diff --git a/packages/i18n/src/locales/ug.i18n.json b/packages/i18n/src/locales/ug.i18n.json
index 78c3650e0038a48eb0ef5e3732b4cf1acf456df3..b576cd5102cd8d0b9be00cadade449abc69194c1 100644
--- a/packages/i18n/src/locales/ug.i18n.json
+++ b/packages/i18n/src/locales/ug.i18n.json
@@ -1045,8 +1045,7 @@
"Thank_you_for_your_feedback": "Ø³Ù‰Ø²Ù†Ù‰Ú Ø¦Ù‰Ù†ÙƒØ§Ø³Ù‰Úىزگە كۆپتىن ÙƒÛ†Ù¾ رەھمەت",
"The_application_name_is_required": "Ø¦Û•Ù¾Ù†Ù‰Ú Ø¦Ù‰Ø³Ù…Ù‰Ù†Ù‰ چوقۇم تولدۇرىسىز",
"The_channel_name_is_required": "Ù‚Ø§Ù†Ø§Ù„Ù†Ù‰Ú Ø¦Ù‰Ø³Ù…Ù‰Ù†Ù‰ چوقۇم تولدۇرۇÚ",
- "The_emails_are_being_sent": "ئىلخەت يوللاندى",
- "The_field_is_required": "چوقۇم تولدۇرۇÚ%sخەت بۆلىكى",
+ "The_emails_are_being_sent": "ئىلخەت يوللاندى",
"The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "تاپالمىدۇق.GraphicsMagickنى ياكىImageMagick Ø±Û•Ø³Ù‰Ù…Ù†Ù‰Ú Ú†ÙˆÚ ÙƒÙ‰Ú†Ù‰ÙƒÙ„Ù‰ÙƒÙ‰Ù†Ù‰ ئۆزگەرتكىلى بولمىدى، چۈنكى بىز مۇلازىمتÛردا قاچىلىنىپ بولغان",
"The_redirectUri_is_required": "چوقۇم تولدۇرۇÚURIسەكرەپ يۆتكەلگەن",
"The_server_will_restart_in_s_seconds": "سÛكۇنتتىن ÙƒÛيىن قايتىدىن قوزغىتىلىدۇ %s مۇلازىمىتÛر",
diff --git a/packages/i18n/src/locales/uk.i18n.json b/packages/i18n/src/locales/uk.i18n.json
index b8e27a4f8c34068e4d2c7253bed3db42c521236d..eb2b8542d4e3344b08ba4fba3dbe4cff362e018d 100644
--- a/packages/i18n/src/locales/uk.i18n.json
+++ b/packages/i18n/src/locales/uk.i18n.json
@@ -2911,8 +2911,7 @@
"Thank_you_for_your_feedback": "СпаÑибі за ваш відгук",
"The_application_name_is_required": "Ім'Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¸ потрібен",
"The_channel_name_is_required": "Ðазва каналу потрібно",
- "The_emails_are_being_sent": "Електронні лиÑти відправлÑÑŽÑ‚ÑŒÑÑ.",
- "The_field_is_required": "Поле %s потрібно.",
+ "The_emails_are_being_sent": "Електронні лиÑти відправлÑÑŽÑ‚ÑŒÑÑ.",
"The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Зміни розміру Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ Ð½Ðµ буде працювати, тому що ми не можемо виÑвити ImageMagick або GraphicsMagick вÑтановлений на вашому Ñервері.",
"The_message_is_a_discussion_you_will_not_be_able_to_recover": "ÐŸÐ¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ - це Ð¾Ð±Ð³Ð¾Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñке ви не зможете відновити!",
"The_redirectUri_is_required": "RedirectUri потрібно",
diff --git a/packages/i18n/src/locales/vi-VN.i18n.json b/packages/i18n/src/locales/vi-VN.i18n.json
index bf073e9c6aee8a8c034e384c93d1cca221d5216f..e4ff1343a0792bd0eec81fb153727bf41d16fb2b 100644
--- a/packages/i18n/src/locales/vi-VN.i18n.json
+++ b/packages/i18n/src/locales/vi-VN.i18n.json
@@ -2465,8 +2465,7 @@
"Thank_you_for_your_feedback": "Cảm ơn phản hồi của bạn",
"The_application_name_is_required": "Tên ứng dụng là bắt buộc",
"The_channel_name_is_required": "Tên kênh là bắt buộc",
- "The_emails_are_being_sent": "Các email Ä‘ang được gá»i.",
- "The_field_is_required": "TrÆ°á»ng%s là bắt buá»™c.",
+ "The_emails_are_being_sent": "Các email Ä‘ang được gá»i.",
"The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Thay đổi kÃch thÆ°á»›c hình ảnh sẽ không hoạt Ä‘á»™ng vì chúng tôi không thể phát hiện ImageMagick hoặc GraphicsMagick được cà i đặt trên máy chủ của bạn.",
"The_redirectUri_is_required": "RedirectUri là bắt buộc",
"The_server_will_restart_in_s_seconds": "Máy chủ sẽ khởi động lại trong%s giây",
diff --git a/packages/i18n/src/locales/zh-HK.i18n.json b/packages/i18n/src/locales/zh-HK.i18n.json
index e9821173dc0cb3d9cd92947713fe0bae957e5d31..2da4905ae3368cbdbfe40dd59108991b8024da95 100644
--- a/packages/i18n/src/locales/zh-HK.i18n.json
+++ b/packages/i18n/src/locales/zh-HK.i18n.json
@@ -2392,8 +2392,7 @@
"Thank_you_for_your_feedback": "感谢您的å馈æ„è§",
"The_application_name_is_required": "应用程åºå称是必需的",
"The_channel_name_is_required": "频é“å称是必需的",
- "The_emails_are_being_sent": "电å邮件æ£åœ¨å‘é€ã€‚",
- "The_field_is_required": "å—段 %s 必须填写。",
+ "The_emails_are_being_sent": "电å邮件æ£åœ¨å‘é€ã€‚",
"The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "图åƒå¤§å°è°ƒæ•´ä¸èµ·ä½œç”¨ï¼Œå› ä¸ºæˆ‘ä»¬æ— æ³•æ£€æµ‹åˆ°æœåŠ¡å™¨ä¸Šå®‰è£…çš„ImageMagick或GraphicsMagick。",
"The_redirectUri_is_required": "redirectUri是必需的",
"The_server_will_restart_in_s_seconds": "æœåŠ¡å™¨å°†ä»¥ï¼…s秒为å•ä½é‡æ–°å¯åŠ¨",
diff --git a/packages/i18n/src/locales/zh-TW.i18n.json b/packages/i18n/src/locales/zh-TW.i18n.json
index 741132996be6436f744d7945a324f6c37ae02766..7b8dc7495a847323d2f473bb3032a674a5ab2c79 100644
--- a/packages/i18n/src/locales/zh-TW.i18n.json
+++ b/packages/i18n/src/locales/zh-TW.i18n.json
@@ -3896,8 +3896,7 @@
"The_application_name_is_required": "應用程å¼å稱是必需的",
"The_channel_name_is_required": "é »é“å稱是必需的",
"The_emails_are_being_sent": "é›»å郵件傳é€ä¸",
- "The_empty_room__roomName__will_be_removed_automatically": "空房間 <span style=\"font-weight: bold;\">{{roomName}}</span> 將自動刪除。",
- "The_field_is_required": "æ¬„ä½ %s å¿…å¡«",
+ "The_empty_room__roomName__will_be_removed_automatically": "空房間 <span style=\"font-weight: bold;\">{{roomName}}</span> 將自動刪除。",
"The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "圖片大å°èª¿æ•´ä¸æœƒèµ·ä½œç”¨ï¼Œå› 為在我們åµæ¸¬ä¸åˆ°ä¼ºæœå™¨ä¸Šå®‰è£çš„ ImageMagick 或 GraphicsMagick 工具",
"The_message_is_a_discussion_you_will_not_be_able_to_recover": "æ¤è¨Šæ¯æ˜¯åœ¨è«–壇ä¸æ‚¨ä¸å¯ä»¥å¾©åŽŸè¨Šæ¯!",
"The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "所有使用者都åœç”¨äº†æ‰‹æ©Ÿé€šçŸ¥ï¼Œè«‹åˆ°â€œç®¡ç†>推é€â€ä»¥å†æ¬¡å•Ÿç”¨æŽ¨é€é–˜é“",
diff --git a/packages/i18n/src/locales/zh.i18n.json b/packages/i18n/src/locales/zh.i18n.json
index 323da595433244dbc258cedef2ac3a8f34146b23..f3e8c2e0fc9e9e194c61da7020ce1b945f80246c 100644
--- a/packages/i18n/src/locales/zh.i18n.json
+++ b/packages/i18n/src/locales/zh.i18n.json
@@ -3556,8 +3556,7 @@
"The_application_name_is_required": "应用å称必填",
"The_channel_name_is_required": "频é“å称为必填",
"The_emails_are_being_sent": "邮件已å‘é€ã€‚",
- "The_empty_room__roomName__will_be_removed_automatically": "空房间 <span style=\"font-weight: bold;\">{{roomName}}</span> 将被自动移除。",
- "The_field_is_required": "å—段 %s å¿…å¡«",
+ "The_empty_room__roomName__will_be_removed_automatically": "空房间 <span style=\"font-weight: bold;\">{{roomName}}</span> 将被自动移除。",
"The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "æ— æ³•è°ƒæ•´å›¾ç‰‡å°ºå¯¸ï¼Œå› ä¸ºæˆ‘ä»¬æ— æ³•åœ¨æœåŠ¡å™¨ä¸Šæ‰¾åˆ°å·²å®‰è£…çš„ ImageMagick 或 GraphicsMagick 。",
"The_message_is_a_discussion_you_will_not_be_able_to_recover": "æ¤æ¶ˆæ¯æ˜¯ä¸€ä¸ªè®¨è®ºä½ å°†æ— æ³•æ¢å¤æ¤æ¶ˆæ¯!",
"The_mobile_notifications_were_disabled_to_all_users_go_to_Admin_Push_to_enable_the_Push_Gateway_again": "所有用户的移动端通知都已ç¦ç”¨ã€‚å‰å¾€ â€œç®¡ç† > 推é€â€ å†æ¬¡å¯ç”¨æŽ¨é€ç½‘å…³",
diff --git a/packages/ui-client/src/components/CustomFieldsForm.tsx b/packages/ui-client/src/components/CustomFieldsForm.tsx
index dc464fcd23c29219e645e913081758d65df5b147..98b9c3fdad79bd60faaf4227578a11e72723470f 100644
--- a/packages/ui-client/src/components/CustomFieldsForm.tsx
+++ b/packages/ui-client/src/components/CustomFieldsForm.tsx
@@ -52,7 +52,7 @@ const CustomField = <T extends FieldValues>({
(error: RHFFieldError) => {
switch (error?.type) {
case 'required':
- return t('The_field_is_required', label || name);
+ return t('Required_field', { field: label || name });
case 'minLength':
return t('Min_length_is', props?.minLength);
case 'maxLength':
diff --git a/packages/web-ui-registration/src/LoginForm.tsx b/packages/web-ui-registration/src/LoginForm.tsx
index d63886091fa0e2d3058ad4c4a951fb6d181411d9..6e28a443be63a4e4a5fe7e8e53e32d47b9064219 100644
--- a/packages/web-ui-registration/src/LoginForm.tsx
+++ b/packages/web-ui-registration/src/LoginForm.tsx
@@ -162,7 +162,7 @@ export const LoginForm = ({ setLoginRoute }: { setLoginRoute: DispatchLoginRoute
<FieldRow>
<TextInput
{...register('usernameOrEmail', {
- required: t('registration.component.form.requiredField'),
+ required: t('Required_field', { field: t('registration.component.form.emailOrUsername') }),
})}
placeholder={usernameOrEmailPlaceholder || t('registration.component.form.emailPlaceholder')}
error={errors.usernameOrEmail?.message}
@@ -184,7 +184,7 @@ export const LoginForm = ({ setLoginRoute }: { setLoginRoute: DispatchLoginRoute
<FieldRow>
<PasswordInput
{...register('password', {
- required: t('registration.component.form.requiredField'),
+ required: t('Required_field', { field: t('registration.component.form.password') }),
})}
placeholder={passwordPlaceholder}
error={errors.password?.message}
diff --git a/packages/web-ui-registration/src/RegisterForm.tsx b/packages/web-ui-registration/src/RegisterForm.tsx
index 311593d8e9b7136c5bca3e5d9a434889490b346c..ce7cb700d5c69e74e97c5ba6c32bd7022b3cb415 100644
--- a/packages/web-ui-registration/src/RegisterForm.tsx
+++ b/packages/web-ui-registration/src/RegisterForm.tsx
@@ -148,7 +148,7 @@ export const RegisterForm = ({ setLoginRoute }: { setLoginRoute: DispatchLoginRo
<FieldRow>
<TextInput
{...register('name', {
- required: requireNameForRegister ? t('registration.component.form.requiredField') : false,
+ required: requireNameForRegister ? t('Required_field', { field: t('registration.component.form.name') }) : false,
})}
error={errors?.name?.message}
aria-required={requireNameForRegister}
@@ -171,7 +171,7 @@ export const RegisterForm = ({ setLoginRoute }: { setLoginRoute: DispatchLoginRo
<FieldRow>
<TextInput
{...register('email', {
- required: t('registration.component.form.requiredField'),
+ required: t('Required_field', { field: t('registration.component.form.email') }),
pattern: {
value: /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}$/i,
message: t('registration.component.form.invalidEmail'),
@@ -198,7 +198,7 @@ export const RegisterForm = ({ setLoginRoute }: { setLoginRoute: DispatchLoginRo
<FieldRow>
<TextInput
{...register('username', {
- required: t('registration.component.form.requiredField'),
+ required: t('Required_field', { field: t('registration.component.form.username') }),
})}
error={errors?.username?.message}
aria-required='true'
@@ -221,7 +221,7 @@ export const RegisterForm = ({ setLoginRoute }: { setLoginRoute: DispatchLoginRo
<FieldRow>
<PasswordInput
{...register('password', {
- required: t('registration.component.form.requiredField'),
+ required: t('Required_field', { field: t('registration.component.form.password') }),
validate: () => (!passwordIsValid ? t('Password_must_meet_the_complexity_requirements') : true),
})}
error={errors.password?.message}
@@ -247,7 +247,7 @@ export const RegisterForm = ({ setLoginRoute }: { setLoginRoute: DispatchLoginRo
<FieldRow>
<PasswordInput
{...register('passwordConfirmation', {
- required: t('registration.component.form.requiredField'),
+ required: t('Required_field', { field: t('registration.component.form.confirmPassword') }),
deps: ['password'],
validate: (val: string) => (watch('password') === val ? true : t('registration.component.form.invalidConfirmPass')),
})}
@@ -275,7 +275,7 @@ export const RegisterForm = ({ setLoginRoute }: { setLoginRoute: DispatchLoginRo
<FieldRow>
<TextAreaInput
{...register('reason', {
- required: t('registration.component.form.requiredField'),
+ required: t('Required_field', { field: t('registration.component.form.reasonToJoin') }),
})}
error={errors?.reason?.message}
aria-required='true'
diff --git a/packages/web-ui-registration/src/ResetPasswordForm.tsx b/packages/web-ui-registration/src/ResetPasswordForm.tsx
index ae771c4494f7b06eeb893d45e4ed55c7dac53ee5..9a807934d48c18be085a8ce276de7dc8f2c81f6c 100644
--- a/packages/web-ui-registration/src/ResetPasswordForm.tsx
+++ b/packages/web-ui-registration/src/ResetPasswordForm.tsx
@@ -56,7 +56,7 @@ export const ResetPasswordForm = ({ setLoginRoute }: { setLoginRoute: DispatchLo
<FieldRow>
<TextInput
{...register('email', {
- required: t('registration.component.form.requiredField'),
+ required: t('Required_field', { field: t('registration.component.form.email') }),
pattern: {
value: /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}$/i,
message: t('registration.page.resetPassword.errors.invalidEmail'),