From 70b8babb82f68b5ac418b2b912a89376a66912b8 Mon Sep 17 00:00:00 2001 From: Michael Becker Date: Fri, 16 Sep 2022 01:32:41 -0400 Subject: [PATCH] properly init string table entries from actual string table --- .../Localization/StringTable.cs | 14 +++++++------- .../Multimedia/Picture/GIM/GIMDataFormat.cs | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Libraries/UniversalEditor.Core/Localization/StringTable.cs b/Libraries/UniversalEditor.Core/Localization/StringTable.cs index 44e13c69..c5038522 100644 --- a/Libraries/UniversalEditor.Core/Localization/StringTable.cs +++ b/Libraries/UniversalEditor.Core/Localization/StringTable.cs @@ -25,13 +25,13 @@ namespace UniversalEditor.Localization { public static class StringTable { - public static string ApplicationName { get { return Application.Instance.DefaultLanguage.GetStringTableEntry("Application.Title", "Universal Editor"); } } - public static string ErrorDataFormatNotOpen { get; } = "The data format is not open."; + public static string ApplicationName { get { return Application.Instance?.DefaultLanguage?.GetStringTableEntry("Application.Title", null) ?? "Universal Editor"; } } - public static string ErrorDataFormatInvalid { get; } = "The data format is invalid."; - public static string ErrorDataCorrupted { get; } = "The file is corrupted."; - public static string ErrorFileNotFound { get; } = "The file could not be found."; - public static string ErrorNotAnObjectModel { get; } = "The specified type is not an object model."; - public static string ErrorObjectModelNull { get; } = "The object model must not be null."; + public static string ErrorDataFormatNotOpen { get { return Application.Instance?.DefaultLanguage?.GetStringTableEntry("Application.Errors.DataFormatNotOpen", null) ?? "The data format is not open."; } } + public static string ErrorDataFormatInvalid { get { return Application.Instance?.DefaultLanguage?.GetStringTableEntry("Application.Errors.DataFormatInvalid", null) ?? "The data format is invalid."; } } + public static string ErrorDataCorrupted { get { return Application.Instance?.DefaultLanguage?.GetStringTableEntry("Application.Errors.DataCorrupted", null) ?? "The file is corrupted."; } } + public static string ErrorFileNotFound { get { return Application.Instance?.DefaultLanguage?.GetStringTableEntry("Application.Errors.FileNotFound", null) ?? "The file could not be found."; } } + public static string ErrorNotAnObjectModel { get { return Application.Instance?.DefaultLanguage?.GetStringTableEntry("Application.Errors.NotAnObjectModel", null) ?? "The specified type is not an object model."; } } + public static string ErrorObjectModelNull { get { return Application.Instance?.DefaultLanguage?.GetStringTableEntry("Application.Errors.ObjectModelNull", null) ?? "The object model must not be null."; } } } } diff --git a/Plugins/UniversalEditor.Plugins.Multimedia/DataFormats/Multimedia/Picture/GIM/GIMDataFormat.cs b/Plugins/UniversalEditor.Plugins.Multimedia/DataFormats/Multimedia/Picture/GIM/GIMDataFormat.cs index b45bcc36..1c71e765 100644 --- a/Plugins/UniversalEditor.Plugins.Multimedia/DataFormats/Multimedia/Picture/GIM/GIMDataFormat.cs +++ b/Plugins/UniversalEditor.Plugins.Multimedia/DataFormats/Multimedia/Picture/GIM/GIMDataFormat.cs @@ -76,7 +76,7 @@ namespace UniversalEditor.DataFormats.Multimedia.Picture.GIM _dfr.ExportOptions.SettingsGroups[0].Settings.Add(new TextSetting(nameof(OriginalFileName), "Original _filename")); _dfr.ExportOptions.SettingsGroups[0].Settings.Add(new TextSetting(nameof(CreationUserName), "Creation _user")); - _dfr.ExportOptions.SettingsGroups[0].Settings.Add(new TextSetting(nameof(CreationApplication), "_Application name", "Universal Editor")); + _dfr.ExportOptions.SettingsGroups[0].Settings.Add(new TextSetting(nameof(CreationApplication), "_Application name", MBS.Framework.Application.Instance.Title)); } return _dfr; }