Merge pull request #53 from Chiloven945/Language

fix: GetLangByNumIsPlural() can't use param

Author: tangge233

Plain Craft Launcher 2/Modules/Minecraft/ModComp.vb

@@ -1393,12 +1393,12 @@ Retry:
             If Title <> FileName.BeforeLast(".") Then Info.Add(FileName.BeforeLast("."))
             Select Case Type
                 Case CompType.Mod
-                    If Dependencies.Any Then Info.Add(GetLocationNum(Dependencies.Count) & " " & GetLangByNumIsPlural(Dependencies.Count, "LangModCompModDependentCount"))
+                    If Dependencies.Any Then Info.Add(GetLangByNumIsPlural(Dependencies.Count, "LangModCompModDependentCount", GetLocationNum(Dependencies.Count)))
                 Case CompType.ModPack
                     If GameVersions.All(Function(v) v.Contains("w")) Then Info.Add($"{GetLang("LangModCompModGameVersion")} {Join(GameVersions, GetLang("LangComma"))}")
             End Select
             If DownloadCount > 0 Then 'CurseForge 的下载次数经常错误地返回 0
-                Info.Add(GetLocationNum(DownloadCount) & " " & GetLangByNumIsPlural(DownloadCount, "LangModCompModDownload"))
+                Info.Add(GetLangByNumIsPlural(DownloadCount, "LangModCompModDownload", GetLocationNum(DownloadCount)))
             End If
             Info.Add(GetLang("LangModCompModUpdateTime", GetTimeSpanString(ReleaseDate - Date.Now, False)))
             If Status <> CompFileStatus.Release Then Info.Add(StatusDescription)

Plain Craft Launcher 2/Modules/Modi18n.vb

@@ -162,12 +162,13 @@ Module Modi18n
     ''' </summary>
     ''' <param name="Count">数量</param>
     ''' <param name="Key">调用的键名</param>
+    ''' <param name="Param">字段中对应要展示的内容</param>
     ''' <returns>对应单复数形式的译文</returns>
-    Public Function GetLangByNumIsPlural(Count As Int32, Key As String) As String
+    Public Function GetLangByNumIsPlural(Count As Int32, Key As String, ParamArray Param As String()) As String
         If Count <= 1 Then
-            Return GetLang(Key)
+            Return GetLang(Key, Param)
         Else
-            Return GetLang(Key & "P")
+            Return GetLang(Key & "P", Param)
         End If
     End Function