Skip to content

Commit 5ed94c8

Browse files
committed
Resolve conflicts
1 parent 6213193 commit 5ed94c8

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

Flow.Launcher.Core/Plugin/PluginManager.cs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ private static void DeletePythonBinding()
184184
}
185185
catch (Exception e)
186186
{
187-
API.LogDebug(ClassName, $"Failed to delete {binding} in {subDirectory}: {e.Message}");
187+
PublicApi.Instance.LogDebug(ClassName, $"Failed to delete {binding} in {subDirectory}: {e.Message}");
188188
}
189189
}
190190
}
@@ -300,11 +300,8 @@ public static async Task InitializePluginsAsync(IResultUpdateRegister register)
300300
{
301301
var failed = string.Join(",", _initFailedPlugins.Values.Select(x => x.Metadata.Name));
302302
PublicApi.Instance.ShowMsg(
303-
PublicApi.Instance.GetTranslation("failedToInitializePluginsTitle"),
304-
string.Format(
305-
API.GetTranslation("failedToInitializePluginsMessage"),
306-
failed
307-
),
303+
Localize.failedToInitializePluginsTitle(),
304+
Localize.failedToInitializePluginsMessage(failed),
308305
"",
309306
false
310307
);

Flow.Launcher.Core/Resource/Internationalization.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ public static void UpdatePluginMetadataTranslation(PluginPair p)
389389
}
390390
catch (Exception e)
391391
{
392-
API.LogException(ClassName, $"Failed for <{p.Metadata.Name}>", e);
392+
PublicApi.Instance.LogException(ClassName, $"Failed for <{p.Metadata.Name}>", e);
393393
}
394394
}
395395

0 commit comments

Comments
 (0)