HI-VPN/ppanel-web
4
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

🐛 fix(system): Add time unit translations for user registration settings in multiple languages

Browse Source
This commit is contained in:
web
2025-08-11 04:06:39 -07:00
parent 822416d22d
commit 296a6c10a3
25 changed files with 287 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/admin/app/dashboard/system/user-security/register-form.tsx
+122 -94
View File
@@ -167,12 +167,58 @@ export default function RegisterConfig() {
/>
</FormControl>
<FormDescription>{t('ipRegistrationLimitDescription')}</FormDescription>
<FormMessage />
</FormItem>
)}
/>
{form.watch('enable_ip_register_limit') && (
<div className='grid grid-cols-1 gap-4 md:grid-cols-2'>
<FormField
control={form.control}
name='ip_register_limit'
render={({ field }) => (
<FormItem>
<FormLabel>{t('registrationLimitCount')}</FormLabel>
<FormControl>
<EnhancedInput
placeholder={t('inputPlaceholder')}
value={field.value}
type='number'
min={1}
onValueBlur={(value) => field.onChange(Number(value))}
/>
</FormControl>
<FormDescription>{t('registrationLimitCountDescription')}</FormDescription>
<FormMessage />
</FormItem>
)}
/>
<FormField
control={form.control}
name='ip_register_limit_duration'
render={({ field }) => (
<FormItem>
<FormLabel>{t('registrationLimitExpire')}</FormLabel>
<FormControl>
<EnhancedInput
placeholder={t('inputPlaceholder')}
value={field.value}
type='number'
min={1}
suffix={t('minute')}
onValueBlur={(value) => field.onChange(Number(value))}
/>
</FormControl>
<FormDescription>{t('registrationLimitExpireDescription')}</FormDescription>
<FormMessage />
</FormItem>
)}
/>
</div>
)}
<FormField
control={form.control}
name='enable_trial'
@@ -192,99 +238,81 @@ export default function RegisterConfig() {
)}
/>
<FormField
control={form.control}
name='ip_register_limit'
render={({ field }) => (
<FormItem>
<FormLabel>{t('registrationLimitCount')}</FormLabel>
<FormControl>
<EnhancedInput
placeholder={t('inputPlaceholder')}
value={field.value}
type='number'
min={1}
onValueBlur={(value) => field.onChange(Number(value))}
/>
</FormControl>
<FormDescription>{t('registrationLimitCountDescription')}</FormDescription>
<FormMessage />
</FormItem>
)}
/>
<FormField
control={form.control}
name='ip_register_limit_duration'
render={({ field }) => (
<FormItem>
<FormLabel>{t('registrationLimitExpire')}</FormLabel>
<FormControl>
<EnhancedInput
placeholder={t('inputPlaceholder')}
value={field.value}
type='number'
min={1}
suffix={t('day')}
onValueBlur={(value) => field.onChange(Number(value))}
/>
</FormControl>
<FormDescription>{t('registrationLimitExpireDescription')}</FormDescription>
<FormMessage />
</FormItem>
)}
/>
<FormField
control={form.control}
name='trial_time'
render={({ field }) => (
<FormItem>
<FormLabel>{t('trialTime')}</FormLabel>
<FormControl>
<EnhancedInput
placeholder={t('inputPlaceholder')}
value={field.value}
type='number'
min={0}
suffix={t('day')}
onValueBlur={(value) => field.onChange(Number(value))}
/>
</FormControl>
<FormDescription>{t('trialTimeDescription')}</FormDescription>
<FormMessage />
</FormItem>
)}
/>
<FormField
control={form.control}
name='trial_subscribe'
render={({ field }) => (
<FormItem>
<FormLabel>{t('trialSubscribe')}</FormLabel>
<FormControl>
<Combobox
placeholder={t('selectPlaceholder')}
value={field.value}
onChange={(value: number) => {
if (value) {
field.onChange(value);
}
}}
options={
subscribe?.map((item) => ({
label: item.name,
value: item.id,
})) || []
}
/>
</FormControl>
<FormDescription>{t('trialSubscribeDescription')}</FormDescription>
<FormMessage />
</FormItem>
)}
/>
{form.watch('enable_trial') && (
<>
<FormField
control={form.control}
name='trial_time'
render={({ field }) => (
<FormItem>
<FormLabel>{t('trialConfig')}</FormLabel>
<FormControl>
<div className='flex gap-2'>
<EnhancedInput
placeholder={t('inputPlaceholder')}
value={field.value}
type='number'
min={0}
onValueBlur={(value) => field.onChange(Number(value))}
className='flex-1'
prefix={
<FormField
control={form.control}
name='trial_subscribe'
render={({ field }) => (
<Combobox
placeholder={t('selectPlaceholder')}
value={field.value}
onChange={(value: number) => {
if (value) {
field.onChange(value);
}
}}
options={
subscribe?.map((item) => ({
label: item.name,
value: item.id,
})) || []
}
className='bg-secondary w-32 rounded-r-none'
/>
)}
/>
}
suffix={
<FormField
control={form.control}
name='trial_time_unit'
render={({ field: unitField }) => (
<Combobox
placeholder={t('selectPlaceholder')}
value={unitField.value}
onChange={(value: string) => {
unitField.onChange(value);
}}
options={[
{ label: t('none'), value: 'None' },
{ label: t('year'), value: 'Year' },
{ label: t('month'), value: 'Month' },
{ label: t('day'), value: 'Day' },
{ label: t('hour'), value: 'Hour' },
{ label: t('minute'), value: 'Minute' },
]}
className='bg-secondary w-32 rounded-l-none'
/>
)}
/>
}
/>
</div>
</FormControl>
<FormDescription>{t('trialConfigDescription')}</FormDescription>
<FormMessage />
</FormItem>
)}
/>
</>
)}
</form>
</Form>
</ScrollArea>
apps/admin/app/dashboard/ticket/page.tsx
+1 -1
View File
@@ -172,7 +172,7 @@ export default function Page() {
<DrawerDescription>{ticket?.description}</DrawerDescription>
</DrawerHeader>
<ScrollArea className='h-full overflow-hidden' ref={scrollRef}>
<div className='flex h-screen flex-col gap-4 p-4'>
<div className='flex h-full flex-col gap-4 p-4'>
{ticket?.follow?.map((item) => (
<div
key={item.id}