HyperNet/Passport
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🐛 Bug fixes on localization

Browse Source
This commit is contained in:
LittleSheep 2025-02-01 18:21:54 +08:00
parent b68aed0284
commit cd01657857
11 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
.idea/workspace.xml generated
View File

@ -4,12 +4,18 @@
<option name="autoReloadType" value="ALL" />
</component>
<component name="ChangeListManager">
<list default="true" id="3fefb2c4-b6f9-466b-a523-53352e8d6f95" name="更改" comment=":sparkles: Push email &amp; notification localization">
<list default="true" id="3fefb2c4-b6f9-466b-a523-53352e8d6f95" name="更改" comment=":globe_with_meridians: Fully localized notification">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/locales/en-US.json" beforeDir="false" afterPath="$PROJECT_DIR$/locales/en-US.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/locales/zh-CN.json" beforeDir="false" afterPath="$PROJECT_DIR$/locales/zh-CN.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pkg/internal/services/reports.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/services/reports.go" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pkg/internal/services/i18n.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/services/i18n.go" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pkg/internal/services/ticket.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/services/ticket.go" afterDir="false" />
<change beforePath="$PROJECT_DIR$/templates/email/en-US/confirm-deletion.tmpl" beforeDir="false" afterPath="$PROJECT_DIR$/templates/en-US/confirm-deletion.tmpl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/templates/email/en-US/email-otp.tmpl" beforeDir="false" afterPath="$PROJECT_DIR$/templates/en-US/email-otp.tmpl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/templates/email/en-US/register-confirm.tmpl" beforeDir="false" afterPath="$PROJECT_DIR$/templates/en-US/register-confirm.tmpl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/templates/email/en-US/reset-password.tmpl" beforeDir="false" afterPath="$PROJECT_DIR$/templates/en-US/reset-password.tmpl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/templates/email/zh-CN/confirm-deletion.tmpl" beforeDir="false" afterPath="$PROJECT_DIR$/templates/zh-CN/confirm-deletion.tmpl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/templates/email/zh-CN/email-otp.tmpl" beforeDir="false" afterPath="$PROJECT_DIR$/templates/zh-CN/email-otp.tmpl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/templates/email/zh-CN/register-confirm.tmpl" beforeDir="false" afterPath="$PROJECT_DIR$/templates/zh-CN/register-confirm.tmpl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/templates/email/zh-CN/reset-password.tmpl" beforeDir="false" afterPath="$PROJECT_DIR$/templates/zh-CN/reset-password.tmpl" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -86,11 +92,11 @@
<recent name="$PROJECT_DIR$/pkg/internal/server/api" />
</key>
<key name="MoveFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/templates" />
<recent name="$PROJECT_DIR$/pkg/authkit" />
<recent name="$PROJECT_DIR$/web/src/views/flow" />
<recent name="$PROJECT_DIR$/pkg/internal/server/exts" />
<recent name="$PROJECT_DIR$/pkg/internal/server/api" />
<recent name="$PROJECT_DIR$/pkg/internal" />
</key>
</component>
<component name="RunAnythingCache">
@ -162,7 +168,6 @@
</component>
<component name="VcsManagerConfiguration">
<option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
<MESSAGE value=":bug: Fix group permission didn't extend properly" />
<MESSAGE value=":mute: Remove authenticate result logging" />
<MESSAGE value=":truck: Rename daily-sign to check-in" />
<MESSAGE value=":sparkles: Result modifiers in check-in" />
@ -187,7 +192,8 @@
<MESSAGE value=":bug: Fix list user relative return wrong data" />
<MESSAGE value=":sparkles: Account preferred language" />
<MESSAGE value=":sparkles: Push email &amp; notification localization" />
<option name="LAST_COMMIT_MESSAGE" value=":sparkles: Push email &amp; notification localization" />
<MESSAGE value=":globe_with_meridians: Fully localized notification" />
<option name="LAST_COMMIT_MESSAGE" value=":globe_with_meridians: Fully localized notification" />
<option name="GROUP_MULTIFILE_MERGE_BY_DIRECTORY" value="true" />
</component>
<component name="VgoProject">

2
pkg/internal/services/i18n.go
View File

@ -19,7 +19,7 @@ const FallbackLanguage = "en-US"
var LocaleBundle *i18n.Bundle
func LoadLocalization() error {
LocaleBundle = i18n.NewBundle(language.English)
LocaleBundle = i18n.NewBundle(language.AmericanEnglish)
LocaleBundle.RegisterUnmarshalFunc("json", json.Unmarshal)
var count int

9
pkg/internal/services/ticket.go
View File

@ -128,10 +128,15 @@ func ActiveTicket(ticket models.AuthTicket) (models.AuthTicket, error) {
if err := database.C.Save(&ticket).Error; err != nil {
return ticket, err
} else {
var account models.Account
if err := database.C.Where("id = ?", ticket.AccountID).Select("Language").First(&account).Error; err != nil {
return ticket, nil
}
_ = NewNotification(models.Notification{
Topic: "passport.security.alert",
Title: GetLocalizedString("subjectLoginAlert", ticket.Account.Language),
Body: fmt.Sprintf(GetLocalizedString("shortBodyLoginAlert", ticket.Account.Language), ticket.IpAddress),
Title: GetLocalizedString("subjectLoginAlert", account.Language),
Body: fmt.Sprintf(GetLocalizedString("shortBodyLoginAlert", account.Language), ticket.IpAddress),
Metadata: datatypes.JSONMap{
"ip_address": ticket.IpAddress,
"created_at": ticket.CreatedAt,

0
templates/email/en-US/confirm-deletion.tmpl → templates/en-US/confirm-deletion.tmpl
View File

0
templates/email/en-US/email-otp.tmpl → templates/en-US/email-otp.tmpl
View File

0
templates/email/en-US/register-confirm.tmpl → templates/en-US/register-confirm.tmpl
View File

0
templates/email/en-US/reset-password.tmpl → templates/en-US/reset-password.tmpl
View File

0
templates/email/zh-CN/confirm-deletion.tmpl → templates/zh-CN/confirm-deletion.tmpl
View File

0
templates/email/zh-CN/email-otp.tmpl → templates/zh-CN/email-otp.tmpl
View File

0
templates/email/zh-CN/register-confirm.tmpl → templates/zh-CN/register-confirm.tmpl
View File

0
templates/email/zh-CN/reset-password.tmpl → templates/zh-CN/reset-password.tmpl
View File