Skip to content
This repository was archived by the owner on Sep 11, 2023. It is now read-only.

Commit 5747d2d

Browse files
maxijabasemaxijabase
committed
GetLanguage to Get
1 parent a7f7ae7 commit 5747d2d

22 files changed

+321
-329
lines changed

‎Interop/TranslationProvider.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public class TranslationProvider
2222
/// </summary>
2323
/// <param name="phrase">The phrase to return translated</param>
2424
/// <returns></returns>
25-
public string GetLanguage(string phrase)
25+
public string Get(string phrase)
2626
{
2727
return language.ContainsKey(phrase) ? language[phrase] : string.Empty;
2828
}

‎Interop/Updater/UpdateWindow.xaml.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,11 @@ public void PrepareUpdateWindow(bool OnlyChangelog = false)
8282
}
8383
else
8484
{
85-
Title = string.Format(Program.Translations.GetLanguage("VersionAvailable"), updateInfo.AllReleases[0].TagName);
86-
MainLine.Text = Program.Translations.GetLanguage("WantToUpdate");
87-
ActionYesButton.Content = Program.Translations.GetLanguage("Yes");
88-
ActionNoButton.Content = Program.Translations.GetLanguage("No");
89-
ActionGithubButton.Content = Program.Translations.GetLanguage("ViewGithub");
85+
Title = string.Format(Program.Translations.Get("VersionAvailable"), updateInfo.AllReleases[0].TagName);
86+
MainLine.Text = Program.Translations.Get("WantToUpdate");
87+
ActionYesButton.Content = Program.Translations.Get("Yes");
88+
ActionNoButton.Content = Program.Translations.Get("No");
89+
ActionGithubButton.Content = Program.Translations.Get("ViewGithub");
9090
}
9191

9292
var releasesBody = new StringBuilder();
@@ -126,8 +126,8 @@ private void StartUpdate()
126126
ActionNoButton.Visibility = Visibility.Hidden;
127127
ActionGithubButton.Visibility = Visibility.Hidden;
128128
Icon.Visibility = Visibility.Hidden;
129-
MainLine.Text = string.Format(Program.Translations.GetLanguage("UpdatingTo"), updateInfo.AllReleases[0].TagName);
130-
SubLine.Text = Program.Translations.GetLanguage("DownloadingUpdater");
129+
MainLine.Text = string.Format(Program.Translations.Get("UpdatingTo"), updateInfo.AllReleases[0].TagName);
130+
SubLine.Text = Program.Translations.Get("DownloadingUpdater");
131131
var t = new Thread(UpdateDownloadWorker);
132132
t.Start();
133133
}
@@ -166,7 +166,7 @@ private void UpdateDownloadWorker()
166166
/// </summary>
167167
private void FinalizeUpdate()
168168
{
169-
SubLine.Text = Program.Translations.GetLanguage("StartingUpdater");
169+
SubLine.Text = Program.Translations.Get("StartingUpdater");
170170
UpdateLayout();
171171
try
172172
{

‎UI/Components/DASMElement/DASMElement.xaml.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ private void LoadFile(FileInfo fInfo)
4545
}
4646
catch (Exception e)
4747
{
48-
detailbox_.Text = Program.Translations.GetLanguage("ErrorFileLoadProc") + Environment.NewLine + Environment.NewLine + $"{Program.Translations.GetLanguage("Details")}: " + e.Message;
48+
detailbox_.Text = Program.Translations.Get("ErrorFileLoadProc") + Environment.NewLine + Environment.NewLine + $"{Program.Translations.Get("Details")}: " + e.Message;
4949
return;
5050
}
5151
RenderFile();
@@ -308,7 +308,7 @@ private void RenderCodeView(SmxCodeV1Section code, string name, int address)
308308
}
309309
catch (Exception e)
310310
{
311-
AddDetailLine(Program.Translations.GetLanguage("NotDissMethod"), name, e.Message);
311+
AddDetailLine(Program.Translations.Get("NotDissMethod"), name, e.Message);
312312
EndDetailUpdate();
313313
return;
314314
}

