Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-11-22 19:22:53 +01:00
Code Issues Projects Releases Wiki Activity

Minor fixes (Forms/Main)

Browse Source 
- InitializeLanguage: update label texts in textBoxListViewText and textBoxListViewTextAlternate
- SetLanguage: always set Configuration.Settings.General.Language to correct culture name
This commit is contained in:
Waldi Ravens 2016-04-11 21:34:13 +02:00
parent 91e57006bb
commit 55333553cb
2 changed files with 31 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Forms/ChooseLanguage.cs
View File

@ -43,7 +43,7 @@ namespace Nikse.SubtitleEdit.Forms
public bool Equals(TranslationInfo ti) public bool Equals(TranslationInfo ti)
{ {
return (ti != null) ? CultureName.Equals(ti.CultureName, StringComparison.OrdinalIgnoreCase) : false; return !ReferenceEquals(ti, null) && CultureName.Equals(ti.CultureName, StringComparison.OrdinalIgnoreCase);
} }
public override bool Equals(Object obj) public override bool Equals(Object obj)
@ -84,6 +84,7 @@ namespace Nikse.SubtitleEdit.Forms
if (currentLanguage == null) if (currentLanguage == null)
{ {
CurrentTranslation = new TranslationInfo(CultureInfo.CurrentUICulture.Name, CultureInfo.CurrentUICulture.NativeName); CurrentTranslation = new TranslationInfo(CultureInfo.CurrentUICulture.Name, CultureInfo.CurrentUICulture.NativeName);
Configuration.Settings.Language = defaultLanguage;
} }
else else
{ {

56
src/Forms/Main.cs
View File

@ -1273,13 +1273,15 @@ namespace Nikse.SubtitleEdit.Forms
SubtitleListview1.InitializeLanguage(_languageGeneral, Configuration.Settings); SubtitleListview1.InitializeLanguage(_languageGeneral, Configuration.Settings);
toolStripLabelSubtitleFormat.Text = _language.Controls.SubtitleFormat; toolStripLabelSubtitleFormat.Text = _language.Controls.SubtitleFormat;
toolStripLabelEncoding.Text = _language.Controls.FileEncoding; toolStripLabelEncoding.Text = _language.Controls.FileEncoding;
tabControlSubtitle.TabPages[0].Text = _language.Controls.ListView;
tabControlSubtitle.TabPages[1].Text = _language.Controls.SourceView;
labelDuration.Text = _languageGeneral.Duration;
labelStartTime.Text = _languageGeneral.StartTime;
labelText.Text = _languageGeneral.Text;
labelAlternateText.Text = _languageGeneral.OriginalText;
toolStripLabelFrameRate.Text = _languageGeneral.FrameRate; toolStripLabelFrameRate.Text = _languageGeneral.FrameRate;
tabControlSubtitle.TabPages[TabControlSourceView].Text = _language.Controls.SourceView;
tabControlSubtitle.TabPages[TabControlListView].Text = _language.Controls.ListView;
labelStartTime.Text = _languageGeneral.StartTime;
labelDuration.Text = _languageGeneral.Duration;
labelText.Text = _languageGeneral.Text;
UpdateListViewTextInfo(labelTextLineLengths, labelSingleLine, labelTextLineTotal, labelCharactersPerSecond, _subtitle?.GetParagraphOrDefault(_subtitleListViewIndex), textBoxListViewText);
labelAlternateText.Text = _languageGeneral.OriginalText;
UpdateListViewTextInfo(labelTextAlternateLineLengths, labelAlternateSingleLine, labelTextAlternateLineTotal, labelAlternateCharactersPerSecond, _subtitleAlternate?.GetParagraphOrDefault(_subtitleListViewIndex), textBoxListViewTextAlternate);
buttonPrevious.Text = _language.Controls.Previous; buttonPrevious.Text = _language.Controls.Previous;
buttonNext.Text = _language.Controls.Next; buttonNext.Text = _language.Controls.Next;
buttonAutoBreak.Text = _language.Controls.AutoBreak; buttonAutoBreak.Text = _language.Controls.AutoBreak;
@ -3930,7 +3932,7 @@ namespace Nikse.SubtitleEdit.Forms
private void ShowSourceLineNumber() private void ShowSourceLineNumber()
{ {
if (tabControlSubtitle.SelectedIndex == TabControlSourceView) if (tabControlSubtitle.SelectedIndex == TabControlSourceView)
{ {
toolStripSelected.Text = string.Format(_language.LineNumberX, textBoxSource.GetLineFromCharIndex(textBoxSource.SelectionStart) + 1); toolStripSelected.Text = string.Format(_language.LineNumberX, textBoxSource.GetLineFromCharIndex(textBoxSource.SelectionStart) + 1);
} }
} }
@ -11953,34 +11955,34 @@ namespace Nikse.SubtitleEdit.Forms
private void SetLanguage(string cultureName) private void SetLanguage(string cultureName)
{ {
try if (string.IsNullOrEmpty(cultureName))
{ {
if (string.IsNullOrEmpty(cultureName) || cultureName == "en-US") cultureName = "en-US";
{ }
Configuration.Settings.Language = new Language(); // default is en-US if (cultureName != "en-US")
} {
else try
{ {
Configuration.Settings.Language = Language.Load(Path.Combine(Configuration.BaseDirectory, "Languages", cultureName + ".xml")); Configuration.Settings.Language = Language.Load(Path.Combine(Configuration.BaseDirectory, "Languages", cultureName + ".xml"));
} }
Configuration.Settings.General.Language = cultureName; catch (Exception ex)
_languageGeneral = Configuration.Settings.Language.General; {
_language = Configuration.Settings.Language.Main; var cap = "Language file load error";
InitializeLanguage(); var msg = "Could not load language file " + cultureName + ".xml" +
"\n\nError Message:\n" + ex.Message +
"\n\nStack Trace:\n" + ex.StackTrace;
MessageBox.Show(this, msg, cap);
cultureName = "en-US";
}
} }
catch (Exception ex) if (cultureName == "en-US")
{ {
var cap = "Language file load error";
var msg = "Could not load language file " + cultureName + ".xml" +
"\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;
_languageGeneral = Configuration.Settings.Language.General;
_language = Configuration.Settings.Language.Main;
InitializeLanguage();
} }
Configuration.Settings.General.Language = cultureName;
_languageGeneral = Configuration.Settings.Language.General;
_language = Configuration.Settings.Language.Main;
InitializeLanguage();
} }
private void ToolStripMenuItemCompareClick(object sender, EventArgs e) private void ToolStripMenuItemCompareClick(object sender, EventArgs e)