From b9f72c0d531777e40e3602060ba126ee8900f10d Mon Sep 17 00:00:00 2001
From: goat <16760685+goaaats@users.noreply.github.com>
Date: Sat, 4 Sep 2021 22:27:06 +0200
Subject: [PATCH] fix: duplicate string keys, bad localize method
---
Dalamud/Dalamud.cs | 2 +-
.../Internal/Windows/PluginInstallerWindow.cs | 4 ++--
Dalamud/Localization.cs | 13 -------------
3 files changed, 3 insertions(+), 16 deletions(-)
diff --git a/Dalamud/Dalamud.cs b/Dalamud/Dalamud.cs
index 15c5c8cda..c429f3f33 100644
--- a/Dalamud/Dalamud.cs
+++ b/Dalamud/Dalamud.cs
@@ -371,7 +371,7 @@ namespace Dalamud
///
/// Patch method for the class Process.Handle. This patch facilitates fixing Reloaded so that it
- /// uses pseudo-handles to access memory, to prevent permission errors.
+ /// uses pseudo-handles to access memory, to prevent permission errors.
/// It should never be called manually.
///
/// The equivalent of `this`.
diff --git a/Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs b/Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs
index 076a47836..afaf3e80f 100644
--- a/Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs
+++ b/Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs
@@ -1927,7 +1927,7 @@ namespace Dalamud.Interface.Internal.Windows
public static string PluginContext_DeletePluginConfig => Loc.Localize("InstallerDeletePluginConfig", "Reset plugin");
- public static string PluginContext_DeletePluginConfigReload => Loc.Localize("InstallerDeletePluginConfig", "Reset plugin settings & reload");
+ public static string PluginContext_DeletePluginConfigReload => Loc.Localize("InstallerDeletePluginConfigReload", "Reset plugin settings & reload");
#endregion
@@ -1991,7 +1991,7 @@ namespace Dalamud.Interface.Internal.Windows
public static string Notifications_PluginNotInstalledTitle => Loc.Localize("NotificationsPluginNotInstalledTitle", "Plugin not installed!");
- public static string Notifications_PluginNotInstalled(string name) => Loc.Localize("NotificationsPluginInstalled", "'{0}' failed to install.").Format(name);
+ public static string Notifications_PluginNotInstalled(string name) => Loc.Localize("NotificationsPluginNotInstalled", "'{0}' failed to install.").Format(name);
public static string Notifications_NoUpdatesFoundTitle => Loc.Localize("NotificationsNoUpdatesFoundTitle", "No updates found!");
diff --git a/Dalamud/Localization.cs b/Dalamud/Localization.cs
index df4ac0189..9f35e5afb 100644
--- a/Dalamud/Localization.cs
+++ b/Dalamud/Localization.cs
@@ -51,19 +51,6 @@ namespace Dalamud
///
public event LocalizationChangedDelegate LocalizationChanged;
- ///
- /// Search the set-up localization data for the provided assembly for the given string key and return it.
- /// If the key is not present, the fallback is shown.
- /// The fallback is also required to create the string files to be localized.
- ///
- /// The string key to be returned.
- /// The fallback string, usually your source language.
- /// The localized string, fallback or string key if not found.
- public static string Localize(string key, string fallBack)
- {
- return Loc.Localize(key, fallBack, Assembly.GetCallingAssembly());
- }
-
///
/// Set up the UI language with the users' local UI culture.
///