‎UI/Components/EditorElement/EditorElement.xaml.cs‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -239,9 +239,9 @@ private void FileWatcher_Changed(object sender, FileSystemEventArgs e)
239239
if (_NeedsSave)
240240
{
241241
var result = MessageBox.Show(
242-
string.Format(Program.Translations.GetLanguage("DFileChanged"), _FullFilePath) +
243-
Environment.NewLine + Program.Translations.GetLanguage("FileTryReload"),
244-
Program.Translations.GetLanguage("FileChanged"), MessageBoxButton.YesNo,
242+
string.Format(Program.Translations.Get("DFileChanged"), _FullFilePath) +
243+
Environment.NewLine + Program.Translations.Get("FileTryReload"),
244+
Program.Translations.Get("FileChanged"), MessageBoxButton.YesNo,
245245
MessageBoxImage.Asterisk);
246246
reloadFile = result == MessageBoxResult.Yes;
247247
}
@@ -338,8 +338,8 @@ private void Editor_TextChanged(object sender, EventArgs e)
338338

339339
private void Caret_PositionChanged(object sender, EventArgs e)
340340
{
341-
StatusLine_Column.Text = $"{Program.Translations.GetLanguage("ColAbb")} {editor.TextArea.Caret.Column}";
342-
StatusLine_Line.Text = $"{Program.Translations.GetLanguage("LnAbb")} {editor.TextArea.Caret.Line}";
341+
StatusLine_Column.Text = $"{Program.Translations.Get("ColAbb")} {editor.TextArea.Caret.Column}";
342+
StatusLine_Line.Text = $"{Program.Translations.Get("LnAbb")} {editor.TextArea.Caret.Line}";
343343
#if DEBUG
344344
StatusLine_Offset.Text = $"Off {editor.TextArea.Caret.Offset}";
345345
#endif
@@ -533,7 +533,7 @@ private void TextArea_TextEntering(object sender, TextCompositionEventArgs e)
533533

534534
private void TextArea_SelectionChanged(object sender, EventArgs e)
535535
{
536-
StatusLine_SelectionLength.Text = $"{Program.Translations.GetLanguage("LenAbb")} {editor.SelectionLength}";
536+
StatusLine_SelectionLength.Text = $"{Program.Translations.Get("LenAbb")} {editor.SelectionLength}";
537537
}
538538

539539
private void PrevMouseWheel(object sender, MouseWheelEventArgs e)
@@ -719,7 +719,7 @@ public void UpdateFontSize(double size, bool updateLineHeight = true)
719719
if (size > 2 && size < 31)
720720
{
721721
editor.FontSize = size;
722-
StatusLine_FontSize.Text = size.ToString("n0") + $" {Program.Translations.GetLanguage("PtAbb")}";
722+
StatusLine_FontSize.Text = size.ToString("n0") + $" {Program.Translations.Get("PtAbb")}";
723723
}
724724

725725
if (updateLineHeight)
@@ -749,7 +749,7 @@ public async void Close(bool ForcedToSave = false, bool CheckSavings = true)
749749
}
750750
else
751751
{
752-
var title = $"{Program.Translations.GetLanguage("SavingFile")} '" + Parent.Title.Trim('*') +
752+
var title = $"{Program.Translations.Get("SavingFile")} '" + Parent.Title.Trim('*') +
753753
"'";
754754
var Result = await Program.MainWindow.ShowMessageAsync(title, "",
755755
MessageDialogStyle.AffirmativeAndNegative, Program.MainWindow.MetroDialogOptions);
@@ -933,8 +933,8 @@ public void Save(bool force = false)
933933
catch (Exception e)
934934
{
935935
MessageBox.Show(Program.MainWindow,
936-
Program.Translations.GetLanguage("DSaveError") + Environment.NewLine + "(" + e.Message + ")",
937-
Program.Translations.GetLanguage("SaveError"),
936+
Program.Translations.Get("DSaveError") + Environment.NewLine + "(" + e.Message + ")",
937+
Program.Translations.Get("SaveError"),
938938
MessageBoxButton.OK, MessageBoxImage.Error);
939939
return;
940940
}
@@ -968,20 +968,20 @@ public void Language_Translate(bool Initial = false)
968968
return;
969969
}
970970

