Merge pull request #27 from Peppie84/development

[1.3.0.0] - 2023-06-18

.github/FUNDING.yml

@@ -0,0 +1,13 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+custom: ['https://www.paypal.com/paypalme/peppie84'] # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

CHANGELOG.md

@@ -4,7 +4,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
-- currently nothing
+
+
+## [1.3.0.0] - 2023-06-18
+- Added `l10n_pl_.xml` by [dexus92](https://github.com/dexus92)
+- Added `l10n_es_.xml` by [Ferchu425](https://github.com/Ferchu425)
+- modDesc.xml descVersion update
+
 
 ## [1.2.0.0] - 2023-06-28
 - Added `l10n_hu.xml` by [ZsPetrovics](https://github.com/ZsPetrovics)

FS22_ExtendedGameInfoDisplay/modDesc.xml

@@ -1,15 +1,20 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<modDesc descVersion="75">
-  <author>Peppie84</author>
-  <version>1.2.0.0</version>
-  <title>
-    <en>Extended Game Infodisplay</en>
-    <de>Erweiterte Spiel-Infodarstellung</de>
-  </title>
-  <description>
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<modDesc descVersion="80">
+  <author>Peppie84</author>
+  <version>1.3.0.0</version>
+  <title>
+    <en>Extended Game Infodisplay</en>
+    <de>Erweiterte Spiel-Infodarstellung</de>
+  </title>
+  <description>
     <en><![CDATA[
 Expands the current GameInfoDisplay in the upper right corner by displaying the current year under the date and activates a hidden temperature feature with an indicator of whether the temperature is falling, staying constant or rising, the display of the current temperature. I also added the min/max temperature of the day.
 
+Changelog v1.3.0.0
+- Added ES translation
+- Added PL translation
+- Moddesc version update
+
 Changelog v1.2.0.0
 - Added HU translation
 - Added RU translation
@@ -22,10 +27,15 @@ Changelog v1.1.0.0
 - Added CZ translation
 
 For more information, help, and reporting issues please visit <a href='https://github.com/Peppie84/FS22_ExtendedGameInfoDisplay'>GitHub</a>.
-]]>    </en>
+]]></en>
     <de><![CDATA[
 Erweitert die aktuelle GameInfoDisplay oben rechts um die Anzeige des aktuellen Jahres unter dem Datum und aktiviert ein verstecktes Temperaturfeature mit einem Indikator ob die Temepratur fällt, gleich bleibt oder steigt, die Anzeige der aktuellen Temperatur und der min/max Temperatur des Tages.
 
+Changelog v1.3.0.0
+- ES Übersetzung hinzugefügt
+- PL Übersetzung hinzugefügt
+- Moddesc version aktualisiert
+
 Changelog v1.2.0.0
 - HU Übersetzung hinzugefügt
 - RU Übersetzung hinzugefügt
@@ -38,14 +48,14 @@ Changelog v1.1.0.0
 - CZ Übersetzung hinzugefügt
 
 Weitere Informationen, Hilfe und Probleme melden finden Sie unter <a href='https://github.com/Peppie84/FS22_ExtendedGameInfoDisplay'>GitHub</a>.
-]]>    </de>
-  </description>
-  <iconFilename>icon_ExGameInfoDisp.dds</iconFilename>
-  <multiplayer supported="true" />
-  <extraSourceFiles>
-    <sourceFile filename="yearinfo.lua" />
-    <sourceFile filename="tempinfo.lua" />
-    <sourceFile filename="extendedgameinfodisplaygui.lua" />
-  </extraSourceFiles>
-  <l10n filenamePrefix="translations/l10n" />
-</modDesc>
+]]></de>
+  </description>
+  <iconFilename>icon_ExGameInfoDisp.dds</iconFilename>
+  <multiplayer supported="true" />
+  <extraSourceFiles>
+    <sourceFile filename="yearinfo.lua" />
+    <sourceFile filename="tempinfo.lua" />
+    <sourceFile filename="extendedgameinfodisplaygui.lua" />
+  </extraSourceFiles>
+  <l10n filenamePrefix="translations/l10n" />
+</modDesc>

FS22_ExtendedGameInfoDisplay/translations/l10n_es.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="no" ?>
+<l10n>
+  <translationContributors>Ferchu425</translationContributors>
+  <elements>
+    <e k="mod_title" v="Extended Game Infodisplay"/>
+    <e k="yearinfo_current_year" v="Año"/>
+    <e k="settings_temperature_label" v="Temperatura"/>
+    <e k="settings_temperature_description" v="Alterna la vista de la temperatura actual, mínima &amp; máxima en el HUD de la esquina superior derecha."/>
+    <e k="settings_temperature_option1" v="Sí"/>
+    <e k="settings_temperature_option2" v="No"/>
+  </elements>
+</l10n>

