ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-15 13:14:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: duplicate string keys, bad localize method

Browse source
This commit is contained in:
goat 2021-09-04 22:27:06 +02:00
parent 1714c641ad
commit b9f72c0d53
No known key found for this signature in database
GPG key ID: F18F057873895461
3 changed files with 3 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Dalamud/Dalamud.cs
View file

@ -371,7 +371,7 @@ namespace Dalamud
/// <summary>
/// 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.
/// </summary>
/// <param name="__instance">The equivalent of `this`.</param>

4
Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs
View file

@ -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!");

13
Dalamud/Localization.cs
View file

@ -51,19 +51,6 @@ namespace Dalamud
/// </summary>
public event LocalizationChangedDelegate LocalizationChanged;
/// <summary>
/// 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.
/// </summary>
/// <param name="key">The string key to be returned.</param>
/// <param name="fallBack">The fallback string, usually your source language.</param>
/// <returns>The localized string, fallback or string key if not found.</returns>
public static string Localize(string key, string fallBack)
{
return Loc.Localize(key, fallBack, Assembly.GetCallingAssembly());
}
/// <summary>
/// Set up the UI language with the users' local UI culture.
/// </summary>