1.1.1 -> 1.1.2 第26次更新

This commit is contained in:
Space Time 2024-10-04 18:41:09 +08:00
parent e61ca0a75f
commit f9c6da4bb8
4 changed files with 20 additions and 20 deletions

View File

@ -72,9 +72,9 @@ namespace Sheas_Cealer.Consts {
/// <summary>
/// 查找类似 The config cannot be recognized. Check if the config contain syntax errors 的本地化字符串。
/// </summary>
public static string _ConfErrorHint {
public static string _ConfErrorMsg {
get {
return ResourceManager.GetString("_ConfErrorHint", resourceCulture);
return ResourceManager.GetString("_ConfErrorMsg", resourceCulture);
}
}
@ -144,9 +144,9 @@ namespace Sheas_Cealer.Consts {
/// <summary>
/// 查找类似 The args cannot be recognized. Check if the hosts contain syntax errors 的本地化字符串。
/// </summary>
public static string _HostErrorHint {
public static string _HostErrorMsg {
get {
return ResourceManager.GetString("_HostErrorHint", resourceCulture);
return ResourceManager.GetString("_HostErrorMsg", resourceCulture);
}
}
@ -180,18 +180,18 @@ namespace Sheas_Cealer.Consts {
/// <summary>
/// 查找类似 Update successfully 的本地化字符串。
/// </summary>
public static string _UpdateUpstreamHostSuccessHint {
public static string _UpdateUpstreamHostSuccessMsg {
get {
return ResourceManager.GetString("_UpdateUpstreamHostSuccessHint", resourceCulture);
return ResourceManager.GetString("_UpdateUpstreamHostSuccessMsg", resourceCulture);
}
}
/// <summary>
/// 查找类似 Upstream host has been updated to the latest 的本地化字符串。
/// </summary>
public static string _UpstreamHostUtdHint {
public static string _UpstreamHostUtdMsg {
get {
return ResourceManager.GetString("_UpstreamHostUtdHint", resourceCulture);
return ResourceManager.GetString("_UpstreamHostUtdMsg", resourceCulture);
}
}

View File

@ -243,7 +243,7 @@
<data name="_BrowserPathDialogFilterFileType" xml:space="preserve">
<value>Browser</value>
</data>
<data name="_ConfErrorHint" xml:space="preserve">
<data name="_ConfErrorMsg" xml:space="preserve">
<value>The config cannot be recognized. Check if the config contain syntax errors</value>
</data>
<data name="_GameClickOnceMsg" xml:space="preserve">
@ -267,7 +267,7 @@
<data name="_GameStartMsg" xml:space="preserve">
<value>No, please kill me, I...can't control myself...</value>
</data>
<data name="_HostErrorHint" xml:space="preserve">
<data name="_HostErrorMsg" xml:space="preserve">
<value>The args cannot be recognized. Check if the hosts contain syntax errors</value>
</data>
<data name="_KillBrowserProcessPrompt" xml:space="preserve">
@ -279,10 +279,10 @@
<data name="_OverrideUpstreamHostPrompt" xml:space="preserve">
<value>There is an update available. Do you want to update upstream host? If No it will only open the upstream host page for you</value>
</data>
<data name="_UpdateUpstreamHostSuccessHint" xml:space="preserve">
<data name="_UpdateUpstreamHostSuccessMsg" xml:space="preserve">
<value>Update successfully</value>
</data>
<data name="_UpstreamHostUtdHint" xml:space="preserve">
<data name="_UpstreamHostUtdMsg" xml:space="preserve">
<value>Upstream host has been updated to the latest</value>
</data>
</root>

View File

@ -243,7 +243,7 @@
<data name="_BrowserPathDialogFilterFileType" xml:space="preserve">
<value>浏览器</value>
</data>
<data name="_ConfErrorHint" xml:space="preserve">
<data name="_ConfErrorMsg" xml:space="preserve">
<value>配置无法识别,请检查配置文件中是否含有语法错误</value>
</data>
<data name="_GameClickOnceMsg" xml:space="preserve">
@ -267,7 +267,7 @@
<data name="_GameStartMsg" xml:space="preserve">
<value>不,求你杀了我,我...控制不住自己了...</value>
</data>
<data name="_HostErrorHint" xml:space="preserve">
<data name="_HostErrorMsg" xml:space="preserve">
<value>规则无法识别,请检查伪造规则中是否含有语法错误</value>
</data>
<data name="_KillBrowserProcessPrompt" xml:space="preserve">
@ -279,10 +279,10 @@
<data name="_OverrideUpstreamHostPrompt" xml:space="preserve">
<value>上游规则有更新可用,需要更新吗?否则只为你打开上游规则网页</value>
</data>
<data name="_UpdateUpstreamHostSuccessHint" xml:space="preserve">
<data name="_UpdateUpstreamHostSuccessMsg" xml:space="preserve">
<value>更新已完成</value>
</data>
<data name="_UpstreamHostUtdHint" xml:space="preserve">
<data name="_UpstreamHostUtdMsg" xml:space="preserve">
<value>上游规则已经更到最新了</value>
</data>
</root>

View File

@ -129,7 +129,7 @@ public partial class MainWin : Window
HoldButtonTimer?.Stop();
if (string.IsNullOrWhiteSpace(CealArgs))
throw new Exception(MainConst._HostErrorHint);
throw new Exception(MainConst._HostErrorMsg);
if (MessageBox.Show(MainConst._KillBrowserProcessPrompt, string.Empty, MessageBoxButton.YesNo) != MessageBoxResult.Yes)
return;
@ -229,7 +229,7 @@ public partial class MainWin : Window
configStream.Load(File.OpenText(configPath));
try { configMapNode = (YamlMappingNode)configStream.Documents[0].RootNode; }
catch { throw new Exception(MainConst._ConfErrorHint); }
catch { throw new Exception(MainConst._ConfErrorMsg); }
if (!configMapNode.Children.TryGetValue("mixed-port", out mihomoPortNode!) && !configMapNode.Children.TryGetValue("port", out mihomoPortNode!))
mihomoPortNode = "7890";
@ -282,14 +282,14 @@ public partial class MainWin : Window
oldUpstreamHostString = File.ReadAllText(oldUpstreamHostPath);
if (oldUpstreamHostString.Replace("\r", string.Empty) == newUpstreamHostString)
MessageBox.Show(MainConst._UpstreamHostUtdHint);
MessageBox.Show(MainConst._UpstreamHostUtdMsg);
else
{
MessageBoxResult overrideOptionResult = MessageBox.Show(MainConst._OverrideUpstreamHostPrompt, string.Empty, MessageBoxButton.YesNoCancel);
if (overrideOptionResult == MessageBoxResult.Yes)
{
File.WriteAllText(Path.Combine(AppDomain.CurrentDomain.SetupInformation.ApplicationBase!, "Cealing-Host-Upstream.json"), newUpstreamHostString);
MessageBox.Show(MainConst._UpdateUpstreamHostSuccessHint);
MessageBox.Show(MainConst._UpdateUpstreamHostSuccessMsg);
}
else if (overrideOptionResult == MessageBoxResult.No)
Process.Start(new ProcessStartInfo(newUpstreamHostUrl) { UseShellExecute = true });