From cd016578575c7375ab85a342ba797aaa766d8d75 Mon Sep 17 00:00:00 2001
From: LittleSheep <littlesheep.code@hotmail.com>
Date: Sat, 1 Feb 2025 18:21:54 +0800
Subject: [PATCH] :bug: Bug fixes on localization

---
 .idea/workspace.xml                           | 20 ++++++++++++-------
 pkg/internal/services/i18n.go                 |  2 +-
 pkg/internal/services/ticket.go               |  9 +++++++--
 .../{email => }/en-US/confirm-deletion.tmpl   |  0
 templates/{email => }/en-US/email-otp.tmpl    |  0
 .../{email => }/en-US/register-confirm.tmpl   |  0
 .../{email => }/en-US/reset-password.tmpl     |  0
 .../{email => }/zh-CN/confirm-deletion.tmpl   |  0
 templates/{email => }/zh-CN/email-otp.tmpl    |  0
 .../{email => }/zh-CN/register-confirm.tmpl   |  0
 .../{email => }/zh-CN/reset-password.tmpl     |  0
 11 files changed, 21 insertions(+), 10 deletions(-)
 rename templates/{email => }/en-US/confirm-deletion.tmpl (100%)
 rename templates/{email => }/en-US/email-otp.tmpl (100%)
 rename templates/{email => }/en-US/register-confirm.tmpl (100%)
 rename templates/{email => }/en-US/reset-password.tmpl (100%)
 rename templates/{email => }/zh-CN/confirm-deletion.tmpl (100%)
 rename templates/{email => }/zh-CN/email-otp.tmpl (100%)
 rename templates/{email => }/zh-CN/register-confirm.tmpl (100%)
 rename templates/{email => }/zh-CN/reset-password.tmpl (100%)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8f996a4..2f2ca11 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -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">
diff --git a/pkg/internal/services/i18n.go b/pkg/internal/services/i18n.go
index 0fd4be1..891e506 100644
--- a/pkg/internal/services/i18n.go
+++ b/pkg/internal/services/i18n.go
@@ -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
diff --git a/pkg/internal/services/ticket.go b/pkg/internal/services/ticket.go
index 18defd6..50e2338 100644
--- a/pkg/internal/services/ticket.go
+++ b/pkg/internal/services/ticket.go
@@ -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,
diff --git a/templates/email/en-US/confirm-deletion.tmpl b/templates/en-US/confirm-deletion.tmpl
similarity index 100%
rename from templates/email/en-US/confirm-deletion.tmpl
rename to templates/en-US/confirm-deletion.tmpl
diff --git a/templates/email/en-US/email-otp.tmpl b/templates/en-US/email-otp.tmpl
similarity index 100%
rename from templates/email/en-US/email-otp.tmpl
rename to templates/en-US/email-otp.tmpl
diff --git a/templates/email/en-US/register-confirm.tmpl b/templates/en-US/register-confirm.tmpl
similarity index 100%
rename from templates/email/en-US/register-confirm.tmpl
rename to templates/en-US/register-confirm.tmpl
diff --git a/templates/email/en-US/reset-password.tmpl b/templates/en-US/reset-password.tmpl
similarity index 100%
rename from templates/email/en-US/reset-password.tmpl
rename to templates/en-US/reset-password.tmpl
diff --git a/templates/email/zh-CN/confirm-deletion.tmpl b/templates/zh-CN/confirm-deletion.tmpl
similarity index 100%
rename from templates/email/zh-CN/confirm-deletion.tmpl
rename to templates/zh-CN/confirm-deletion.tmpl
diff --git a/templates/email/zh-CN/email-otp.tmpl b/templates/zh-CN/email-otp.tmpl
similarity index 100%
rename from templates/email/zh-CN/email-otp.tmpl
rename to templates/zh-CN/email-otp.tmpl
diff --git a/templates/email/zh-CN/register-confirm.tmpl b/templates/zh-CN/register-confirm.tmpl
similarity index 100%
rename from templates/email/zh-CN/register-confirm.tmpl
rename to templates/zh-CN/register-confirm.tmpl
diff --git a/templates/email/zh-CN/reset-password.tmpl b/templates/zh-CN/reset-password.tmpl
similarity index 100%
rename from templates/email/zh-CN/reset-password.tmpl
rename to templates/zh-CN/reset-password.tmpl