From d93cdaef0ef6fefb5f65c20485a5a9b254a938ab Mon Sep 17 00:00:00 2001 From: Brett Hewitson Date: Fri, 14 Jan 2022 17:04:59 +1000 Subject: [PATCH] Server manager language will default to the computers language setting on first start, if possible. Translation file updated --- src/ARKServerManager/App.xaml.cs | 34 ++++++++++-------- .../Globalization/pt-BR/pt-BR.xaml | 9 ++--- src/ARKServerManager/VersionFeed.xml | 10 +++--- src/ARKServerManager/VersionFeedBeta.xml | 26 +++++++++++++- src/ConanServerManager/App.xaml.cs | 36 +++++++++++-------- src/ConanServerManager/VersionFeed.xml | 9 ++--- src/ConanServerManager/VersionFeedBeta.xml | 25 ++++++++++++- .../GlobalizationManager.cs | 10 +++--- 8 files changed, 111 insertions(+), 48 deletions(-) diff --git a/src/ARKServerManager/App.xaml.cs b/src/ARKServerManager/App.xaml.cs index a74cb8c1..f632295b 100644 --- a/src/ARKServerManager/App.xaml.cs +++ b/src/ARKServerManager/App.xaml.cs @@ -1,3 +1,15 @@ +using System; +using System.ComponentModel; +using System.Diagnostics; +using System.Globalization; +using System.IO; +using System.Linq; +using System.Net; +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Threading; +using System.Threading.Tasks; +using System.Windows; using ArkData; using NLog; using NLog.Config; @@ -11,18 +23,6 @@ using ServerManagerTool.Lib; using ServerManagerTool.Plugin.Common; using ServerManagerTool.Utils; using ServerManagerTool.Windows; -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Diagnostics; -using System.IO; -using System.Linq; -using System.Net; -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Threading; -using System.Threading.Tasks; -using System.Windows; using WPFSharp.Globalizer; namespace ServerManagerTool @@ -329,8 +329,14 @@ namespace ServerManagerTool _globalizer = GlobalizedApplication.Instance; try { - if (!string.IsNullOrWhiteSpace(Config.Default.CultureName)) - _globalizer.GlobalizationManager.SwitchLanguage(Config.Default.CultureName, true); + var langCode = GlobalizationManager.FallBackLanguage; + + if (string.IsNullOrWhiteSpace(Config.Default.DataDir)) + langCode = CultureInfo.CurrentCulture.Name; + else if (!string.IsNullOrWhiteSpace(Config.Default.CultureName)) + langCode = Config.Default.CultureName; + + _globalizer.GlobalizationManager.SwitchLanguage(langCode, true); } catch (Exception ex) { diff --git a/src/ARKServerManager/Globalization/pt-BR/pt-BR.xaml b/src/ARKServerManager/Globalization/pt-BR/pt-BR.xaml index fc2e76f0..7386c5be 100644 --- a/src/ARKServerManager/Globalization/pt-BR/pt-BR.xaml +++ b/src/ARKServerManager/Globalization/pt-BR/pt-BR.xaml @@ -489,6 +489,7 @@ Redefinir Isso redefinirá TODAS as configurações globais do usuário para o gerenciador do servidor. O gerenciador do servidor será fechado se for bem-sucedido. Ativar e executar como Prompt de Administrador na Inicialização + Verificar se o Server Manager está em execução na inicialização Modo de início da janela principal: Minimizar para a bandeja Gerenciar configurações de firewall automaticamente @@ -5536,14 +5537,14 @@ Boss Inventory - Desert Titan Boss Inventory - Forest Titan Boss Inventory - Ice Titan - + Boss Inventory - Crystal Wyvern Queen (Gamma) Boss Inventory - Crystal Wyvern Queen (Beta) Boss Inventory - Crystal Wyvern Queen (Alpha) - Boss Inventory - Dinopithecus (Gamma) - Boss Inventory - Dinopithecus (Beta) - Boss Inventory - Dinopithecus (Alpha) + Boss Inventory - Dinopithecus King (Gamma) + Boss Inventory - Dinopithecus King (Beta) + Boss Inventory - Dinopithecus King (Alpha) Boss Inventory - Dragon (Gamma) Boss Inventory - Dragon (Beta) diff --git a/src/ARKServerManager/VersionFeed.xml b/src/ARKServerManager/VersionFeed.xml index 6fc5cbfb..4ee93ce1 100644 --- a/src/ARKServerManager/VersionFeed.xml +++ b/src/ARKServerManager/VersionFeed.xml @@ -5,14 +5,14 @@ Ark Server Manager Version Feed This is the Ark Server Manager release version feed. - 2022-01-05T00:00:00Z + 2022-01-14T00:00:00Z urn:uuid:9B66118D-DDFE-4E72-9CB9-299642AD29FF - 1.1.416 (1.1.416.1) - 1.1.416.1 + 1.1.416 (1.1.416.2) + 1.1.416.2 - 2022-01-05T00:00:00Z + 2022-01-14T00:00:00Z

@@ -20,6 +20,8 @@

  • Minor tweaks to the Auto-Update process to prevent intermittent exceptions.
    • +
  • Server manager language will default to the computers language setting on first start, if possible.
    • +
  • pt-BR Translation file updated.
  • zh-CN Translation file updated.

diff --git a/src/ARKServerManager/VersionFeedBeta.xml b/src/ARKServerManager/VersionFeedBeta.xml index beb114aa..86a9acb9 100644 --- a/src/ARKServerManager/VersionFeedBeta.xml +++ b/src/ARKServerManager/VersionFeedBeta.xml @@ -5,7 +5,31 @@ Ark Server Manager Version Feed This is the Ark Server Manager beta version feed. - 2022-01-05T00:00:00Z + 2022-01-14T00:00:00Z + + + urn:uuid:0427B4A2-8C1A-426D-BCDB-ADBFF0A74825 + 1.1.416 (1.1.416.2) + 1.1.416.2 + + 2022-01-14T00:00:00Z + +
+

+ CHANGE +
+

    +
  • Server manager language will default to the computers language setting on first start, if possible.
    • +
  • pt-BR Translation file updated.
    • +
+

+
+ + + bletch + bletch1971@hotmail.com + + urn:uuid:9B66118D-DDFE-4E72-9CB9-299642AD29FF diff --git a/src/ConanServerManager/App.xaml.cs b/src/ConanServerManager/App.xaml.cs index 09c4b028..3069a1f4 100644 --- a/src/ConanServerManager/App.xaml.cs +++ b/src/ConanServerManager/App.xaml.cs @@ -1,4 +1,16 @@ -using NLog; +using System; +using System.ComponentModel; +using System.Diagnostics; +using System.Globalization; +using System.IO; +using System.Linq; +using System.Net; +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Threading; +using System.Threading.Tasks; +using System.Windows; +using NLog; using NLog.Config; using NLog.Targets; using ServerManagerTool.Common; @@ -10,18 +22,6 @@ using ServerManagerTool.Lib; using ServerManagerTool.Plugin.Common; using ServerManagerTool.Utils; using ServerManagerTool.Windows; -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Diagnostics; -using System.IO; -using System.Linq; -using System.Net; -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Threading; -using System.Threading.Tasks; -using System.Windows; using WPFSharp.Globalizer; namespace ServerManagerTool @@ -328,8 +328,14 @@ namespace ServerManagerTool _globalizer = GlobalizedApplication.Instance; try { - if (!string.IsNullOrWhiteSpace(Config.Default.CultureName)) - _globalizer.GlobalizationManager.SwitchLanguage(Config.Default.CultureName, true); + var langCode = GlobalizationManager.FallBackLanguage; + + if (string.IsNullOrWhiteSpace(Config.Default.DataPath)) + langCode = CultureInfo.CurrentCulture.Name; + else if (!string.IsNullOrWhiteSpace(Config.Default.CultureName)) + langCode = Config.Default.CultureName; + + _globalizer.GlobalizationManager.SwitchLanguage(langCode, true); } catch (Exception ex) { diff --git a/src/ConanServerManager/VersionFeed.xml b/src/ConanServerManager/VersionFeed.xml index 8d4945b5..497146fe 100644 --- a/src/ConanServerManager/VersionFeed.xml +++ b/src/ConanServerManager/VersionFeed.xml @@ -5,14 +5,14 @@ Conan Server Manager Version Feed This is the Conan Server Manager release version feed. - 2021-12-23T00:00:00Z + 2022-01-14T00:00:00Z urn:uuid:189B95FA-8ACA-4E37-9A34-443B6C5E27EE - 1.1.61 (1.1.61.1) - 1.1.61.1 + 1.1.61 (1.1.61.2) + 1.1.61.2 - 2022-01-05T00:00:00Z + 2022-01-14T00:00:00Z

@@ -20,6 +20,7 @@

  • Minor tweaks to the Auto-Update process to prevent intermittent exceptions.
    • +
  • Server manager language will default to the computers language setting on first start, if possible.

diff --git a/src/ConanServerManager/VersionFeedBeta.xml b/src/ConanServerManager/VersionFeedBeta.xml index 7e025928..bedda50d 100644 --- a/src/ConanServerManager/VersionFeedBeta.xml +++ b/src/ConanServerManager/VersionFeedBeta.xml @@ -5,7 +5,30 @@ Conan Server Manager Version Feed This is the Conan Server Manager beta version feed. - 2022-01-05T00:00:00Z + 2022-01-14T00:00:00Z + + + urn:uuid:16704347-28FE-41BD-9913-465982E6C3C3 + 1.1.61 (1.1.61.2) + 1.1.61.2 + + 2022-01-14T00:00:00Z + +
+

+ CHANGE +
+

    +
  • Server manager language will default to the computers language setting on first start, if possible.
    • +
+

+
+ + + bletch + bletch1971@hotmail.com + + urn:uuid:189B95FA-8ACA-4E37-9A34-443B6C5E27EE diff --git a/src/WPFSharp.Globalizer/GlobalizationManager.cs b/src/WPFSharp.Globalizer/GlobalizationManager.cs index 7d00daa7..4d98f3dc 100644 --- a/src/WPFSharp.Globalizer/GlobalizationManager.cs +++ b/src/WPFSharp.Globalizer/GlobalizationManager.cs @@ -15,7 +15,7 @@ namespace WPFSharp.Globalizer { #region Members - internal const string FallBackLanguage = "en-US"; + public const string FallBackLanguage = "en-US"; #endregion @@ -35,14 +35,14 @@ namespace WPFSharp.Globalizer /// public void SwitchLanguage(string inFiveCharLang, bool inForceSwitch = false) { - if (CultureInfo.CurrentCulture.Name.Equals(inFiveCharLang) && !inForceSwitch) - return; - if (!AvailableLanguages.Instance.Contains(inFiveCharLang)) { - throw new CultureNotFoundException(string.Format("The language {0} is not available.", inFiveCharLang)); + inFiveCharLang = FallBackLanguage; } + if (CultureInfo.CurrentCulture.Name.Equals(inFiveCharLang) && !inForceSwitch) + return; + // Set the new language var ci = new CultureInfo(inFiveCharLang); Thread.CurrentThread.CurrentCulture = ci;