Merge pull request #20 from Peppie84/development

Release v1.2.0.0

CHANGELOG.md

@@ -4,17 +4,24 @@ 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.2.0.0] - 2023-06-28
+- Added `l10n_hu.xml` by [ZsPetrovics](https://github.com/ZsPetrovics)
+- Fixed lua error while connecting to dedi-server - for [#10](https://github.com/Peppie84/FS22_ExtendedGameInfoDisplay/issues/10)
+- Display temperatur also in Fahrenheit if set via settings - for [#12](https://github.com/Peppie84/FS22_ExtendedGameInfoDisplay/issues/12)
+- Added `l10n_ru.xml` by [vitalii2011](https://github.com/vitalii2011)
+- modDesc.xml descVersion update
 
 
 ## [1.1.0.0] - 2023-05-26
 - Added github link to modDesc.xml
 - Refactored TempInfo.lua
-- Decreased TempInfo min/max temperatur font size - for #2
-- Added Settings area to disable temp info - for #1
+- Decreased TempInfo min/max temperatur font size - for [#2](https://github.com/Peppie84/FS22_ExtendedGameInfoDisplay/issues/2)
+- Added Settings area to disable temp info - for [#1](https://github.com/Peppie84/FS22_ExtendedGameInfoDisplay/issues/1)
 - modDesc.xml descVersion update
 - Added `l10n_cz.xml` by [SniperKittenCZ](https://github.com/SniperKittenCZ)
 
 
 ## [1.0.0.0] - 2023-04-17
-
 - Initial release (https://www.farming-simulator.com/mod.php?mod_id=267536)

FS22_ExtendedGameInfoDisplay/modDesc.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
-<modDesc descVersion="74">
+<modDesc descVersion="75">
   <author>Peppie84</author>
-  <version>1.1.0.0</version>
+  <version>1.2.0.0</version>
   <title>
     <en>Extended Game Infodisplay</en>
     <de>Erweiterte Spiel-Infodarstellung</de>
@@ -10,20 +10,32 @@
     <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.2.0.0
+- Added HU translation
+- Added RU translation
+- Fixed lua error while connecting to dedi-server
+- Display temperature also in Fahrenheit if set via settings
+
 Changelog v1.1.0.0
 - Decreased min/max temperature font size
 - Added settings area to en-/disable temperature info
-- Added CZ translations
+- Added CZ translation
 
 For more information, help, and reporting issues please visit <a href='https://github.com/Peppie84/FS22_ExtendedGameInfoDisplay'>GitHub</a>.
 ]]>    </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.2.0.0
+- HU Übersetzung hinzugefügt
+- RU Übersetzung hinzugefügt
+- Lua Error behoben der beim verbinden auf einen Dedi-Server geworfen wurde
+- Die Temperatur wird auch in Fahrenheit angezeigt wenn es in den Einstellungen aktiviert wurde
+
 Changelog v1.1.0.0
 - Schriftgröße der min/max Temperatur verkleinert
 - Bei Settings kann die Temperaturanzeige ein-/ausgeblendet werden
-- CZ translations hinzugefügt
+- CZ Übersetzung hinzugefügt
 
 Weitere Informationen, Hilfe und Probleme melden finden Sie unter <a href='https://github.com/Peppie84/FS22_ExtendedGameInfoDisplay'>GitHub</a>.
 ]]>    </de>

FS22_ExtendedGameInfoDisplay/tempinfo.lua

@@ -21,13 +21,21 @@ end
 ---and night text with the current min/max temperatur
 ---@param overwrittenFunc function
 function TempInfo:gameinfodisplay__updateTemperature(overwrittenFunc)
+    if g_currentMission.gameStarted == false then
+        return
+    end
+
     overwrittenFunc(self)
 
-    local minTemperatur, maxTemperatur = self.environment.weather:getCurrentMinMaxTemperatures()
-    local currentTemperatur = self.environment.weather:getCurrentTemperature()
+    local minTemperaturInC, maxTemperaturInC = self.environment.weather:getCurrentMinMaxTemperatures()
+    local currentTemperaturInC = self.environment.weather:getCurrentTemperature()
+
+    local minTemperaturExpanded =  g_i18n:getTemperature(minTemperaturInC)
+    local maxTemperaturExpanded = g_i18n:getTemperature(maxTemperaturInC)
+    local currentTemperaturExpanded = g_i18n:getTemperature(currentTemperaturInC)
 
-    self.temperatureDayText = string.format("%d°", currentTemperatur)
-    self.temperatureNightText = string.format("%d°/%d°", maxTemperatur, minTemperatur)
+    self.temperatureDayText = string.format('%d°', currentTemperaturExpanded)
+    self.temperatureNightText = string.format('%d°/%d°', maxTemperaturExpanded, minTemperaturExpanded)
 end
 
 ---Overwritten GameInfoDisplay:drawTemperatureText()
@@ -50,6 +58,6 @@ GameInfoDisplay.drawTemperatureText = Utils.overwrittenFunction(GameInfoDisplay.
 
 -- Change dimensions of the temp box
 GameInfoDisplay.SIZE.TEMPERATURE_BOX = {
-    92,
+    96,
     GameInfoDisplay.BOX_HEIGHT
 }

FS22_ExtendedGameInfoDisplay/translations/l10n_hu.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="no" ?>
+<l10n>
+  <translationContributors>Petrovics Zsombor</translationContributors>
+  <elements>
+    <e k="mod_title" v="Kibővített Információs Sáv"/>
+    <e k="yearinfo_current_year" v="Év"/>
+    <e k="settings_temperature_label" v="Hőmérséklet"/>
+    <e k="settings_temperature_description" v="Kapcsolja az aktuális min &amp; max hőmérsékletet az információs sáv jobb felső sarkában."/>
+    <e k="settings_temperature_option1" v="Be"/>
+    <e k="settings_temperature_option2" v="Ki"/>
+  </elements>
+</l10n>

FS22_ExtendedGameInfoDisplay/translations/l10n_ru.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="no" ?>
+<l10n>
+  <translationContributors>nagor</translationContributors>
+  <elements>
+    <e k="mod_title" v="Extended Game Infodisplay"/>
+    <e k="yearinfo_current_year" v="Год"/>
+    <e k="settings_temperature_label" v="Температура"/>
+    <e k="settings_temperature_description" v="Переключение отображения текущей и минимальной/максимальной температур в правом верхнем углу экрана."/>
+    <e k="settings_temperature_option1" v="Вкл"/>
+    <e k="settings_temperature_option2" v="Выкл"/>
+  </elements>
+</l10n>

README.md

@@ -1,15 +1,20 @@
 <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.1.0.0-green?style=flat-square)](https://farming-simulator.com/mod.php?mod_id=267536)
+[![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)
 [![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)
+[![Top language](https://img.shields.io/github/languages/top/Peppie84/FS22_ExtendedGameInfoDisplay?style=flat-square&color=blueviolet)](https://github.com/search?q=repo%3APeppie84%2FFS22_ExtendedGameInfoDisplay++language%3ALua&type=code)
+
 
 <br />
-<div align="center">
 
 <a href="https://farming-simulator.com/mod.php?mod_id=267536">
-    <img src="documents/mod_icon.jpg" style="width: 128px;">
+    <img src="documents/icon_ExGameInfoDisp.jpg" style="width: 128px;">
 </a>
 
 <h3 align="center"><u>FS22_ExtendedGameInfoDisplay</u></h3>
@@ -21,7 +26,7 @@
 </div>
 
 <div align='center'>
-    <img src="documents/screen1.png" style="width: 50%;">
+    <img src="documents/screen2-v1.2.0.0.png" style="width: 50%;">
 </div>
 
 ## Credits