From 256494e858e524e4bce917ac07ee0d2721e94e21 Mon Sep 17 00:00:00 2001 From: Anna Date: Sun, 6 Feb 2022 04:11:36 -0500 Subject: [PATCH] chore: use placeholders for all plugin name references --- ChatTwo/Plugin.cs | 4 +++- ChatTwo/Resources/Language.Designer.cs | 12 ++++++------ ChatTwo/Resources/Language.resx | 12 ++++++------ ChatTwo/Ui/SettingsTabs/Display.cs | 24 ++++++++++++++++++++---- ChatTwo/Ui/SettingsTabs/Fonts.cs | 4 ++-- 5 files changed, 37 insertions(+), 19 deletions(-) diff --git a/ChatTwo/Plugin.cs b/ChatTwo/Plugin.cs index 5c05e58..e00a130 100755 --- a/ChatTwo/Plugin.cs +++ b/ChatTwo/Plugin.cs @@ -17,7 +17,9 @@ namespace ChatTwo; // ReSharper disable once ClassNeverInstantiated.Global public sealed class Plugin : IDalamudPlugin { - public string Name => "Chat 2"; + internal const string PluginName = "Chat 2"; + + public string Name => PluginName; [PluginService] internal DalamudPluginInterface Interface { get; init; } diff --git a/ChatTwo/Resources/Language.Designer.cs b/ChatTwo/Resources/Language.Designer.cs index f1a04ca..a769ad2 100755 --- a/ChatTwo/Resources/Language.Designer.cs +++ b/ChatTwo/Resources/Language.Designer.cs @@ -277,7 +277,7 @@ namespace ChatTwo.Resources { } /// - /// Looks up a localized string similar to The font Chat 2 will use to display non-Japanese text.. + /// Looks up a localized string similar to The font {0} will use to display non-Japanese text.. /// internal static string Options_Font_Description { get { @@ -340,7 +340,7 @@ namespace ChatTwo.Resources { } /// - /// Looks up a localized string similar to Hide Chat 2 during cutscenes.. + /// Looks up a localized string similar to Hide {0} during cutscenes.. /// internal static string Options_HideDuringCutscenes_Description { get { @@ -358,7 +358,7 @@ namespace ChatTwo.Resources { } /// - /// Looks up a localized string similar to Hide the chat when you are not logged in to a character.. + /// Looks up a localized string similar to Hide {0} when you are not logged in to a character.. /// internal static string Options_HideWhenNotLoggedIn_Description { get { @@ -376,7 +376,7 @@ namespace ChatTwo.Resources { } /// - /// Looks up a localized string similar to The font Chat 2 will use to display Japanese text.. + /// Looks up a localized string similar to The font {0} will use to display Japanese text.. /// internal static string Options_JapaneseFont_Description { get { @@ -421,7 +421,7 @@ namespace ChatTwo.Resources { } /// - /// Looks up a localized string similar to Show in-game item tooltips when hovering over items in Chat 2.. + /// Looks up a localized string similar to Show in-game item tooltips when hovering over items in {0}.. /// internal static string Options_NativeItemTooltips_Description { get { @@ -484,7 +484,7 @@ namespace ChatTwo.Resources { } /// - /// Looks up a localized string similar to Show tabs in Chat 2 as a sidebar instead of a bar at the top.. + /// Looks up a localized string similar to Show tabs in {0} as a sidebar instead of a bar at the top.. /// internal static string Options_SidebarTabView_Description { get { diff --git a/ChatTwo/Resources/Language.resx b/ChatTwo/Resources/Language.resx index 77fca28..83c455e 100755 --- a/ChatTwo/Resources/Language.resx +++ b/ChatTwo/Resources/Language.resx @@ -132,19 +132,19 @@ Hide chat during cutscenes - Hide Chat 2 during cutscenes. + Hide {0} during cutscenes. Show native item tooltips - Show in-game item tooltips when hovering over items in Chat 2. + Show in-game item tooltips when hovering over items in {0}. Show tabs in a sidebar - Show tabs in Chat 2 as a sidebar instead of a bar at the top. + Show tabs in {0} as a sidebar instead of a bar at the top. Use modern timestamp layout @@ -327,13 +327,13 @@ Japanese font - The font Chat 2 will use to display non-Japanese text. + The font {0} will use to display non-Japanese text. Using certain system fonts may crash your game. You have been warned. - The font Chat 2 will use to display Japanese text. + The font {0} will use to display Japanese text. Special @@ -357,6 +357,6 @@ Hide when not logged in - Hide the chat when you are not logged in to a character. + Hide {0} when you are not logged in to a character. diff --git a/ChatTwo/Ui/SettingsTabs/Display.cs b/ChatTwo/Ui/SettingsTabs/Display.cs index eba5aa1..a87be0c 100755 --- a/ChatTwo/Ui/SettingsTabs/Display.cs +++ b/ChatTwo/Ui/SettingsTabs/Display.cs @@ -19,16 +19,32 @@ internal sealed class Display : ISettingsTab { ImGuiUtil.OptionCheckbox(ref this.Mutable.HideChat, Language.Options_HideChat_Name, Language.Options_HideChat_Description); ImGui.Spacing(); - ImGuiUtil.OptionCheckbox(ref this.Mutable.HideDuringCutscenes, Language.Options_HideDuringCutscenes_Name, Language.Options_HideDuringCutscenes_Description); + ImGuiUtil.OptionCheckbox( + ref this.Mutable.HideDuringCutscenes, + Language.Options_HideDuringCutscenes_Name, + string.Format(Language.Options_HideDuringCutscenes_Description, Plugin.PluginName) + ); ImGui.Spacing(); - ImGuiUtil.OptionCheckbox(ref this.Mutable.HideWhenNotLoggedIn, Language.Options_HideWhenNotLoggedIn_Name, Language.Options_HideWhenNotLoggedIn_Description); + ImGuiUtil.OptionCheckbox( + ref this.Mutable.HideWhenNotLoggedIn, + Language.Options_HideWhenNotLoggedIn_Name, + string.Format(Language.Options_HideWhenNotLoggedIn_Description, Plugin.PluginName) + ); ImGui.Spacing(); - ImGuiUtil.OptionCheckbox(ref this.Mutable.NativeItemTooltips, Language.Options_NativeItemTooltips_Name, Language.Options_NativeItemTooltips_Description); + ImGuiUtil.OptionCheckbox( + ref this.Mutable.NativeItemTooltips, + Language.Options_NativeItemTooltips_Name, + string.Format(Language.Options_NativeItemTooltips_Description, Plugin.PluginName) + ); ImGui.Spacing(); - ImGuiUtil.OptionCheckbox(ref this.Mutable.SidebarTabView, Language.Options_SidebarTabView_Name, Language.Options_SidebarTabView_Description); + ImGuiUtil.OptionCheckbox( + ref this.Mutable.SidebarTabView, + Language.Options_SidebarTabView_Name, + string.Format(Language.Options_SidebarTabView_Description, Plugin.PluginName) + ); ImGui.Spacing(); ImGuiUtil.OptionCheckbox(ref this.Mutable.PrettierTimestamps, Language.Options_PrettierTimestamps_Name, Language.Options_PrettierTimestamps_Description); diff --git a/ChatTwo/Ui/SettingsTabs/Fonts.cs b/ChatTwo/Ui/SettingsTabs/Fonts.cs index 22194f6..ecea48d 100755 --- a/ChatTwo/Ui/SettingsTabs/Fonts.cs +++ b/ChatTwo/Ui/SettingsTabs/Fonts.cs @@ -54,7 +54,7 @@ public class Fonts : ISettingsTab { ImGui.EndCombo(); } - ImGuiUtil.HelpText(Language.Options_Font_Description); + ImGuiUtil.HelpText(string.Format(Language.Options_Font_Description, Plugin.PluginName)); ImGuiUtil.WarningText(Language.Options_Font_Warning); ImGui.Spacing(); @@ -84,7 +84,7 @@ public class Fonts : ISettingsTab { ImGui.EndCombo(); } - ImGuiUtil.HelpText(Language.Options_JapaneseFont_Description); + ImGuiUtil.HelpText(string.Format(Language.Options_JapaneseFont_Description, Plugin.PluginName)); ImGui.Spacing(); const float speed = .0125f;