Feat: Rename the key of the view

whats2000 · Sep 4, 2024 · 6e09dda · 6e09dda
1 parent 687cdbf
commit 6e09dda
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 28 deletions.
diff --git a/Components/GeneralFTL.razor b/Components/GeneralFTL.razor
@@ -1,24 +1,23 @@
 @page "/GeneralFTL"
-
 @using PearlCalculatorBlazor.Localizer
 
 <div class="calculator-general-root-default">
     <Card>
         <CardTabs>
             <Tabs @bind-ActiveKey="_activeKey">
-                <TabPane Key="GFTL_General" Tab="@TranslateText.GetTranslateText("GFTL_General")">
+                <TabPane Key="GeneralFtlGeneral" Tab="@TranslateText.GetTranslateText("GeneralFtlGeneral")">
                     <ChildContent>
                         <GeneralFTL_General/>
                     </ChildContent>
                 </TabPane>
 
-                <TabPane Key="GFTL_Advanced" Tab="@TranslateText.GetTranslateText("GFTL_Advanced")">
+                <TabPane Key="GeneralFtlAdvanced" Tab="@TranslateText.GetTranslateText("GeneralFtlAdvanced")">
                     <ChildContent>
                         <GeneralFTL_Advanced/>
                     </ChildContent>
                 </TabPane>
 
-                <TabPane Key="GFTL_Settings" Tab="@TranslateText.GetTranslateText("GFTL_Settings")">
+                <TabPane Key="GeneralFtlSettings" Tab="@TranslateText.GetTranslateText("GeneralFtlSettings")">
                     <ChildContent>
                         <GeneralFTL_Settings/>
                     </ChildContent>
@@ -32,7 +31,7 @@
     <Space Direction="DirectionVHType.Vertical" Style="width: 100%">
         <SpaceItem>
             <Select DataSource="@_selectList"
-                    DefaultValue="@("GFTL_General")"
+                    DefaultValue="@("GeneralFtlGeneral")"
                     @bind-Value="_activeKey"
                     ValueName="@nameof(Array.ActiveKey)"
                     LabelName="@nameof(Array.DisplayName)"
@@ -41,20 +40,20 @@
         </SpaceItem>
         <Divider></Divider>
         <SpaceItem>
-            @if (_activeKey == "GFTL_General")
+            @if (_activeKey == "GeneralFtlGeneral")
             {
-            <GeneralFTL_General/>
+                <GeneralFTL_General/>
             }
-            else if (_activeKey == "GFTL_Advanced")
+            else if (_activeKey == "GeneralFtlAdvanced")
             {
-            <GeneralFTL_Advanced/>
+                <GeneralFTL_Advanced/>
             }
             else
             {
-            <GeneralFTL_Settings/>
+                <GeneralFTL_Settings/>
             }
         </SpaceItem>
     </Space>
 </div>
 
-@code { private string _activeKey = "GFTL_General"; }
+@code { private string _activeKey = "GeneralFtlGeneral"; }
diff --git a/Components/GeneralFTL.razor.cs b/Components/GeneralFTL.razor.cs
@@ -11,9 +11,18 @@ protected override void OnInitialized()
     {
         _selectList = new List<Array>
         {
-            new() { ActiveKey = "GFTL_General", DisplayName = TranslateText.GetTranslateText("GFTL_General") },
-            new() { ActiveKey = "GFTL_Advanced", DisplayName = TranslateText.GetTranslateText("GFTL_Advanced") },
-            new() { ActiveKey = "GFTL_Settings", DisplayName = TranslateText.GetTranslateText("GFTL_Settings") }
+            new()
+            {
+                ActiveKey = "GeneralFtlGeneral", DisplayName = TranslateText.GetTranslateText("GeneralFtlGeneral")
+            },
+            new()
+            {
+                ActiveKey = "GeneralFtlAdvanced", DisplayName = TranslateText.GetTranslateText("GeneralFtlAdvanced")
+            },
+            new()
+            {
+                ActiveKey = "GeneralFtlSettings", DisplayName = TranslateText.GetTranslateText("GeneralFtlSettings")
+            }
         };
 
         TranslateText.OnLanguageChange += RefreshPage;

diff --git a/Components/GeneralFTLComponents/GeneralFTL_Advanced.razor.cs b/Components/GeneralFTLComponents/GeneralFTL_Advanced.razor.cs
@@ -61,7 +61,7 @@ private void ChangeTntWeight()
         var isSortByWeightedDistance = SelectSortMode == SortMode.SortByWeightedDistance;
         EventManager.Instance.PublishEvent(this,
             isSortByWeightedDistance ? "sortByWeightedDistance" : "sortByWeightedTotal",
-            new ButtonClickArgs("GFTL_Advanced"));
+            new ButtonClickArgs("GeneralFtlAdvanced"));
     }
 
     [JSInvokable]

