Skip to content

Commit e3c6dec

Browse files
committed
* Fixed translation issue
* Fixed LanguageManager issue
1 parent 2dec074 commit e3c6dec

File tree

3 files changed

+14
-4
lines changed

3 files changed

+14
-4
lines changed

DeadLock/Forms/FrmMain.cs

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,12 @@ namespace DeadLock.Forms
1919
public partial class FrmMain : MetroForm
2020
{
2121
#region Variables
22+
2223
private readonly LanguageManager _languageManager;
2324
private Update _update;
2425

2526
private readonly string[] _args;
27+
2628
#endregion
2729

2830
/// <summary>
@@ -50,7 +52,14 @@ public FrmMain(string[] args)
5052
}
5153
else
5254
{
53-
_languageManager.LoadLanguage(Properties.Settings.Default.Language);
55+
try
56+
{
57+
_languageManager.LoadLanguage(Properties.Settings.Default.Language);
58+
}
59+
catch (Exception)
60+
{
61+
_languageManager.LoadLanguage(1);
62+
}
5463
}
5564
LanguageSwitch();
5665

DeadLock/Forms/FrmSettings.Designer.cs

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

DeadLock/Resources/Languages/eng.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
<BtnLicense>License</BtnLicense>
6969
<LblGeneral>General</LblGeneral>
7070
<ChbAutoUpdate>Automatically check for updates:</ChbAutoUpdate>
71-
<ChbShowNotifyIcon>Show notifyicon:</ChbShowNotifyIcon>
71+
<ChbShowNotifyIcon>Show notify icon:</ChbShowNotifyIcon>
7272
<ChbStartMinimized>Start minimized:</ChbStartMinimized>
7373
<ChbShowAdminWarning>Show administrator warning:</ChbShowAdminWarning>
7474
<LblAppearance>Appearance</LblAppearance>

0 commit comments

Comments
 (0)