Add simplified and traditional chinese (#1250)

Co-authored-by: BornToBeRoot <[email protected]>

Author: BornToBeRoot

InnoSetup.iss

@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "NETworkManager"
-#define MyAppVersion "2021.6.26.0"
+#define MyAppVersion "2021.9.5.0"
 #define MyAppPublisher "BornToBeRoot"
 #define MyAppURL "https://github.com/BornToBeRoot/NETworkManager/"
 #define MyAppExeName "NETworkManager.exe"
@@ -38,19 +38,21 @@ ArchitecturesInstallIn64BitMode=x64
 WizardSmallImageFile=Images\NETworkManager_InnoSetup.bmp
 
 [Languages]
-Name: "english";    MessagesFile: "compiler:Default.isl"
-Name: "brasilian";  MessagesFile: "compiler:Languages\BrazilianPortuguese.isl"
-Name: "czech";      MessagesFile: "compiler:Languages\Czech.isl"
-Name: "dutch";      MessagesFile: "compiler:Languages\Dutch.isl"
-Name: "french";     MessagesFile: "compiler:Languages\French.isl"
-Name: "german";     MessagesFile: "compiler:Languages\German.isl"
-Name: "italian";    MessagesFile: "compiler:Languages\Italian.isl"
-Name: "japanese";   MessagesFile: "compiler:Languages\Japanese.isl"
-Name: "polish";     MessagesFile: "compiler:Languages\Polish.isl"
-Name: "russian";    MessagesFile: "compiler:Languages\Russian.isl"
-Name: "spanish";    MessagesFile: "compiler:Languages\Spanish.isl"
-Name: "slovenian";  MessagesFile: "compiler:Languages\Slovenian.isl"
-Name: "turkish";    MessagesFile: "compiler:Languages\Turkish.isl"
+Name: "english";            MessagesFile: "compiler:Default.isl"
+Name: "brasilian";          MessagesFile: "compiler:Languages\BrazilianPortuguese.isl"
+Name: "chinesesimplified";  MessagesFile: "compiler:Languages\ChineseSimplified.isl"
+Name: "chinesetraditional"; MessagesFile: "compiler:Languages\ChineseTraditional.isl"
+Name: "czech";              MessagesFile: "compiler:Languages\Czech.isl"
+Name: "dutch";              MessagesFile: "compiler:Languages\Dutch.isl"
+Name: "french";             MessagesFile: "compiler:Languages\French.isl"
+Name: "german";             MessagesFile: "compiler:Languages\German.isl"
+Name: "italian";            MessagesFile: "compiler:Languages\Italian.isl"
+Name: "japanese";           MessagesFile: "compiler:Languages\Japanese.isl"
+Name: "polish";             MessagesFile: "compiler:Languages\Polish.isl"
+Name: "russian";            MessagesFile: "compiler:Languages\Russian.isl"
+Name: "spanish";            MessagesFile: "compiler:Languages\Spanish.isl"
+Name: "slovenian";          MessagesFile: "compiler:Languages\Slovenian.isl"
+Name: "turkish";            MessagesFile: "compiler:Languages\Turkish.isl"
 
 [Tasks]
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"

README.md

@@ -50,14 +50,15 @@
 # Build
 __Requirements__
 - [SDK .NET 5.0](https://dotnet.microsoft.com/download/dotnet/5.0)
-- Visual Studio with `.NET desktop development` and `Universal Windows Platform development` 
+- Visual Studio 2019 or later with `.NET desktop development` and `Universal Windows Platform development` 
 
 __Optional__
 - [InnoSetup](https://jrsoftware.org/isinfo.php) (if you want to create an installer)
+  - Download `ChineseSimplified.isl` and `ChineseTraditional.isl` from the [official repo](https://github.com/jrsoftware/issrc/blob/main/Files/Languages/Unofficial/) and place them in the language folder of InnoSetup
 
-__Steps__
-1. Clone or download the repository
-2. Run the `.\build.ps1` script with PowerShell (alternatively open the `Source/NETworkManager.sln` in Visual Studio)
+__Build__
+1. Clone or download the repository: `git clone https://github.com/BornToBeRoot/NETworkManager`
+2. Run the `.\build.ps1` script with PowerShell to compile the solution and create a portable and a setup version (or open the file `Source/NETworkManager.sln` in Visual Studio to debug or build the solution)
 
 You can also copy & paste this command in your PowerShell console :smile:
 ```PowerShell

Source/GlobalAssemblyInfo.cs

@@ -6,5 +6,5 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-[assembly: AssemblyVersion("2021.6.26.0")]
-[assembly: AssemblyFileVersion("2021.6.26.0")]
+[assembly: AssemblyVersion("2021.9.5.0")]
+[assembly: AssemblyFileVersion("2021.9.5.0")]

build.ps1

@@ -31,6 +31,11 @@ $SetupContent = Get-Content -Path $InnoSetupFile -Encoding utf8
 $SetupContent = $SetupContent -replace $PatternSetupVersion,"#define MyAppVersion ""$($VersionString)"""
 $SetupContent | Set-Content -Path $InnoSetupFile -Encoding utf8
 
+### Warnings ###
+# CS4014 - Call is not awaited
+# NU1701 - Target framework is .NET Framework
+# CS1591 - Missing XML comment
+
 # Dotnet clean, restore, build and publish
 dotnet clean "$PSScriptRoot\Source\NETworkManager.sln"
 dotnet restore "$PSScriptRoot\Source\NETworkManager.sln"
@@ -58,13 +63,31 @@ Compress-Archive -Path "$BuildPath\NETworkManager" -DestinationPath "$BuildPath\
 Remove-Item -Path "$BuildPath\NETworkManager\IsPortable.settings"
 
 # Installer Build
-$InnoSetupCompiler = "${env:ProgramFiles(x86)}\Inno Setup 6\ISCC.exe"
+$InnoSetupPath = "${env:ProgramFiles(x86)}\Inno Setup 6"
 
-if (Test-Path -Path $InnoSetupCompiler) {
-    Start-Process -FilePath $InnoSetupCompiler -ArgumentList """$PSScriptRoot\InnoSetup.iss""" -NoNewWindow -Wait
+$InnoSetupLanguageMissing = $false
+
+if(-not(Test-Path -Path "$InnoSetupPath\Languages\ChineseSimplified.isl"))
+{
+    Write-Host "ChineseSimplified.isl not found in InnoSetup language folder.`nDownload URL: https://github.com/jrsoftware/issrc/blob/main/Files/Languages/Unofficial/ChineseSimplified.isl" -ForegroundColor Yellow
+    $InnoSetupLanguageMissing = $true
+}
+
+if(-not(Test-Path -Path "$InnoSetupPath\Languages\ChineseTraditional.isl"))
+{
+    Write-Host "ChineseTraditional.isl not found in InnoSetup language folder.`nDownload URL: https://github.com/jrsoftware/issrc/blob/main/Files/Languages/Unofficial/ChineseTraditional.isl" -ForegroundColor Yellow
+    $InnoSetupLanguageMissing = $true
 }
-else {
-    Write-Host "InnoSetup not installed or not found. Skip installer build..." -ForegroundColor Yellow
+
+$InnoSetupCompiler = "$InnoSetupPath\ISCC.exe"
+
+if(-not(Test-Path -Path $InnoSetupCompiler) -or $InnoSetupLanguageMissing)
+{
+    Write-Host "InnoSetup is not installed correctly. Skip installer build..." -ForegroundColor Cyan
+}
+else
+{
+    Start-Process -FilePath $InnoSetupCompiler -ArgumentList """$PSScriptRoot\InnoSetup.iss""" -NoNewWindow -Wait
 }
 
 # SHA256 file hash
@@ -73,4 +96,4 @@ foreach($hash in Get-ChildItem -Path $BuildPath | Where-Object {$_.Name.EndsWith
     "$($hash.Algorithm) | $($hash.Hash) | $([System.IO.Path]::GetFileName($hash.Path))" | Out-File -FilePath "$BuildPath\NETworkManager_$($Version)_Hash.txt" -Encoding utf8 -Append
 }
 
-Write-Host "Build finished! All files are here: $BuildPath" -ForegroundColor Green
+Write-Host "Build finished! All files are here: $BuildPath" -ForegroundColor Green

docs/04_Changelog.md

@@ -18,12 +18,13 @@ Date: **xx.0x.2021**
 
 ## What's new?
 - Czech added [#1221](https://github.com/BornToBeRoot/NETworkManager/pull/1221){:target="_blank"}
+- Chinese added to InnoSetup [#1224](https://github.com/BornToBeRoot/NETworkManager/pull/1224){:target="_blank"}
 
 ## Improvements
 - Remote Desktop - Connection dialog now allows `hostname:port` [#1214](https://github.com/BornToBeRoot/NETworkManager/issues/1214){:target="_blank"}
 
 ## Bugfixes
-- Remote Desktop - Settings when connecting without profile were ignored [#1214](https://github.com/BornToBeRoot/NETworkManager/issues/1214){:target="_blank"}
+- Remote Desktop - Settings when connecting without profile are now applied [#1214](https://github.com/BornToBeRoot/NETworkManager/issues/1214){:target="_blank"}
 
 ## Other
 - Language files updates [#transifex](https://github.com/BornToBeRoot/NETworkManager/pulls?q=author%3Aapp%2Ftransifex-integration){:target="_blank"}