FS22_ExtendedGameInfoDisplay/translations/l10n_pl.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="no" ?>
+<l10n>
+  <translationContributors>dexus</translationContributors>
+  <elements>
+    <e k="mod_title" v="Extended Game Infodisplay"/>
+    <e k="yearinfo_current_year" v="Rok"/>
+    <e k="settings_temperature_label" v="Temperatura"/>
+    <e k="settings_temperature_description" v="Przełącza widok bieżącej minimalnej &amp; maksymalnej temperatury w prawym górnym rogu hud."/>
+    <e k="settings_temperature_option1" v="Wł"/>
+    <e k="settings_temperature_option2" v="Wył"/>
+  </elements>
+</l10n>

README.md

@@ -1,10 +1,9 @@
 <a name="readme-top"></a>
 
-
 <div align="center">
 
 [![FarmingSimulator-22](https://img.shields.io/badge/FarmingSimulator-22-blue?style=flat-square)](https://www.farming-simulator.com/)
-[![Modhub Version](https://img.shields.io/badge/Modhub-v1.2.0.0-green?style=flat-square)](https://farming-simulator.com/mod.php?mod_id=267536)
+[![Modhub Version](https://img.shields.io/badge/Modhub-v1.3.0.0-green?style=flat-square)](https://farming-simulator.com/mod.php?mod_id=267536)
 [![GitHub issues](https://img.shields.io/github/issues/Peppie84/FS22_ExtendedGameInfoDisplay?style=flat-square)](https://github.com/Peppie84/FS22_ExtendedGameInfoDisplay/issues)
 [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue?style=flat-square)](https://www.gnu.org/licenses/gpl-3.0)
 [![Last commit](https://img.shields.io/github/last-commit/Peppie84/FS22_ExtendedGameInfoDisplay?style=flat-square&color=important)](https://github.com/Peppie84/FS22_ExtendedGameInfoDisplay/commits/development)

prepare-release.ps1

@@ -3,9 +3,11 @@
 #
 $modDirectory = Split-Path -Path $pwd -Leaf
 $modName = "$modDirectory";
+$origModName = $modName
 $modDescFileName = "$modDirectory/modDesc.xml"
 $testRunnerLogPath = ".\.testrunner\"
 $readmeFilePath = "README.md"
+$isDevelopmentVersion = 0
 
 $xmlData = [xml] (Get-Content $modDescFileName -Encoding UTF8)
 $currentVersion = $xmlData.modDesc.version
@@ -22,8 +24,17 @@ if ( $newVersion -ne "1.0.0.0" )
     $modName = "$($modName)_update"
 }
 
+$devVersionConfirmation = read-host -Prompt "DEV version? (y/N) "
+if ($devVersionConfirmation -eq 'y') {
+    $currentGitHash = ((git rev-parse --short HEAD) | Out-String).Trim()
+    $newVersion = "$newVersion-$currentGitHash"
+    $isDevelopmentVersion = 1
+    $modName = "$($origModName)_dev_release"
+}
+
 # Write new moddesc version
 $xmlData = [xml] (Get-Content $modDescFileName -Encoding UTF8)
+$backupXmlData = $xmlData.Clone()
 $xmlData.modDesc.version = "$newVersion"
 
 $utf8WithoutBom = New-Object System.Text.UTF8Encoding($false)
@@ -35,10 +46,18 @@ $xmlStreamWriter.Close()
 # Write new readme version
 ((Get-Content -path $readmeFilePath -Raw) -replace "Modhub-v$currentVersion","Modhub-v$newVersion") | Set-Content -NoNewline -Path $readmeFilePath
 
-
 # Make test run (add testrunner path to your environment path)
 New-Item -ItemType Directory -Force -Path "$testRunnerLogPath"
 TestRunner_public --logPath "$testRunnerLogPath" --outputPath "$testRunnerLogPath" --noPause "$modDirectory\"
 
 # Make zip file
-Compress-Archive -Force -Path "$modDirectory\*" -DestinationPath "$modName.zip"
+7z a -bd -stl -tzip -mx=9 "$modName.zip" "$modDirectory/."
+
+# Write old moddesc version back if we have a dev version
+if ($isDevelopmentVersion -eq '1') {
+    $utf8WithoutBom = New-Object System.Text.UTF8Encoding($false)
+    $xmlStreamWriter = New-Object System.IO.StreamWriter($modDescFileName, $false, $utf8WithoutBom)
+
+    $backupXmlData.Save( $xmlStreamWriter )
+    $xmlStreamWriter.Close()
+}