From 0a101bafbf61ea2e50d112112d10e53b001c6fa1 Mon Sep 17 00:00:00 2001 From: Paul Hebble Date: Sun, 28 Jun 2020 12:17:46 -0500 Subject: [PATCH 1/3] Be more specific in GUI config parse error --- GUI/Model/GUIConfiguration.cs | 5 ++++- GUI/Properties/Resources.de-DE.resx | 2 +- GUI/Properties/Resources.resx | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/GUI/Model/GUIConfiguration.cs b/GUI/Model/GUIConfiguration.cs index 3cfd7a3d32..8496a9e7bc 100644 --- a/GUI/Model/GUIConfiguration.cs +++ b/GUI/Model/GUIConfiguration.cs @@ -149,7 +149,10 @@ private static GUIConfiguration LoadConfiguration(string path) throw; } - string message = string.Format(Properties.Resources.ConfigurationParseError, path, additionalErrorData); + var fi = new FileInfo(path); + string message = string.Format( + Properties.Resources.ConfigurationParseError, + path, additionalErrorData, fi.Name, fi.DirectoryName); throw new Kraken(message); } } diff --git a/GUI/Properties/Resources.de-DE.resx b/GUI/Properties/Resources.de-DE.resx index 3840a596cf..8236202c9a 100644 --- a/GUI/Properties/Resources.de-DE.resx +++ b/GUI/Properties/Resources.de-DE.resx @@ -129,7 +129,7 @@ {0} (vorherige Version: {1}) Ungültiges Versionsformat Fehler - Fehler beim Versuch, "{0}"{1} zu parsen. Versuche es aus dem Ordner zu verschieben und CKAN neu zu starten. + Fehler beim Versuch, "{0}"{1} zu parsen. Versuche {2} aus {3} zu verschieben und CKAN neu zu starten. Unbekannt {0} (bei Mod-Version {1}) diff --git a/GUI/Properties/Resources.resx b/GUI/Properties/Resources.resx index 0291c59923..cc1e301490 100644 --- a/GUI/Properties/Resources.resx +++ b/GUI/Properties/Resources.resx @@ -158,7 +158,7 @@ {0} (previous game version: {1}) Version has invalid format Error - Error trying to parse "{0}"{1}. Try to move it out of the folder and restart CKAN. + Error trying to parse "{0}"{1}. Try to move {2} out of {3} and restart CKAN. N/A Unknown Method can not be called unless IsCKAN From e4c905acea5270ea97e72fcd1b47eaefa0819d43 Mon Sep 17 00:00:00 2001 From: Paul Hebble Date: Sun, 28 Jun 2020 12:50:55 -0500 Subject: [PATCH 2/3] Replace period with line break --- GUI/Properties/Resources.resx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/GUI/Properties/Resources.resx b/GUI/Properties/Resources.resx index cc1e301490..631c5313e5 100644 --- a/GUI/Properties/Resources.resx +++ b/GUI/Properties/Resources.resx @@ -158,7 +158,8 @@ {0} (previous game version: {1}) Version has invalid format Error - Error trying to parse "{0}"{1}. Try to move {2} out of {3} and restart CKAN. + Error trying to parse "{0}"{1} +Try to move {2} out of {3} and restart CKAN. N/A Unknown Method can not be called unless IsCKAN From 8b4f112a04eea0a08e406cb5d30ef726789ca8ed Mon Sep 17 00:00:00 2001 From: DasSkelett Date: Sun, 28 Jun 2020 19:53:22 +0200 Subject: [PATCH 3/3] Reformat German error message --- GUI/Properties/Resources.de-DE.resx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/GUI/Properties/Resources.de-DE.resx b/GUI/Properties/Resources.de-DE.resx index 8236202c9a..02908fc569 100644 --- a/GUI/Properties/Resources.de-DE.resx +++ b/GUI/Properties/Resources.de-DE.resx @@ -129,7 +129,9 @@ {0} (vorherige Version: {1}) Ungültiges Versionsformat Fehler - Fehler beim Versuch, "{0}"{1} zu parsen. Versuche {2} aus {3} zu verschieben und CKAN neu zu starten. + Fehler beim Parsen von "{0}"{1} + +Versuche {2} aus {3} zu verschieben und CKAN neu zu starten. Unbekannt {0} (bei Mod-Version {1})