Skip to content

Commit b2e837f

Browse files
0xJacky0xJacky
committed
bug fix and translated login error msg
1 parent f11fd19 commit b2e837f

35 files changed

+324
-301
lines changed

‎frontend/src/gettext.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,6 @@ export default createGettext({
1111
translations: translations,
1212
silent: true
1313
})
14+
15+
export class useGettext {
16+
}

‎frontend/src/language/constants.ts‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import gettext from '@/gettext'
2+
3+
const {$gettext} = gettext
4+
5+
export const msg = [
6+
$gettext('The username or password is incorrect')
7+
]

‎frontend/src/language/en/app.po‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ msgstr ""
2525

2626
#: src/views/domain/ngx_conf/directive/DirectiveAdd.vue:31
2727
#: src/views/domain/ngx_conf/directive/DirectiveAdd.vue:32
28-
#: src/views/domain/ngx_conf/directive/DirectiveAdd.vue:33
28+
#: src/views/domain/ngx_conf/directive/DirectiveAdd.vue:34
2929
msgid "Add Directive Below"
3030
msgstr "Add Directive Below"
3131

@@ -60,7 +60,7 @@ msgstr "Auto-renewal disabled for %{name}"
6060
msgid "Auto-renewal enabled for %{name}"
6161
msgstr "Auto-renewal enabled for %{name}"
6262

63-
#: src/views/domain/DomainEdit.vue:158
63+
#: src/views/domain/DomainEdit.vue:166
6464
msgid "Back"
6565
msgstr "Back"
6666

@@ -101,7 +101,7 @@ msgstr "Certificate Status"
101101
#: src/views/domain/ngx_conf/directive/DirectiveEditor.vue:29
102102
#: src/views/domain/ngx_conf/LocationEditor.vue:21
103103
#: src/views/domain/ngx_conf/LocationEditor.vue:7
104-
#: src/views/domain/ngx_conf/NgxConfigEditor.vue:145
104+
#: src/views/domain/ngx_conf/NgxConfigEditor.vue:154
105105
msgid "Comments"
106106
msgstr "Comments"
107107

@@ -304,7 +304,7 @@ msgstr "Login successful"
304304
msgid "Logout successful"
305305
msgstr "Logout successful"
306306

307-
#: src/views/domain/cert/IssueCert.vue:172
307+
#: src/views/domain/cert/IssueCert.vue:181
308308
msgid ""
309309
"Make sure you have configured a reverse proxy for .well-known directory to "
310310
"HTTPChallengePort (default: 9180) before getting the certificate."
@@ -384,7 +384,7 @@ msgstr "Not Found"
384384
msgid "Not Valid Before: %{date}"
385385
msgstr "Not Valid Before: %{date}"
386386

387-
#: src/views/domain/cert/IssueCert.vue:164
387+
#: src/views/domain/cert/IssueCert.vue:173
388388
msgid ""
389389
"Note: The server_name in the current configuration must be the domain name "
390390
"you need to get the certificate."
@@ -402,7 +402,7 @@ msgstr ""
402402
msgid "OS:"
403403
msgstr "OS:"
404404

405-
#: src/views/domain/ngx_conf/directive/DirectiveAdd.vue:21
405+
#: src/views/domain/ngx_conf/directive/DirectiveAdd.vue:22
406406
msgid "Params"
407407
msgstr "Params"
408408

@@ -447,13 +447,13 @@ msgstr "Receive"
447447
msgid "Reset"
448448
msgstr ""
449449

450-
#: src/views/config/ConfigEdit.vue:52 src/views/domain/DomainEdit.vue:161
450+
#: src/views/config/ConfigEdit.vue:52 src/views/domain/DomainEdit.vue:169
451451
msgid "Save"
452452
msgstr "Save"
453453

