From 51a4d44847ab78c3ef071ed6ab2354e1792baf95 Mon Sep 17 00:00:00 2001 From: tangge233 Date: Wed, 22 Jan 2025 22:21:39 +0800 Subject: [PATCH] chore: change _ to - --- Plain Craft Launcher 2/Application.xaml | 4 +-- Plain Craft Launcher 2/Application.xaml.vb | 8 ++--- .../Modules/Minecraft/ModComp.vb | 2 +- .../Modules/Minecraft/ModLaunch.vb | 2 +- Plain Craft Launcher 2/Modules/Modi18n.vb | 36 +++++++++---------- .../Pages/PageDownload/ModDownloadLib.vb | 14 ++++---- .../Pages/PageOther/PageOtherHelp.xaml.vb | 2 +- .../Pages/PageSetup/ModSetup.vb | 2 +- .../Pages/PageSetup/PageSetupSystem.xaml | 28 +++++++-------- .../Pages/PageSetup/PageSetupSystem.xaml.vb | 2 +- .../Plain Craft Launcher 2.vbproj | 28 +++++++-------- .../Language/{el_GR.xaml => el-GR.xaml} | 0 .../Language/{en_GB.xaml => en-GB.xaml} | 0 .../Language/{en_US.xaml => en-US.xaml} | 0 .../Language/{es_ES.xaml => es-ES.xaml} | 0 .../Language/{fr_FR.xaml => fr-FR.xaml} | 0 .../Language/{ja_JP.xaml => ja-JP.xaml} | 0 .../Language/{ko_KR.xaml => ko-KR.xaml} | 0 .../Language/{ru_RU.xaml => ru-RU.xaml} | 0 .../Language/{sk_SK.xaml => sk-SK.xaml} | 0 .../Language/{zh_CN.xaml => zh-CN.xaml} | 0 .../Language/{zh_HK.xaml => zh-HK.xaml} | 0 .../Language/{zh_MARS.xaml => zh-MARS.xaml} | 0 .../Language/{zh_MEME.xaml => zh-MEME.xaml} | 0 .../Language/{zh_TW.xaml => zh-TW.xaml} | 0 25 files changed, 64 insertions(+), 64 deletions(-) rename Plain Craft Launcher 2/Resources/Language/{el_GR.xaml => el-GR.xaml} (100%) rename Plain Craft Launcher 2/Resources/Language/{en_GB.xaml => en-GB.xaml} (100%) rename Plain Craft Launcher 2/Resources/Language/{en_US.xaml => en-US.xaml} (100%) rename Plain Craft Launcher 2/Resources/Language/{es_ES.xaml => es-ES.xaml} (100%) rename Plain Craft Launcher 2/Resources/Language/{fr_FR.xaml => fr-FR.xaml} (100%) rename Plain Craft Launcher 2/Resources/Language/{ja_JP.xaml => ja-JP.xaml} (100%) rename Plain Craft Launcher 2/Resources/Language/{ko_KR.xaml => ko-KR.xaml} (100%) rename Plain Craft Launcher 2/Resources/Language/{ru_RU.xaml => ru-RU.xaml} (100%) rename Plain Craft Launcher 2/Resources/Language/{sk_SK.xaml => sk-SK.xaml} (100%) rename Plain Craft Launcher 2/Resources/Language/{zh_CN.xaml => zh-CN.xaml} (100%) rename Plain Craft Launcher 2/Resources/Language/{zh_HK.xaml => zh-HK.xaml} (100%) rename Plain Craft Launcher 2/Resources/Language/{zh_MARS.xaml => zh-MARS.xaml} (100%) rename Plain Craft Launcher 2/Resources/Language/{zh_MEME.xaml => zh-MEME.xaml} (100%) rename Plain Craft Launcher 2/Resources/Language/{zh_TW.xaml => zh-TW.xaml} (100%) diff --git a/Plain Craft Launcher 2/Application.xaml b/Plain Craft Launcher 2/Application.xaml index 05784a53..3a99dd57 100644 --- a/Plain Craft Launcher 2/Application.xaml +++ b/Plain Craft Launcher 2/Application.xaml @@ -10,8 +10,8 @@ - - + + diff --git a/Plain Craft Launcher 2/Application.xaml.vb b/Plain Craft Launcher 2/Application.xaml.vb index 017267d3..c004216f 100644 --- a/Plain Craft Launcher 2/Application.xaml.vb +++ b/Plain Craft Launcher 2/Application.xaml.vb @@ -31,13 +31,13 @@ Public Class Application '依照选择语言切换字体 Dim LaunchFont As FontFamily Select Case Lang - Case "zh_TW", "zh_HK", "lzh", "zh_MARS" + Case "zh-TW", "zh-HK", "lzh", "zh-MARS" LaunchFont = New FontFamily(New Uri("pack://application:,,,/"), "./Resources/#PCL English, Segoe UI, Microsoft JhengHei UI") - Case "ja_JP" + Case "ja-JP" LaunchFont = New FontFamily(New Uri("pack://application:,,,/"), "./Resources/#PCL English, Segoe UI, Yu Gothic UI, Microsoft YaHei UI") - Case "ko_KR" + Case "ko-KR" LaunchFont = New FontFamily(New Uri("pack://application:,,,/"), "./Resources/#PCL English, Segoe UI, Malgun Gothic, Microsoft YaHei UI") - Case "en_US", "en_GB", "zh_CN", "zh_MEME" + Case "en-US", "en-GB", "zh-CN", "zh-MEME" LaunchFont = New FontFamily(New Uri("pack://application:,,,/"), "./Resources/#PCL English, Segoe UI, Microsoft YaHei UI") Case Else '非英语的其他西欧语言统一使用 Segoe UI LaunchFont = New FontFamily(New Uri("pack://application:,,,/"), "Segoe UI, ./Resources/#PCL English, Microsoft YaHei UI") diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModComp.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModComp.vb index 018f0f86..6a20b966 100644 --- a/Plain Craft Launcher 2/Modules/Minecraft/ModComp.vb +++ b/Plain Craft Launcher 2/Modules/Minecraft/ModComp.vb @@ -200,7 +200,7 @@ ''' Public ReadOnly Property TranslatedName As String Get - If Not (Lang.Equals("zh_CN") OrElse Lang.Equals("zh_MEME")) Then Return RawName '其它语言暂时没有翻译数据，使用原文本 + If Not (Lang.Equals("zh-CN") OrElse Lang.Equals("zh-MEME")) Then Return RawName '其它语言暂时没有翻译数据，使用原文本 Return If(DatabaseEntry Is Nothing OrElse DatabaseEntry.ChineseName = "", RawName, DatabaseEntry.ChineseName) End Get End Property diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb index 8859bb6c..364f471a 100644 --- a/Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb +++ b/Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb @@ -1851,7 +1851,7 @@ NextVersion: Dim RequiredLang As String = CurrentLang.ToLower If CurrentLang = "none" OrElse String.IsNullOrWhiteSpace(CurrentLang) OrElse Not Directory.Exists(McVersionCurrent.PathIndie & "saves") Then '#3844，整合包可能已经自带了 options.txt If Setup.Get("ToolHelpLanguage") Then - RequiredLang = Lang.ToLower + RequiredLang = Lang.ToLower.Replace("-", "_") End If End If If McVersionCurrent.Version.McCodeMain < 15 And RequiredLang.Equals("lzh") Then '1.15 之前的版本不支持 lzh diff --git a/Plain Craft Launcher 2/Modules/Modi18n.vb b/Plain Craft Launcher 2/Modules/Modi18n.vb index df511224..21c5e9d5 100644 --- a/Plain Craft Launcher 2/Modules/Modi18n.vb +++ b/Plain Craft Launcher 2/Modules/Modi18n.vb @@ -32,7 +32,7 @@ Module Modi18n ''' 中文文本 ''' 对应语言的译文 Public Function GetLangByWord(Word As String) As String - If Lang = "zh_CN" Then Return Word '语言设置为中文时不需要处理，直接返回以节约处理时间 + If Lang = "zh-CN" Then Return Word '语言设置为中文时不需要处理，直接返回以节约处理时间 Select Case Word Case "正式版" Return GetLang("LangDownloadRelease") @@ -57,9 +57,9 @@ Module Modi18n ''' 当前地区的时间格式字符串 Public Function GetLocalTimeFormat(Time As DateTime) As String Select Case Lang - Case "ja_JP", "ko_KR", "lzh", "zh_CN", "zh_HK", "zh_MARS", "zh_MEME", "zh_TW" '2024/08/16 11:47 + Case "ja-JP", "ko-KR", "lzh", "zh-CN", "zh-HK", "zh-MARS", "zh-MEME", "zh-TW" '2024/08/16 11:47 Return Time.ToString("yyyy'/'MM'/'dd HH':'mm") - Case "en_US" '11:47 08/16/2024 + Case "en-US" '11:47 08/16/2024 Return Time.ToString("MM'/'dd'/'yyyy HH':'mm") Case Else '11:47 16/08/2024 Return Time.ToString("dd'/'MM'/'yyyy HH':'mm") @@ -106,17 +106,17 @@ Module Modi18n ''' ''' 获取当前系统的默认语言 ''' - ''' 返回类似于 zh_CN 这样形式的文本 + ''' 返回类似于 zh-CN 这样形式的文本 Public Function GetDefaultLang() As String Dim CurrentCulture As String = CultureInfo.CurrentCulture.Name Dim PrefixMap As New Dictionary(Of String, String) From { - {"el-", "el_GR"}, - {"es-", "es_ES"}, - {"fr-", "fr_FR"}, - {"ja-", "ja_JP"}, - {"ko-", "ko_KR"}, - {"ru-", "ru_RU"}, - {"sk-", "sk_SK"} + {"el-", "el-GR"}, + {"es-", "es-ES"}, + {"fr-", "fr-FR"}, + {"ja-", "ja-JP"}, + {"ko-", "ko-KR"}, + {"ru-", "ru-RU"}, + {"sk-", "sk-SK"} } For Each prefixPair In PrefixMap @@ -127,16 +127,16 @@ Module Modi18n Select Case CurrentCulture '部分需要特殊匹配的语言 Case "en-GB", "en-NZ", "en-AU", "en-CA" - Return "en_GB" + Return "en-GB" Case "zh-CN", "zh-SG", "zh-Hans" - Return "zh_CN" + Return "zh-CN" Case "zh-HK", "zh-MO" - Return "zh_HK" + Return "zh-HK" Case "zh-TW", "zh-Hant" - Return "zh_TW" + Return "zh-TW" End Select - Return "en_US" '无匹配则返回 en_us + Return "en-US" '无匹配则返回 en_us End Function ''' @@ -146,11 +146,11 @@ Module Modi18n ''' 11 Million、2 万等这样的表示 Public Function GetLocationNum(Num As Int32) As String Select Case Lang - Case "ja_JP", "ko_KR", "lzh", "zh_CN", "zh_HK", "zh_MARS", "zh_MEME", "zh_TW" + Case "ja-JP", "ko-KR", "lzh", "zh-CN", "zh-HK", "zh-MARS", "zh-MEME", "zh-TW" Return If(Num > 1000000000000, Math.Round(Num / 1000000000000, 2) & " " & GetLang("LangModCompModDigit3"), '兆 If(Num > 100000000, Math.Round(Num / 100000000, 2) & " " & GetLang("LangModCompModDigit2"), '亿 If(Num > 100000, Math.Round(Num / 10000, 0) & " " & GetLang("LangModCompModDigit1"), Num.ToString("N0") & " "))) '万 - Case Else 'en_US, en_GB, fr_FR etc. + Case Else 'en-US, en-GB, fr-FR etc. Return If(Num > 1000000000, Math.Round(Num / 1000000000, 2) & GetLang("LangModCompModDigit3"), 'Billion If(Num > 1000000, Math.Round(Num / 1000000, 2) & GetLang("LangModCompModDigit2"), 'Million If(Num > 10000, Math.Round(Num / 1000, 0) & GetLang("LangModCompModDigit1"), Num.ToString("N0")))) 'Thousand(K) diff --git a/Plain Craft Launcher 2/Pages/PageDownload/ModDownloadLib.vb b/Plain Craft Launcher 2/Pages/PageDownload/ModDownloadLib.vb index b40d8736..e295524c 100644 --- a/Plain Craft Launcher 2/Pages/PageDownload/ModDownloadLib.vb +++ b/Plain Craft Launcher 2/Pages/PageDownload/ModDownloadLib.vb @@ -335,7 +335,7 @@ pause" '本地化 Dim subLocation As String = "" Select Case Lang - Case "zh_CN", "zh_HK", "zh_TW" + Case "zh-CN", "zh-HK", "zh-TW" subLocation = "zh." If Id = "3d shareware v1.34" Then WikiName = "3D_Shareware_v1.34" @@ -461,7 +461,7 @@ pause" For Each key In keyWord.Keys WikiName = WikiName.Replace(key, keyWord(key)) Next - Case "en_US", "en_GB" + Case "en-US", "en-GB" subLocation = "" If Id = "3d shareware v1.34" Then WikiName = "Java_Edition_3D_Shareware_v1.34" @@ -521,7 +521,7 @@ pause" WikiName = WikiName.Replace(key, keyWord(key)) Next WikiName = FormatWikiNameEndDigit(WikiName) - Case "ko_KR" + Case "ko-KR" subLocation = "ko." If Id = "3d shareware v1.34" Then WikiName = "Java_Edition_3D_Shareware_v1.34" @@ -581,7 +581,7 @@ pause" WikiName = WikiName.Replace(key, keyWord(key)) Next WikiName = FormatWikiNameEndDigit(WikiName) - Case "ja_JP" + Case "ja-JP" subLocation = "ja." If Id = "3d shareware v1.34" Then WikiName = "Java_Edition_3D_Shareware_v1.34" @@ -641,7 +641,7 @@ pause" WikiName = WikiName.Replace(key, keyWord(key)) Next WikiName = FormatWikiNameEndDigit(WikiName) - Case "ru_RU" + Case "ru-RU" subLocation = "ru." If Id = "3d shareware v1.34" Then WikiName = "3D_Shareware_v1.34_(Java_Edition)" @@ -706,7 +706,7 @@ pause" Next WikiName = FormatWikiNameEndDigit(WikiName) If Not WikiName.EndsWithF("_(Java_Edition)") Then WikiName += "_(Java_Edition)" - Case "fr_FR" + Case "fr-FR" subLocation = "fr." If Id = "3d shareware v1.34" Then WikiName = "Édition_Java_3D_Shareware_v1.34" @@ -767,7 +767,7 @@ pause" WikiName = WikiName.Replace(key, keyWord(key)) Next WikiName = FormatWikiNameEndDigit(WikiName) - Case "es_ES" + Case "es-ES" subLocation = "es." If Id = "3d shareware v1.34" Then WikiName = "3D_Shareware_v1.34_(Java_Edition)" diff --git a/Plain Craft Launcher 2/Pages/PageOther/PageOtherHelp.xaml.vb b/Plain Craft Launcher 2/Pages/PageOther/PageOtherHelp.xaml.vb index 58030a0a..085dd5e1 100644 --- a/Plain Craft Launcher 2/Pages/PageOther/PageOtherHelp.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageOther/PageOtherHelp.xaml.vb @@ -5,7 +5,7 @@ '滚动条 Private Sub PageOther_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded - If Lang = "zh_CN" Then + If Lang = "zh-CN" Then HintSCOnly.Visibility = Visibility.Collapsed Else HintSCOnly.Visibility = Visibility.Visible diff --git a/Plain Craft Launcher 2/Pages/PageSetup/ModSetup.vb b/Plain Craft Launcher 2/Pages/PageSetup/ModSetup.vb index db63903a..ea3cf1d2 100644 --- a/Plain Craft Launcher 2/Pages/PageSetup/ModSetup.vb +++ b/Plain Craft Launcher 2/Pages/PageSetup/ModSetup.vb @@ -565,7 +565,7 @@ FrmSetupUI.PanCustomPreset.Visibility = Visibility.Visible FrmSetupUI.PanCustomLocal.Visibility = Visibility.Collapsed FrmSetupUI.PanCustomNet.Visibility = Visibility.Collapsed - If Lang.Equals("zh_CN") Then + If Lang.Equals("zh-CN") Then FrmSetupUI.HintCustom.Visibility = Visibility.Collapsed Else FrmSetupUI.HintCustom.Visibility = Visibility.Visible diff --git a/Plain Craft Launcher 2/Pages/PageSetup/PageSetupSystem.xaml b/Plain Craft Launcher 2/Pages/PageSetup/PageSetupSystem.xaml index de11e7e6..d6910cf9 100644 --- a/Plain Craft Launcher 2/Pages/PageSetup/PageSetupSystem.xaml +++ b/Plain Craft Launcher 2/Pages/PageSetup/PageSetupSystem.xaml @@ -174,21 +174,21 @@ - - - - - - - + + + + + + + - - - - - - - + + + + + + + diff --git a/Plain Craft Launcher 2/Pages/PageSetup/PageSetupSystem.xaml.vb b/Plain Craft Launcher 2/Pages/PageSetup/PageSetupSystem.xaml.vb index d46428c1..c9e0839a 100644 --- a/Plain Craft Launcher 2/Pages/PageSetup/PageSetupSystem.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageSetup/PageSetupSystem.xaml.vb @@ -28,7 +28,7 @@ End If Lang = TargetLang Application.Current.Resources.MergedDictionaries(1) = New ResourceDictionary With {.Source = New Uri("pack://application:,,,/Resources/Language/" & Lang & ".xaml", UriKind.RelativeOrAbsolute)} - If Lang.Equals("zh_MEME") Then MyMsgBox($"此语言仅供娱乐，请勿当真{vbCr}此語言僅供娛樂，請勿當真{vbCr}This language is for entertainment only, please don't take it seriously", IsWarn:=True) + If Lang.Equals("zh-MEME") Then MyMsgBox($"此语言仅供娱乐，请勿当真{vbCr}此語言僅供娛樂，請勿當真{vbCr}This language is for entertainment only, please don't take it seriously", IsWarn:=True) WriteReg("Lang", Lang) MyMsgBox(GetLang("LangPageSetupSystemDialogContentLanguageRestart"), ForceWait:=True) Process.Start(New ProcessStartInfo(PathWithName)) diff --git a/Plain Craft Launcher 2/Plain Craft Launcher 2.vbproj b/Plain Craft Launcher 2/Plain Craft Launcher 2.vbproj index ecbea728..5d2befeb 100644 --- a/Plain Craft Launcher 2/Plain Craft Launcher 2.vbproj +++ b/Plain Craft Launcher 2/Plain Craft Launcher 2.vbproj @@ -558,35 +558,35 @@ MSBuild:Compile Designer - + MSBuild:Compile Designer - + MSBuild:Compile Designer - + MSBuild:Compile Designer - + Designer MSBuild:Compile - + MSBuild:Compile Designer - + MSBuild:Compile Designer - + MSBuild:Compile Designer - + MSBuild:Compile Designer @@ -594,27 +594,27 @@ MSBuild:Compile Designer - + MSBuild:Compile Designer - + MSBuild:Compile Designer - + MSBuild:Compile Designer - + Designer MSBuild:Compile - + MSBuild:Compile Designer - + MSBuild:Compile Designer diff --git a/Plain Craft Launcher 2/Resources/Language/el_GR.xaml b/Plain Craft Launcher 2/Resources/Language/el-GR.xaml similarity index 100% rename from Plain Craft Launcher 2/Resources/Language/el_GR.xaml rename to Plain Craft Launcher 2/Resources/Language/el-GR.xaml diff --git a/Plain Craft Launcher 2/Resources/Language/en_GB.xaml b/Plain Craft Launcher 2/Resources/Language/en-GB.xaml similarity index 100% rename from Plain Craft Launcher 2/Resources/Language/en_GB.xaml rename to Plain Craft Launcher 2/Resources/Language/en-GB.xaml diff --git a/Plain Craft Launcher 2/Resources/Language/en_US.xaml b/Plain Craft Launcher 2/Resources/Language/en-US.xaml similarity index 100% rename from Plain Craft Launcher 2/Resources/Language/en_US.xaml rename to Plain Craft Launcher 2/Resources/Language/en-US.xaml diff --git a/Plain Craft Launcher 2/Resources/Language/es_ES.xaml b/Plain Craft Launcher 2/Resources/Language/es-ES.xaml similarity index 100% rename from Plain Craft Launcher 2/Resources/Language/es_ES.xaml rename to Plain Craft Launcher 2/Resources/Language/es-ES.xaml diff --git a/Plain Craft Launcher 2/Resources/Language/fr_FR.xaml b/Plain Craft Launcher 2/Resources/Language/fr-FR.xaml similarity index 100% rename from Plain Craft Launcher 2/Resources/Language/fr_FR.xaml rename to Plain Craft Launcher 2/Resources/Language/fr-FR.xaml diff --git a/Plain Craft Launcher 2/Resources/Language/ja_JP.xaml b/Plain Craft Launcher 2/Resources/Language/ja-JP.xaml similarity index 100% rename from Plain Craft Launcher 2/Resources/Language/ja_JP.xaml rename to Plain Craft Launcher 2/Resources/Language/ja-JP.xaml diff --git a/Plain Craft Launcher 2/Resources/Language/ko_KR.xaml b/Plain Craft Launcher 2/Resources/Language/ko-KR.xaml similarity index 100% rename from Plain Craft Launcher 2/Resources/Language/ko_KR.xaml rename to Plain Craft Launcher 2/Resources/Language/ko-KR.xaml diff --git a/Plain Craft Launcher 2/Resources/Language/ru_RU.xaml b/Plain Craft Launcher 2/Resources/Language/ru-RU.xaml similarity index 100% rename from Plain Craft Launcher 2/Resources/Language/ru_RU.xaml rename to Plain Craft Launcher 2/Resources/Language/ru-RU.xaml diff --git a/Plain Craft Launcher 2/Resources/Language/sk_SK.xaml b/Plain Craft Launcher 2/Resources/Language/sk-SK.xaml similarity index 100% rename from Plain Craft Launcher 2/Resources/Language/sk_SK.xaml rename to Plain Craft Launcher 2/Resources/Language/sk-SK.xaml diff --git a/Plain Craft Launcher 2/Resources/Language/zh_CN.xaml b/Plain Craft Launcher 2/Resources/Language/zh-CN.xaml similarity index 100% rename from Plain Craft Launcher 2/Resources/Language/zh_CN.xaml rename to Plain Craft Launcher 2/Resources/Language/zh-CN.xaml diff --git a/Plain Craft Launcher 2/Resources/Language/zh_HK.xaml b/Plain Craft Launcher 2/Resources/Language/zh-HK.xaml similarity index 100% rename from Plain Craft Launcher 2/Resources/Language/zh_HK.xaml rename to Plain Craft Launcher 2/Resources/Language/zh-HK.xaml diff --git a/Plain Craft Launcher 2/Resources/Language/zh_MARS.xaml b/Plain Craft Launcher 2/Resources/Language/zh-MARS.xaml similarity index 100% rename from Plain Craft Launcher 2/Resources/Language/zh_MARS.xaml rename to Plain Craft Launcher 2/Resources/Language/zh-MARS.xaml diff --git a/Plain Craft Launcher 2/Resources/Language/zh_MEME.xaml b/Plain Craft Launcher 2/Resources/Language/zh-MEME.xaml similarity index 100% rename from Plain Craft Launcher 2/Resources/Language/zh_MEME.xaml rename to Plain Craft Launcher 2/Resources/Language/zh-MEME.xaml diff --git a/Plain Craft Launcher 2/Resources/Language/zh_TW.xaml b/Plain Craft Launcher 2/Resources/Language/zh-TW.xaml similarity index 100% rename from Plain Craft Launcher 2/Resources/Language/zh_TW.xaml rename to Plain Craft Launcher 2/Resources/Language/zh-TW.xaml