diff --git a/Components/GeneralFTLComponents/GeneralFTL_General.razor.cs b/Components/GeneralFTLComponents/GeneralFTL_General.razor.cs
@@ -14,7 +14,7 @@ namespace PearlCalculatorBlazor.Components.GeneralFTLComponents;
 
 public partial class GeneralFTL_General
 {
-    private const string PublishKey = "GFTL_General";
+    private const string PublishKey = "GeneralFtlGeneral";
 
     private static readonly SettingsJsonConverter JsonConverter = new();
 

diff --git a/wwwroot/assets/i18n/en.json b/wwwroot/assets/i18n/en.json
@@ -2,9 +2,9 @@
   "GeneralHeader": "General FTL",
   "ManuallyHeader": "Manually",
 
-  "GFTL_General": "General",
-  "GFTL_Advanced": "Advanced",
-  "GFTL_Settings": "Settings",
+  "GeneralFtlGeneral": "General",
+  "GeneralFtlAdvanced": "Advanced",
+  "GeneralFtlSettings": "Settings",
 
   "PearlPosX": "Pearl X :",
   "PearlPosY": "Pearl Y :",

diff --git a/wwwroot/assets/i18n/es_ES.json b/wwwroot/assets/i18n/es_ES.json
@@ -1,9 +1,9 @@
 {
   "GeneralHeader": "FTL General",
   "ManuallyHeader": "Manual",
-  "GFTL_General": "General",
-  "GFTL_Advanced": "Avanzado",
-  "GFTL_Settings": "Configuración",
+  "GeneralFtlGeneral": "General",
+  "GeneralFtlAdvanced": "Avanzado",
+  "GeneralFtlSettings": "Configuración",
   "PearlPosX": "X Perla :",
   "PearlPosY": "Y Perla :",
   "PearlPosZ": "Z Perla :",

diff --git a/wwwroot/assets/i18n/zh_cn.json b/wwwroot/assets/i18n/zh_cn.json
@@ -2,9 +2,9 @@
   "GeneralHeader": "通用FTL",
   "ManuallyHeader": "自定义FTL",
 
-  "GFTL_General": "一般选项",
-  "GFTL_Advanced": "进阶选项",
-  "GFTL_Settings": "更多基础选项",
+  "GeneralFtlGeneral": "一般选项",
+  "GeneralFtlAdvanced": "进阶选项",
+  "GeneralFtlSettings": "更多基础选项",
 
   "PearlPosX": "珍珠X坐标 :",
   "PearlPosY": "珍珠Y坐标 :",

diff --git a/wwwroot/assets/i18n/zh_tw.json b/wwwroot/assets/i18n/zh_tw.json
@@ -1,9 +1,9 @@
 {
   "GeneralHeader": "通用FTL",
   "ManuallyHeader": "自訂義FTL",
-  "GFTL_General": "一般設定",
-  "GFTL_Advanced": "進階設定",
-  "GFTL_Settings": "更多基礎設定",
+  "GeneralFtlGeneral": "一般設定",
+  "GeneralFtlAdvanced": "進階設定",
+  "GeneralFtlSettings": "更多基礎設定",
   "PearlPosX": "珍珠X座標 :",
   "PearlPosY": "珍珠Y座標 :",
   "PearlPosZ": "珍珠Z座標 :",