454454
#: src/views/domain/ngx_conf/directive/DirectiveAdd.vue:32
455455
#: src/views/domain/ngx_conf/directive/DirectiveAdd.vue:33
456-
#: src/views/domain/ngx_conf/directive/DirectiveAdd.vue:34
456+
#: src/views/domain/ngx_conf/directive/DirectiveAdd.vue:35
457457
msgid "Save Directive"
458458
msgstr "Save Directive"
459459

@@ -482,7 +482,7 @@ msgstr "Send"
482482
#: src/views/config/ConfigEdit.vue:22 src/views/domain/DomainEdit.vue:44
483483
#: src/views/domain/DomainEdit.vue:56 src/views/domain/DomainEdit.vue:65
484484
#: src/views/domain/DomainEdit.vue:83 src/views/domain/DomainList.vue:78
485-
#: src/views/other/Install.vue:71 src/views/other/Login.vue:56
485+
#: src/views/other/Install.vue:71
486486
msgid "Server error"
487487
msgstr "Server error"
488488

@@ -494,11 +494,11 @@ msgstr "Server Info"
494494
msgid "server_name not found in directives"
495495
msgstr "server_name not found in directives"
496496

497-
#: src/views/domain/cert/IssueCert.vue:155 src/views/domain/DomainAdd.vue:112
497+
#: src/views/domain/cert/IssueCert.vue:164 src/views/domain/DomainAdd.vue:112
498498
msgid "server_name parameter is required"
499499
msgstr "server_name parameter is required"
500500

501-
#: src/views/domain/cert/IssueCert.vue:158
501+
#: src/views/domain/cert/IssueCert.vue:167
502502
#: src/views/domain/cert/IssueCert.vue:34
503503
msgid "server_name parameters more than one"
504504
msgstr "server_name parameters more than one"
@@ -536,7 +536,7 @@ msgstr "Enabled"
536536
msgid "Terminal"
537537
msgstr "Terminal"
538538

539-
#: src/views/domain/cert/IssueCert.vue:168
539+
#: src/views/domain/cert/IssueCert.vue:177
540540
msgid ""
541541
"The certificate for the domain will be checked every hour, and will be "
542542
"renewed if it has been more than 1 month since it was last issued."
@@ -548,6 +548,10 @@ msgstr ""
548548
msgid "The filename cannot contain the following characters: %{c}"
549549
msgstr "The filename cannot contain the following characters: %{c}"
550550

551+
#: src/language/constants.ts:6
552+
msgid "The username or password is incorrect"
553+
msgstr ""
554+
551555
#: src/views/config/Config.vue:17 src/views/domain/DomainList.vue:36
552556
#: src/views/user/User.vue:36
553557
msgid "Updated at"

‎frontend/src/language/messages.pot‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ msgstr ""
1919

2020
#: src/views/domain/ngx_conf/directive/DirectiveAdd.vue:31
2121
#: src/views/domain/ngx_conf/directive/DirectiveAdd.vue:32
22-
#: src/views/domain/ngx_conf/directive/DirectiveAdd.vue:33
22+
#: src/views/domain/ngx_conf/directive/DirectiveAdd.vue:34
2323
msgid "Add Directive Below"
2424
msgstr ""
2525

@@ -54,7 +54,7 @@ msgstr ""
5454
msgid "Auto-renewal enabled for %{name}"
5555
msgstr ""
5656

57-
#: src/views/domain/DomainEdit.vue:158
57+
#: src/views/domain/DomainEdit.vue:166
5858
msgid "Back"
5959
msgstr ""
6060

@@ -94,7 +94,7 @@ msgstr ""
9494
#: src/views/domain/ngx_conf/directive/DirectiveEditor.vue:29
9595
#: src/views/domain/ngx_conf/LocationEditor.vue:21
9696
#: src/views/domain/ngx_conf/LocationEditor.vue:7
97-
#: src/views/domain/ngx_conf/NgxConfigEditor.vue:145
97+
#: src/views/domain/ngx_conf/NgxConfigEditor.vue:154
9898
msgid "Comments"
9999
msgstr ""
100100

