[O] Locale

AquaMai/AquaMai.Core/Resources/Locale.Designer.cs

@@ -28,7 +28,7 @@ namespace AquaMai.Core.Resources {
         private static global::System.Globalization.CultureInfo resourceCulture;
         
         [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public Locale() {
+        internal Locale() {
         }
         
         /// <summary>
@@ -161,7 +161,7 @@ namespace AquaMai.Core.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to 游玩次数：{0}.
+        ///   Looks up a localized string similar to Play Count：{0}.
         /// </summary>
         public static string PlayCount {
             get {
@@ -169,6 +169,15 @@ namespace AquaMai.Core.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Playlog save error.
+        /// </summary>
+        public static string PlaylogSaveError {
+            get {
+                return ResourceManager.GetString("PlaylogSaveError", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to SSS+ =&gt; DXRating += {0}.
         /// </summary>
@@ -259,6 +268,24 @@ namespace AquaMai.Core.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Hide Self-Made Charts.
+        /// </summary>
+        public static string SelfMadeChartsHide {
+            get {
+                return ResourceManager.GetString("SelfMadeChartsHide", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Show Self-Made Charts.
+        /// </summary>
+        public static string SelfMadeChartsShow {
+            get {
+                return ResourceManager.GetString("SelfMadeChartsShow", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Skip.
         /// </summary>
@@ -312,5 +339,14 @@ namespace AquaMai.Core.Resources {
                 return ResourceManager.GetString("SpeedUp", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to UserAll Upsert Error.
+        /// </summary>
+        public static string UserAllUpsertError {
+            get {
+                return ResourceManager.GetString("UserAllUpsertError", resourceCulture);
+            }
+        }
     }
 }

AquaMai/AquaMai.Core/Resources/Locale.resx

@@ -102,6 +102,18 @@
         <value>You are using AquaMai CI build version. This version is built from the latest mainline code and may contain undocumented configuration changes or potential issues.</value>
     </data>
     <data name="PlayCount" xml:space="preserve">
-        <value>游玩次数：{0}</value>
+        <value>Play Count：{0}</value>
+    </data>
+    <data name="SelfMadeChartsHide" xml:space="preserve">
+        <value>Hide Self-Made Charts</value>
+    </data>
+    <data name="SelfMadeChartsShow" xml:space="preserve">
+        <value>Show Self-Made Charts</value>
+    </data>
+    <data name="UserAllUpsertError" xml:space="preserve">
+        <value>UserAll Upsert Error</value>
+    </data>
+    <data name="PlaylogSaveError" xml:space="preserve">
+        <value>Playlog save error</value>
     </data>
 </root>

AquaMai/AquaMai.Core/Resources/Locale.zh.resx

@@ -95,6 +95,18 @@
         <value>您正在使用的是 AquaMai CI 构建版本。由于该版本基于最新的主线代码构建，可能包含未通知的配置文件变更或潜在问题。</value>
     </data>
     <data name="PlayCount" xml:space="preserve">
-        <value>Play Count: {0}</value>
+        <value>游玩次数: {0}</value>
+    </data>
+    <data name="SelfMadeChartsHide" xml:space="preserve">
+        <value>已隐藏所有自制谱</value>
+    </data>
+    <data name="SelfMadeChartsShow" xml:space="preserve">
+        <value>已显示自制谱</value>
+    </data>
+    <data name="UserAllUpsertError" xml:space="preserve">
+        <value>保存 UserAll 失败</value>
+    </data>
+    <data name="PlaylogSaveError" xml:space="preserve">
+        <value>保存 Playlog 失败</value>
     </data>
 </root>

AquaMai/AquaMai.Mods/UX/HideSelfMadeCharts.cs

@@ -6,6 +6,7 @@ using System.Threading.Tasks;
 using AquaMai.Config.Attributes;
 using AquaMai.Config.Types;
 using AquaMai.Core.Helpers;
+using AquaMai.Core.Resources;
 using HarmonyLib;
 using MAI2.Util;
 using Manager;
@@ -25,8 +26,7 @@ public class HideSelfMadeCharts
         zh: "切换自制谱显示的按键")]
     public static readonly KeyCodeOrName key = KeyCodeOrName.Test;
 
-    [ConfigEntry]
+    [ConfigEntry] public static readonly bool longPress = false;
-    public static readonly bool longPress = false;
 
     [ConfigEntry(
         en: "One user ID per line in the file. Hide self-made charts when these users login.",
@@ -86,7 +86,7 @@ public class HideSelfMadeCharts
         Task.Run(async () =>
         {
             await Task.Delay(1000);
-            MessageHelper.ShowMessage($"{(isShowSelfMadeCharts ? "Show" : "Hide")} Self-Made Charts");
+            MessageHelper.ShowMessage(isShowSelfMadeCharts ? Locale.SelfMadeChartsShow : Locale.SelfMadeChartsHide);
         });
     }
 
@@ -133,4 +133,4 @@ public class HideSelfMadeCharts
         // reset status on login
         isShowSelfMadeCharts = true;
     }
-}
+}

AquaMai/AquaMai.Mods/UX/ImmediateSave.cs

@@ -53,6 +53,7 @@ public class ImmediateSave
 
         for (int i = 0; i < 2; i++)
         {
+            var j = i;
             var userData = Singleton<UserDataManager>.Instance.GetUserData(i);
             if (!userData.IsEntry || userData.IsGuest())
             {
@@ -74,10 +75,10 @@ public class ImmediateSave
                 },
                 delegate(PacketStatus err)
                 {
-                    SoundManager.PlaySE(Mai2.Mai2Cue.Cue.SE_ENTRY_AIME_ERROR, i);
+                    SoundManager.PlaySE(Mai2.Mai2Cue.Cue.SE_ENTRY_AIME_ERROR, j);
                     MelonLogger.Error("[ImmediateSave] Playlog save error");
                     MelonLogger.Error(err);
-                    MessageHelper.ShowMessage("Playlog save error");
+                    MessageHelper.ShowMessage(Locale.PlaylogSaveError);
                     CheckSaveDone();
                 }));
             PacketHelper.StartPacket(Shim.CreatePacketUpsertUserAll(i, userData, delegate(int code)
@@ -89,18 +90,18 @@ public class ImmediateSave
                 }
                 else
                 {
-                    SoundManager.PlaySE(Mai2.Mai2Cue.Cue.SE_ENTRY_AIME_ERROR, i);
+                    SoundManager.PlaySE(Mai2.Mai2Cue.Cue.SE_ENTRY_AIME_ERROR, j);
                     MelonLogger.Error("[ImmediateSave] UserAll upsert error");
                     MelonLogger.Error(code);
-                    MessageHelper.ShowMessage("UserAll upsert error");
+                    MessageHelper.ShowMessage(Locale.UserAllUpsertError);
                     CheckSaveDone();
                 }
             }, delegate(PacketStatus err)
             {
-                SoundManager.PlaySE(Mai2.Mai2Cue.Cue.SE_ENTRY_AIME_ERROR, i);
+                SoundManager.PlaySE(Mai2.Mai2Cue.Cue.SE_ENTRY_AIME_ERROR, j);
                 MelonLogger.Error("[ImmediateSave] UserAll upsert error");
                 MelonLogger.Error(err);
-                MessageHelper.ShowMessage("UserAll upsert error");
+                MessageHelper.ShowMessage(Locale.UserAllUpsertError);
                 CheckSaveDone();
             }));
         }
@@ -237,4 +238,4 @@ public class ImmediateSave
             GUI.Label(rect, Locale.SavingDontExit);
         }
     }
-}
+}