Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Be more specific in GUI config parse error #3090

Merged
merged 3 commits into from
Jun 28, 2020
Merged

Be more specific in GUI config parse error #3090

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0a101ba
Be more specific in GUI config parse error
HebaruSan Jun 28, 2020
e4c905a
Replace period with line break
HebaruSan Jun 28, 2020
8b4f112
Reformat German error message
DasSkelett Jun 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion GUI/Model/GUIConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Expand Down
4 changes: 3 additions & 1 deletion GUI/Properties/Resources.de-DE.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,9 @@
<data name="CompatibleKspVersionsDialogVersionDetails" xml:space="preserve"><value>{0} (vorherige Version: {1})</value></data>
<data name="CompatibleKspVersionsDialogInvalidFormat" xml:space="preserve"><value>Ungültiges Versionsformat</value></data>
<data name="CompatibleKspVersionsDialogErrorTitle" xml:space="preserve"><value>Fehler</value></data>
<data name="ConfigurationParseError" xml:space="preserve"><value>Fehler beim Versuch, "{0}"{1} zu parsen. Versuche es aus dem Ordner zu verschieben und CKAN neu zu starten.</value></data>
<data name="ConfigurationParseError" xml:space="preserve"><value>Fehler beim Parsen von "{0}"{1}

Versuche {2} aus {3} zu verschieben und CKAN neu zu starten.</value></data>
<data name="GUIModUnknown" xml:space="preserve"><value>Unbekannt</value></data>
<data name="GUIModKSPCompatibilityLong" xml:space="preserve"><value>{0} (bei Mod-Version {1})</value></data>
<data name="MainAutoUpdateFailed" xml:space="preserve">
Expand Down
3 changes: 2 additions & 1 deletion GUI/Properties/Resources.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,8 @@
<data name="CompatibleKspVersionsDialogVersionDetails" xml:space="preserve"><value>{0} (previous game version: {1})</value></data>
<data name="CompatibleKspVersionsDialogInvalidFormat" xml:space="preserve"><value>Version has invalid format</value></data>
<data name="CompatibleKspVersionsDialogErrorTitle" xml:space="preserve"><value>Error</value></data>
<data name="ConfigurationParseError" xml:space="preserve"><value>Error trying to parse "{0}"{1}. Try to move it out of the folder and restart CKAN.</value></data>
<data name="ConfigurationParseError" xml:space="preserve"><value>Error trying to parse "{0}"{1}
Try to move {2} out of {3} and restart CKAN.</value></data>
<data name="GUIModNSlashA" xml:space="preserve"><value>N/A</value></data>
<data name="GUIModUnknown" xml:space="preserve"><value>Unknown</value></data>
<data name="GUIModMethodNotCKAN" xml:space="preserve"><value>Method can not be called unless IsCKAN</value></data>
Expand Down