@@ -308,7 +308,7 @@ msgstr ""
308308
msgid "Logout successful"
309309
msgstr ""
310310

311-
#: src/views/domain/cert/IssueCert.vue:172
311+
#: src/views/domain/cert/IssueCert.vue:181
312312
msgid "Make sure you have configured a reverse proxy for .well-known directory to HTTPChallengePort (default: 9180) before getting the certificate."
313313
msgstr ""
314314

@@ -387,7 +387,7 @@ msgstr ""
387387
msgid "Not Valid Before: %{date}"
388388
msgstr ""
389389

390-
#: src/views/domain/cert/IssueCert.vue:164
390+
#: src/views/domain/cert/IssueCert.vue:173
391391
msgid "Note: The server_name in the current configuration must be the domain name you need to get the certificate."
392392
msgstr ""
393393

@@ -401,7 +401,7 @@ msgstr ""
401401
msgid "OS:"
402402
msgstr ""
403403

404-
#: src/views/domain/ngx_conf/directive/DirectiveAdd.vue:21
404+
#: src/views/domain/ngx_conf/directive/DirectiveAdd.vue:22
405405
msgid "Params"
406406
msgstr ""
407407

@@ -451,13 +451,13 @@ msgid "Reset"
451451
msgstr ""
452452

453453
#: src/views/config/ConfigEdit.vue:52
454-
#: src/views/domain/DomainEdit.vue:161
454+
#: src/views/domain/DomainEdit.vue:169
455455
msgid "Save"
456456
msgstr ""
457457

458458
#: src/views/domain/ngx_conf/directive/DirectiveAdd.vue:32
459459
#: src/views/domain/ngx_conf/directive/DirectiveAdd.vue:33
460-
#: src/views/domain/ngx_conf/directive/DirectiveAdd.vue:34
460+
#: src/views/domain/ngx_conf/directive/DirectiveAdd.vue:35
461461
msgid "Save Directive"
462462
msgstr ""
463463

@@ -492,7 +492,6 @@ msgstr ""
492492
#: src/views/domain/DomainEdit.vue:83
493493
#: src/views/domain/DomainList.vue:78
494494
#: src/views/other/Install.vue:71
495-
#: src/views/other/Login.vue:56
496495
msgid "Server error"
497496
msgstr ""
498497

@@ -504,12 +503,12 @@ msgstr ""
504503
msgid "server_name not found in directives"
505504
msgstr ""
506505

507-
#: src/views/domain/cert/IssueCert.vue:155
506+
#: src/views/domain/cert/IssueCert.vue:164
508507
#: src/views/domain/DomainAdd.vue:112
509508
msgid "server_name parameter is required"
510509
msgstr ""
511510

512-
#: src/views/domain/cert/IssueCert.vue:158
511+
#: src/views/domain/cert/IssueCert.vue:167
513512
#: src/views/domain/cert/IssueCert.vue:34
514513
msgid "server_name parameters more than one"
515514
msgstr ""
@@ -547,14 +546,18 @@ msgstr ""
547546
msgid "Terminal"
548547
msgstr ""
549548

550-
#: src/views/domain/cert/IssueCert.vue:168
549+
#: src/views/domain/cert/IssueCert.vue:177
551550
msgid "The certificate for the domain will be checked every hour, and will be renewed if it has been more than 1 month since it was last issued."
552551
msgstr ""
553552

554553
#: src/views/other/Install.vue:54
555554
msgid "The filename cannot contain the following characters: %{c}"
556555
msgstr ""
557556

557+
#: src/language/constants.ts:6
558+
msgid "The username or password is incorrect"
559+
msgstr ""
560+
558561
#: src/views/config/Config.vue:17
559562
#: src/views/domain/DomainList.vue:36
560563
#: src/views/user/User.vue:36

0 commit comments

Comments
 (0)