971-
MenuC_Undo.Header = Program.Translations.GetLanguage("Undo");
972-
MenuC_Redo.Header = Program.Translations.GetLanguage("Redo");
973-
MenuC_Cut.Header = Program.Translations.GetLanguage("Cut");
974-
MenuC_Copy.Header = Program.Translations.GetLanguage("Copy");
975-
MenuC_Paste.Header = Program.Translations.GetLanguage("Paste");
976-
MenuC_SelectAll.Header = Program.Translations.GetLanguage("SelectAll");
977-
CompileBox.Content = Program.Translations.GetLanguage("Compile");
971+
MenuC_Undo.Header = Program.Translations.Get("Undo");
972+
MenuC_Redo.Header = Program.Translations.Get("Redo");
973+
MenuC_Cut.Header = Program.Translations.Get("Cut");
974+
MenuC_Copy.Header = Program.Translations.Get("Copy");
975+
MenuC_Paste.Header = Program.Translations.Get("Paste");
976+
MenuC_SelectAll.Header = Program.Translations.Get("SelectAll");
977+
CompileBox.Content = Program.Translations.Get("Compile");
978978
if (!Initial)
979979
{
980980
StatusLine_Column.Text =
981-
$"{Program.Translations.GetLanguage("ColAbb")} {editor.TextArea.Caret.Column}";
982-
StatusLine_Line.Text = $"{Program.Translations.GetLanguage("LnAbb")} {editor.TextArea.Caret.Line}";
981+
$"{Program.Translations.Get("ColAbb")} {editor.TextArea.Caret.Column}";
982+
StatusLine_Line.Text = $"{Program.Translations.Get("LnAbb")} {editor.TextArea.Caret.Line}";
983983
StatusLine_FontSize.Text =
984-
editor.FontSize.ToString("n0") + $" {Program.Translations.GetLanguage("PtAbb")}";
984+
editor.FontSize.ToString("n0") + $" {Program.Translations.Get("PtAbb")}";
985985
}
986986
}
987987
#endregion

‎UI/MainWindow/MainWindow.xaml.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@ public partial class MainWindow
4141

4242
private ObservableCollection<string> ActionButtonDict = new()
4343
{
44-
Program.Translations.GetLanguage("Copy"),
45-
Program.Translations.GetLanguage("UploadFTP"),
46-
Program.Translations.GetLanguage("StartServer")
44+
Program.Translations.Get("Copy"),
45+
Program.Translations.Get("UploadFTP"),
46+
Program.Translations.Get("StartServer")
4747
};
4848

4949
private ObservableCollection<string> CompileButtonDict = new()
5050
{
51-
Program.Translations.GetLanguage("CompileAll"),
52-
Program.Translations.GetLanguage("CompileCurrent")
51+
Program.Translations.Get("CompileAll"),
52+
Program.Translations.Get("CompileCurrent")
5353
};
5454
#endregion
5555

@@ -200,9 +200,9 @@ private async void MetroWindow_Closing(object sender, CancelEventArgs e)
200200
// Build dialog buttons
201201
var closeMetroDialogOptions = new MetroDialogSettings()
202202
{
203-
AffirmativeButtonText = Program.Translations.GetLanguage("Yes"),
204-
NegativeButtonText = Program.Translations.GetLanguage("No"),
205-
FirstAuxiliaryButtonText = Program.Translations.GetLanguage("Cancel"),
203+
AffirmativeButtonText = Program.Translations.Get("Yes"),
204+
NegativeButtonText = Program.Translations.Get("No"),
205+
FirstAuxiliaryButtonText = Program.Translations.Get("Cancel"),
206206
AnimateHide = false,
207207
AnimateShow = false,
208208
DefaultButtonFocus = MessageDialogResult.SecondAuxiliary
@@ -460,7 +460,7 @@ public void UpdateWindowTitle()
460460

461461
if (ServerIsRunning)
462462
{
463-
outString = $"{outString} | {Program.Translations.GetLanguage("ServerRunning")}";
463+
outString = $"{outString} | {Program.Translations.Get("ServerRunning")}";
464464
}
465465

466466
Title = outString;

0 commit comments

Comments
 (0)