Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-10-28 15:02:35 +01:00
Code Issues Projects Releases Wiki Activity

Use Language.Name in changeLanguageToolStripMenuItem.Text

Browse Source
This commit is contained in:
Waldi Ravens 2015-08-24 16:02:55 +02:00
parent 05a05d0006
commit ce917aae67
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/Forms/Main.cs
View File

@ -1153,15 +1153,7 @@ namespace Nikse.SubtitleEdit.Forms
optionsToolStripMenuItem.Text = _language.Menu.Options.Title; optionsToolStripMenuItem.Text = _language.Menu.Options.Title;
settingsToolStripMenuItem.Text = _language.Menu.Options.Settings; settingsToolStripMenuItem.Text = _language.Menu.Options.Settings;
changeLanguageToolStripMenuItem.Text = _language.Menu.Options.ChooseLanguage; changeLanguageToolStripMenuItem.Text = _language.Menu.Options.ChooseLanguage + " [" + Configuration.Settings.Language.Name + "]";
try
{
var ci = System.Globalization.CultureInfo.GetCultureInfo(_languageGeneral.CultureName);
changeLanguageToolStripMenuItem.Text += " [" + ci.NativeName + "]";
}
catch
{
}
toolStripMenuItemNetworking.Text = _language.Menu.Networking.Title; toolStripMenuItemNetworking.Text = _language.Menu.Networking.Title;
startServerToolStripMenuItem.Text = _language.Menu.Networking.StartNewSession; startServerToolStripMenuItem.Text = _language.Menu.Networking.StartNewSession;
@ -2581,7 +2573,7 @@ namespace Nikse.SubtitleEdit.Forms
MessageBox.Show(this, errors, Title, MessageBoxButtons.OK, MessageBoxIcon.Warning); MessageBox.Show(this, errors, Title, MessageBoxButtons.OK, MessageBoxIcon.Warning);
errors = (format as AdvancedSubStationAlpha).Errors; errors = (format as AdvancedSubStationAlpha).Errors;
if (!string.IsNullOrEmpty(errors)) if (!string.IsNullOrEmpty(errors))
MessageBox.Show(errors, Title, MessageBoxButtons.OK, MessageBoxIcon.Warning); MessageBox.Show(this, errors, Title, MessageBoxButtons.OK, MessageBoxIcon.Warning);
} }
else if (format.GetType() == typeof(SubRip)) else if (format.GetType() == typeof(SubRip))
{ {
@ -9100,7 +9092,7 @@ namespace Nikse.SubtitleEdit.Forms
if (noOfErrors > 0) if (noOfErrors > 0)
{ {
MessageBox.Show(string.Format("{0} error(s) occured during extraction of bdsup\r\n\r\n{1}", noOfErrors, lastError)); MessageBox.Show(string.Format("{0} error(s) occurred during extraction of bdsup\r\n\r\n{1}", noOfErrors, lastError));
} }
using (var formSubOcr = new VobSubOcr()) using (var formSubOcr = new VobSubOcr())
@ -11760,11 +11752,13 @@ namespace Nikse.SubtitleEdit.Forms
_language = Configuration.Settings.Language.Main; _language = Configuration.Settings.Language.Main;
InitializeLanguage(); InitializeLanguage();
} }
catch (Exception exception) catch (Exception ex)
{ {
MessageBox.Show(exception.Message + Environment.NewLine + var cap = "Language file load error";
Environment.NewLine + var msg = "Could not load language file " + cultureName + ".xml" +
exception.StackTrace, "Error loading language file"); "\n\nError Message:\n" + ex.Message +
"\n\nStack Trace:\n" + ex.StackTrace;
MessageBox.Show(this, msg, cap);
Configuration.Settings.Language = new Language(); // default is en-US Configuration.Settings.Language = new Language(); // default is en-US
Configuration.Settings.General.Language = null; Configuration.Settings.General.Language = null;
_languageGeneral = Configuration.Settings.Language.General; _languageGeneral = Configuration.Settings.Language.General;