Skip to content

Commit bf184ba

Browse files
tangge233tangge233
authored
Merge pull request #54 from Chiloven945/Language
fix: missing translations for exception
2 parents 9b89241 + 3dc1938 commit bf184ba

18 files changed

+42
-10
lines changed

‎Plain Craft Launcher 2/Modules/Base/ModBase.vb

+10-8
Original file line numberDiff line numberDiff line change
@@ -1412,7 +1412,7 @@ RetryDir:
14121412
End If
14131413
Next
14141414
End If
1415-
If Ex.GetType.FullName <> "System.Exception" Then DescList.Add(" 错误类型：" & Ex.GetType.FullName)
1415+
If Ex.GetType.FullName <> "System.Exception" Then DescList.Add(" " & GetLang("LangModBaseExceptionType") & Ex.GetType.FullName)
14161416
Ex = Ex.InnerException
14171417
IsInner = True
14181418
Loop
@@ -1436,7 +1436,7 @@ RetryDir:
14361436
If CommonReason Is Nothing Then
14371437
Return DescList.Join(vbCrLf)
14381438
Else
1439-
Return CommonReason & vbCrLf & vbCrLf & "————————————" & vbCrLf & "详细错误信息：" & vbCrLf & DescList.Join(vbCrLf)
1439+
Return CommonReason & vbCrLf & vbCrLf & "————————————" & vbCrLf & GetLang("LangModBaseExceptionInfoDetail") & vbCrLf & DescList.Join(vbCrLf)
14401440
End If
14411441
End Function
14421442
''' <summary>
@@ -2808,11 +2808,13 @@ Retry:
28082808
On Error Resume Next
28092809
If TypeOf Ex Is ThreadInterruptedException Then Exit Sub
28102810

2811+
If Title = "出现错误" Then Title = GetLang("LangModBaseDialogFeedbackTitle")
2812+
28112813
'获取错误信息
2812-
Dim ExFull As String = Desc & "：" & GetExceptionDetail(Ex)
2814+
Dim ExFull As String = Desc & GetLang("LangColon") & GetExceptionDetail(Ex)
28132815

28142816
'输出日志
2815-
Dim AppendText As String = "[" & GetTimeNow() & "] " & Desc & "：" & GetExceptionDetail(Ex, True) & vbCrLf '减轻同步锁占用
2817+
Dim AppendText As String = "[" & GetTimeNow() & "] " & Desc & GetLang("LangColon") & GetExceptionDetail(Ex, True) & vbCrLf '减轻同步锁占用
28162818
If ModeDebug Then
28172819
SyncLock LogListLock
28182820
LogList.Append(AppendText)
@@ -2830,19 +2832,19 @@ Retry:
28302832
Case LogLevel.Normal
28312833
#If DEBUG Then
28322834
Case LogLevel.Developer
2833-
Dim ExLine As String = Desc & "：" & GetExceptionSummary(Ex)
2835+
Dim ExLine As String = Desc & GetLang("LangColon") & GetExceptionSummary(Ex)
28342836
Hint("[开发者模式] " & ExLine, HintType.Info, False)
28352837
Case LogLevel.Debug
2836-
Dim ExLine As String = Desc & "：" & GetExceptionSummary(Ex)
2838+
Dim ExLine As String = Desc & GetLang("LangColon") & GetExceptionSummary(Ex)
28372839
Hint("[调试模式] " & ExLine, HintType.Info, False)
28382840
#Else
28392841
Case LogLevel.Developer
28402842
Case LogLevel.Debug
2841-
Dim ExLine As String = Desc & "：" & GetExceptionSummary(Ex)
2843+
Dim ExLine As String = Desc & GetLang("LangColon") & GetExceptionSummary(Ex)
28422844
If ModeDebug Then Hint("[调试模式] " & ExLine, HintType.Info, False)
28432845
#End If
28442846
Case LogLevel.Hint
2845-
Dim ExLine As String = Desc & "：" & GetExceptionSummary(Ex)
2847+
Dim ExLine As String = Desc & GetLang("LangColon") & GetExceptionSummary(Ex)
28462848
Hint(ExLine, HintType.Critical, False)
28472849
Case LogLevel.Msgbox
28482850
MyMsgBox(ExFull, Title, IsWarn:=True)

‎Plain Craft Launcher 2/Modules/Base/ModNet.vb

+1-1
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ RequestFinished:
209209
If TypeOf ex Is WebException AndAlso CType(ex, WebException).Status = WebExceptionStatus.Timeout Then
210210
Throw New TimeoutException(GetLang("LangModExceptionTimeOut", $"{CType(ex, WebException).Status}，{ex.Message}，{Url}"), ex)
211211
Else
212-
Throw New WebException(GetLang("LangModExceptionFailedToGet", $"{If(TypeOf ex Is WebException, CType(ex, WebException).Status & "，", "")}{ex.Message}，{Url}"), ex)
212+
Throw New WebException(GetLang("LangModExceptionFailedToGet", $"{If(TypeOf ex Is WebException, CType(ex, WebException).Status & GetLang("LangComma"), "")}{ex.Message}，{Url}"), ex)
213213
End If
214214
Finally
215215
Request.Abort()

‎Plain Craft Launcher 2/Modules/Modi18n.vb

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ Module Modi18n
108108
''' </summary>
109109
''' <returns>返回类似于 zh-CN 这样形式的文本</returns>
110110
Public Function GetDefaultLang() As String
111-
Dim CurrentCulture As String = CultureInfo.CurrentCulture.Name
111+
Dim CurrentCulture As String = CultureInfo.CurrentUICulture.Name
112112
Dim PrefixMap As New Dictionary(Of String, String) From {
113113
{"el-", "el-GR"},
114114
{"es-", "es-ES"},

‎Plain Craft Launcher 2/Resources/Language/el-GR.xaml

+2
Original file line numberDiff line numberDiff line change
@@ -1699,6 +1699,8 @@ URL: {0}</s:String>
16991699
<s:String x:Key="LangModBaseExceptionEmptyFile">Το αρχείο που διαβάστηκε είναι κενό</s:String>
17001700
<s:String x:Key="LangModBaseExceptionInvalidJson">Δεν είναι έγκυρο αρχείο JSON.</s:String>
17011701
<s:String x:Key="LangModBaseNoExceptionDetail">Δεν υπάρχουν διαθέσιμες πληροφορίες σφάλματος!</s:String>
1702+
<s:String x:Key="LangModBaseExceptionType">错误类型：</s:String>
1703+
<s:String x:Key="LangModBaseExceptionInfoDetail">详细错误信息：</s:String>
17021704
<s:String x:Key="LangModMyLoadingLoading">Φόρτωση...</s:String>
17031705
<s:String x:Key="LangModMyLoadingLoadFail">Απέτυχε η φόρτωση</s:String>
17041706
<s:String x:Key="LangModMyLoadingUnknownError">Άγνωστο σφάλμα</s:String>

‎Plain Craft Launcher 2/Resources/Language/en-GB.xaml

+2
Original file line numberDiff line numberDiff line change
@@ -1697,6 +1697,8 @@ About to open: {0}</s:String>
16971697
<s:String x:Key="LangModBaseExceptionEmptyFile">The file read is empty</s:String>
16981698
<s:String x:Key="LangModBaseExceptionInvalidJson">Not a valid JSON file.</s:String>
16991699
<s:String x:Key="LangModBaseNoExceptionDetail">No error information available!</s:String>
1700+
<s:String x:Key="LangModBaseExceptionType">Exception type: </s:String>
1701+
<s:String x:Key="LangModBaseExceptionInfoDetail">Detailed exception information: </s:String>
17001702
<s:String x:Key="LangModMyLoadingLoading">Loading...</s:String>
17011703
<s:String x:Key="LangModMyLoadingLoadFail">Failed to Load</s:String>
17021704
<s:String x:Key="LangModMyLoadingUnknownError">Unknown Error</s:String>

‎Plain Craft Launcher 2/Resources/Language/en-US.xaml

+2
Original file line numberDiff line numberDiff line change
@@ -1699,6 +1699,8 @@ About to open: {0}</s:String>
16991699
<s:String x:Key="LangModBaseExceptionEmptyFile">The file read is empty</s:String>
17001700
<s:String x:Key="LangModBaseExceptionInvalidJson">Not a valid JSON file.</s:String>
17011701
<s:String x:Key="LangModBaseNoExceptionDetail">No error information available!</s:String>
1702+
<s:String x:Key="LangModBaseExceptionType">Exception type: </s:String>
1703+
<s:String x:Key="LangModBaseExceptionInfoDetail">Detailed exception information: </s:String>
17021704
<s:String x:Key="LangModMyLoadingLoading">Loading...</s:String>
17031705
<s:String x:Key="LangModMyLoadingLoadFail">Failed to Load</s:String>
17041706
<s:String x:Key="LangModMyLoadingUnknownError">Unknown Error</s:String>

‎Plain Craft Launcher 2/Resources/Language/es-ES.xaml

+2
Original file line numberDiff line numberDiff line change
@@ -1692,6 +1692,8 @@ Si esa opción no está disponible, seleccione "Establecer contraseña" e inicie
16921692
<s:String x:Key="LangModBaseExceptionEmptyFile">El archivo leído está vacío</s:String>
16931693
<s:String x:Key="LangModBaseExceptionInvalidJson">No es un archivo JSON válido.</s:String>
16941694
<s:String x:Key="LangModBaseNoExceptionDetail">¡No hay información de error disponible!</s:String>
1695+
<s:String x:Key="LangModBaseExceptionType">错误类型：</s:String>
1696+
<s:String x:Key="LangModBaseExceptionInfoDetail">详细错误信息：</s:String>
16951697
<s:String x:Key="LangModMyLoadingLoading">Cargando...</s:String>
16961698
<s:String x:Key="LangModMyLoadingLoadFail">Error al Cargar</s:String>
16971699
<s:String x:Key="LangModMyLoadingUnknownError">Error Desconocido</s:String>

‎Plain Craft Launcher 2/Resources/Language/fr-FR.xaml

+2
Original file line numberDiff line numberDiff line change
@@ -1685,6 +1685,8 @@ Si cette option n'est pas disponible, sélectionnez « Définir un mot de passe
16851685
<s:String x:Key="LangModBaseExceptionEmptyFile">Le fichier lu est vide</s:String>
16861686
<s:String x:Key="LangModBaseExceptionInvalidJson">Ce n'est pas un fichier JSON valide.</s:String>
16871687
<s:String x:Key="LangModBaseNoExceptionDetail">Aucune information d'erreur disponible !</s:String>
1688+
<s:String x:Key="LangModBaseExceptionType">错误类型：</s:String>
1689+
<s:String x:Key="LangModBaseExceptionInfoDetail">详细错误信息：</s:String>
16881690
<s:String x:Key="LangModMyLoadingLoading">Chargement...</s:String>
16891691
<s:String x:Key="LangModMyLoadingLoadFail">Échec du chargement</s:String>
16901692
<s:String x:Key="LangModMyLoadingUnknownError">Erreur inconnue</s:String>

‎Plain Craft Launcher 2/Resources/Language/ja-JP.xaml

+2
Original file line numberDiff line numberDiff line change
@@ -1698,6 +1698,8 @@ VPNや加速器を使用している場合は、それらをオフにするか
16981698
<s:String x:Key="LangModBaseExceptionEmptyFile">読み取ったファイルが空です</s:String>
16991699
<s:String x:Key="LangModBaseExceptionInvalidJson">有効な JSON ファイルではありません</s:String>
17001700
<s:String x:Key="LangModBaseNoExceptionDetail">利用可能なエラーメッセージがありません！</s:String>
1701+
<s:String x:Key="LangModBaseExceptionType">错误类型：</s:String>
1702+
<s:String x:Key="LangModBaseExceptionInfoDetail">详细错误信息：</s:String>
17011703
<s:String x:Key="LangModMyLoadingLoading">読み込み中</s:String>
17021704
<s:String x:Key="LangModMyLoadingLoadFail">読み込み失敗</s:String>
17031705
<s:String x:Key="LangModMyLoadingUnknownError">不明なエラー</s:String>

‎Plain Craft Launcher 2/Resources/Language/ko-KR.xaml

+2
Original file line numberDiff line numberDiff line change
@@ -1688,6 +1688,8 @@ VPN이나 가속기를 사용 중이라면, 이를 끄거나 노드를 변경한
16881688
<s:String x:Key="LangModBaseExceptionEmptyFile">읽은 파일이 비어 있습니다.</s:String>
16891689
<s:String x:Key="LangModBaseExceptionInvalidJson">유효한 JSON 파일이 아닙니다.</s:String>
16901690
<s:String x:Key="LangModBaseNoExceptionDetail">사용 가능한 오류 정보가 없습니다!</s:String>
1691+
<s:String x:Key="LangModBaseExceptionType">错误类型：</s:String>
1692+
<s:String x:Key="LangModBaseExceptionInfoDetail">详细错误信息：</s:String>
16911693
<s:String x:Key="LangModMyLoadingLoading">로딩 중</s:String>
16921694
<s:String x:Key="LangModMyLoadingLoadFail">로딩 실패</s:String>
16931695
<s:String x:Key="LangModMyLoadingUnknownError">알 수 없는 오류</s:String>

‎Plain Craft Launcher 2/Resources/Language/lzh.xaml

+2
Original file line numberDiff line numberDiff line change
@@ -1701,6 +1701,8 @@ PCL 不支持其他亂七八糟的下載協議。</s:String>
17011701
<s:String x:Key="LangModBaseExceptionEmptyFile">讀取到的文件為空</s:String>
17021702
<s:String x:Key="LangModBaseExceptionInvalidJson">不是有效的 JSON 文件</s:String>
17031703
<s:String x:Key="LangModBaseNoExceptionDetail">無可用錯誤信息！</s:String>
1704+
<s:String x:Key="LangModBaseExceptionType">错误类型：</s:String>
1705+
<s:String x:Key="LangModBaseExceptionInfoDetail">详细错误信息：</s:String>
17041706
<s:String x:Key="LangModMyLoadingLoading">加載中</s:String>
17051707
<s:String x:Key="LangModMyLoadingLoadFail">加載失敗</s:String>
17061708
<s:String x:Key="LangModMyLoadingUnknownError">未知錯誤</s:String>

‎Plain Craft Launcher 2/Resources/Language/ru-RU.xaml

+2
Original file line numberDiff line numberDiff line change
@@ -1699,6 +1699,8 @@ URL: {0}</s:String>
16991699
<s:String x:Key="LangModBaseExceptionEmptyFile">Прочитанный файл пуст</s:String>
17001700
<s:String x:Key="LangModBaseExceptionInvalidJson">Недопустимый файл JSON.</s:String>
17011701
<s:String x:Key="LangModBaseNoExceptionDetail">Информация об ошибке отсутствует!</s:String>
1702+
<s:String x:Key="LangModBaseExceptionType">错误类型：</s:String>
1703+
<s:String x:Key="LangModBaseExceptionInfoDetail">详细错误信息：</s:String>
17021704
<s:String x:Key="LangModMyLoadingLoading">Загрузка...</s:String>
17031705
<s:String x:Key="LangModMyLoadingLoadFail">Не удалось загрузить</s:String>
17041706
<s:String x:Key="LangModMyLoadingUnknownError">Неизвестная ошибка</s:String>

‎Plain Craft Launcher 2/Resources/Language/sk-SK.xaml

+2
Original file line numberDiff line numberDiff line change
@@ -1699,6 +1699,8 @@ Otvorenie: {0}</s:String>
16991699
<s:String x:Key="LangModBaseExceptionEmptyFile">Súbor čítaný je prázdny</s:String>
17001700
<s:String x:Key="LangModBaseExceptionInvalidJson">Nie je platný JSON súbor.</s:String>
17011701
<s:String x:Key="LangModBaseNoExceptionDetail">Nie je dostupná žiadna informácia o chybe!</s:String>
1702+
<s:String x:Key="LangModBaseExceptionType">错误类型：</s:String>
1703+
<s:String x:Key="LangModBaseExceptionInfoDetail">详细错误信息：</s:String>
17021704
<s:String x:Key="LangModMyLoadingLoading">Načítava sa...</s:String>
17031705
<s:String x:Key="LangModMyLoadingLoadFail">Načítanie zlyhalo</s:String>
17041706
<s:String x:Key="LangModMyLoadingUnknownError">Neznáma chyba</s:String>

‎Plain Craft Launcher 2/Resources/Language/zh-CN.xaml

+2
Original file line numberDiff line numberDiff line change
@@ -1701,6 +1701,8 @@ PCL 不支持其他乱七八糟的下载协议。</s:String>
17011701
<s:String x:Key="LangModBaseExceptionEmptyFile">读取到的文件为空</s:String>
17021702
<s:String x:Key="LangModBaseExceptionInvalidJson">不是有效的 JSON 文件</s:String>
17031703
<s:String x:Key="LangModBaseNoExceptionDetail">无可用错误信息！</s:String>
1704+
<s:String x:Key="LangModBaseExceptionType">错误类型：</s:String>
1705+
<s:String x:Key="LangModBaseExceptionInfoDetail">详细错误信息：</s:String>
17041706
<s:String x:Key="LangModMyLoadingLoading">加载中</s:String>
17051707
<s:String x:Key="LangModMyLoadingLoadFail">加载失败</s:String>
17061708
<s:String x:Key="LangModMyLoadingUnknownError">未知错误</s:String>

‎Plain Craft Launcher 2/Resources/Language/zh-HK.xaml

+2
Original file line numberDiff line numberDiff line change
@@ -1701,6 +1701,8 @@ PCL 不支援其他亂七八糟的下載協議。</s:String>
17011701
<s:String x:Key="LangModBaseExceptionEmptyFile">存取到的檔案為空</s:String>
17021702
<s:String x:Key="LangModBaseExceptionInvalidJson">不是有效的 JSON 檔案</s:String>
17031703
<s:String x:Key="LangModBaseNoExceptionDetail">無可用錯誤資訊！</s:String>
1704+
<s:String x:Key="LangModBaseExceptionType">錯誤類型：</s:String>
1705+
<s:String x:Key="LangModBaseExceptionInfoDetail">詳細錯誤資訊：</s:String>
17041706
<s:String x:Key="LangModMyLoadingLoading">加載中</s:String>
17051707
<s:String x:Key="LangModMyLoadingLoadFail">加載失敗</s:String>
17061708
<s:String x:Key="LangModMyLoadingUnknownError">未知錯誤</s:String>

‎Plain Craft Launcher 2/Resources/Language/zh-MARS.xaml

+2
Original file line numberDiff line numberDiff line change
@@ -1701,6 +1701,8 @@ PCL 芣伎歭娸彵亂⑦仈蹧哋芐酨拹议。</s:String>
17011701
<s:String x:Key="LangModBaseExceptionEmptyFile">渎掫菿哋妏件潙涳</s:String>
17021702
<s:String x:Key="LangModBaseExceptionInvalidJson">芣湜洧效哋 JSON 妏件</s:String>
17031703
<s:String x:Key="LangModBaseNoExceptionDetail">嘸妸鼡措誤信息！</s:String>
1704+
<s:String x:Key="LangModBaseExceptionType">错误类型：</s:String>
1705+
<s:String x:Key="LangModBaseExceptionInfoDetail">详细错误信息：</s:String>
17041706
<s:String x:Key="LangModMyLoadingLoading">咖酨狆</s:String>
17051707
<s:String x:Key="LangModMyLoadingLoadFail">咖酨妷敗</s:String>
17061708
<s:String x:Key="LangModMyLoadingUnknownError">沬倁措誤</s:String>

‎Plain Craft Launcher 2/Resources/Language/zh-MEME.xaml

+2
Original file line numberDiff line numberDiff line change
@@ -1702,6 +1702,8 @@
17021702
<s:String x:Key="LangModBaseExceptionEmptyFile">读取到的文件为空</s:String>
17031703
<s:String x:Key="LangModBaseExceptionInvalidJson">不是有效的 JSON 文件</s:String>
17041704
<s:String x:Key="LangModBaseNoExceptionDetail">莫得可用错误信息！</s:String>
1705+
<s:String x:Key="LangModBaseExceptionType">错误类型：</s:String>
1706+
<s:String x:Key="LangModBaseExceptionInfoDetail">详细错误信息：</s:String>
17051707
<s:String x:Key="LangModMyLoadingLoading">加载中</s:String>
17061708
<s:String x:Key="LangModMyLoadingLoadFail">加载不成功</s:String>
17071709
<s:String x:Key="LangModMyLoadingUnknownError">未知不成功</s:String>

‎Plain Craft Launcher 2/Resources/Language/zh-TW.xaml

+2
Original file line numberDiff line numberDiff line change
@@ -1701,6 +1701,8 @@ PCL 不支援其他亂七八糟的下載協議。</s:String>
17011701
<s:String x:Key="LangModBaseExceptionEmptyFile">存取到的檔案為空</s:String>
17021702
<s:String x:Key="LangModBaseExceptionInvalidJson">不是有效的 JSON 檔案</s:String>
17031703
<s:String x:Key="LangModBaseNoExceptionDetail">無可用錯誤資訊！</s:String>
1704+
<s:String x:Key="LangModBaseExceptionType">錯誤類型：</s:String>
1705+
<s:String x:Key="LangModBaseExceptionInfoDetail">詳細錯誤資訊：</s:String>
17041706
<s:String x:Key="LangModMyLoadingLoading">載入中</s:String>
17051707
<s:String x:Key="LangModMyLoadingLoadFail">載入失敗</s:String>
17061708
<s:String x:Key="LangModMyLoadingUnknownError">未知錯誤</s:String>

0 commit comments

Comments
 (0)