Merge pull request #47 from jweiland-net/addHeatLevels

Add heat levels
jweiland-net · Jul 10, 2023 · 90d244d · 90d244d
2 parents 772c5bb + ae3d63d
commit 90d244d
Show file tree

Hide file tree

Showing 6 changed files with 86 additions and 41 deletions.
diff --git a/Configuration/FlexForms/flexform_weatheralert.xml b/Configuration/FlexForms/flexform_weatheralert.xml
@@ -89,14 +89,6 @@
 										<numIndex index="0">LLL:EXT:weather2/Resources/Private/Language/locallang_general.xlf:tx_weather2.warningLevels.1</numIndex>
 										<numIndex index="1">1</numIndex>
 									</numIndex>
-									<numIndex index="20" type="array">
-										<numIndex index="0">LLL:EXT:weather2/Resources/Private/Language/locallang_general.xlf:tx_weather2.warningLevels.20</numIndex>
-										<numIndex index="1">20</numIndex>
-									</numIndex>
-									<numIndex index="10" type="array">
-										<numIndex index="0">LLL:EXT:weather2/Resources/Private/Language/locallang_general.xlf:tx_weather2.warningLevels.10</numIndex>
-										<numIndex index="1">10</numIndex>
-									</numIndex>
 									<numIndex index="2" type="array">
 										<numIndex index="0">LLL:EXT:weather2/Resources/Private/Language/locallang_general.xlf:tx_weather2.warningLevels.2</numIndex>
 										<numIndex index="1">2</numIndex>
@@ -113,6 +105,22 @@
 										<numIndex index="0">LLL:EXT:weather2/Resources/Private/Language/locallang_general.xlf:tx_weather2.warningLevels.5</numIndex>
 										<numIndex index="1">5</numIndex>
 									</numIndex>
+									<numIndex index="10" type="array">
+										<numIndex index="0">LLL:EXT:weather2/Resources/Private/Language/locallang_general.xlf:tx_weather2.warningLevels.10</numIndex>
+										<numIndex index="1">10</numIndex>
+									</numIndex>
+									<numIndex index="20" type="array">
+										<numIndex index="0">LLL:EXT:weather2/Resources/Private/Language/locallang_general.xlf:tx_weather2.warningLevels.20</numIndex>
+										<numIndex index="1">20</numIndex>
+									</numIndex>
+									<numIndex index="50" type="array">
+										<numIndex index="0">LLL:EXT:weather2/Resources/Private/Language/locallang_general.xlf:tx_weather2.warningLevels.50</numIndex>
+										<numIndex index="1">50</numIndex>
+									</numIndex>
+									<numIndex index="51" type="array">
+										<numIndex index="0">LLL:EXT:weather2/Resources/Private/Language/locallang_general.xlf:tx_weather2.warningLevels.51</numIndex>
+										<numIndex index="1">51</numIndex>
+									</numIndex>
 								</items>
 								<enableMultiSelectFilterTextfield>true</enableMultiSelectFilterTextfield>
 								<size>5</size>

diff --git a/Configuration/TCA/tx_weather2_domain_model_weatheralert.php b/Configuration/TCA/tx_weather2_domain_model_weatheralert.php
@@ -80,12 +80,14 @@
                     ['', ''],
                     ['LLL:EXT:weather2/Resources/Private/Language/locallang_general.xlf:tx_weather2.warningLevels.0', 0],
                     ['LLL:EXT:weather2/Resources/Private/Language/locallang_general.xlf:tx_weather2.warningLevels.1', 1],
-                    ['LLL:EXT:weather2/Resources/Private/Language/locallang_general.xlf:tx_weather2.warningLevels.20', 20],
-                    ['LLL:EXT:weather2/Resources/Private/Language/locallang_general.xlf:tx_weather2.warningLevels.10', 10],
                     ['LLL:EXT:weather2/Resources/Private/Language/locallang_general.xlf:tx_weather2.warningLevels.2', 2],
                     ['LLL:EXT:weather2/Resources/Private/Language/locallang_general.xlf:tx_weather2.warningLevels.3', 3],
                     ['LLL:EXT:weather2/Resources/Private/Language/locallang_general.xlf:tx_weather2.warningLevels.4', 4],
                     ['LLL:EXT:weather2/Resources/Private/Language/locallang_general.xlf:tx_weather2.warningLevels.5', 5],
+                    ['LLL:EXT:weather2/Resources/Private/Language/locallang_general.xlf:tx_weather2.warningLevels.10', 10],
+                    ['LLL:EXT:weather2/Resources/Private/Language/locallang_general.xlf:tx_weather2.warningLevels.20', 20],
+                    ['LLL:EXT:weather2/Resources/Private/Language/locallang_general.xlf:tx_weather2.warningLevels.50', 50],
+                    ['LLL:EXT:weather2/Resources/Private/Language/locallang_general.xlf:tx_weather2.warningLevels.51', 51],
                 ],
                 'size' => 1,
                 'eval' => 'int,required',

diff --git a/Documentation/Settings.cfg b/Documentation/Settings.cfg
@@ -4,7 +4,7 @@
 [general]
 
 project     = weather2
-version     = 4.1.0
+version     = 4.1.1
 release     = 4.1
 copyright   = since 2013 by jweiland.net
 

diff --git a/Resources/Private/Language/de.locallang_general.xlf b/Resources/Private/Language/de.locallang_general.xlf
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <xliff version="1.0">
-	<file source-language="en" datatype="plaintext" original="messages" date="2016-05-04T14:55:13Z"
-				product-name="weather2">
+	<file source-language="en" datatype="plaintext" original="messages" date="2016-05-04T14:55:13Z" product-name="weather2">
 		<header/>
 		<body>
 			<trans-unit id="tx_weather2.name">
@@ -25,73 +24,104 @@
 				<target>Internationales Einheitensystem (K)</target>
 			</trans-unit>
 			<trans-unit id="tx_weather2.warningTypes">
+				<source>Display selected warning types</source>
 				<target>Zeige ausgewählte Warntypen an</target>
 			</trans-unit>
 			<trans-unit id="tx_weather2.warningTypes.thunderstorm">
+				<source>Thunderstorm</source>
 				<target>Gewitter</target>
 			</trans-unit>
 			<trans-unit id="tx_weather2.warningTypes.storm">
+				<source>Storm</source>
 				<target>Sturm</target>
 			</trans-unit>
 			<trans-unit id="tx_weather2.warningTypes.rain">
+				<source>Rain</source>
 				<target>Regen</target>
 			</trans-unit>
 			<trans-unit id="tx_weather2.warningTypes.snow">
+				<source>Snow</source>
 				<target>Schnee</target>
 			</trans-unit>
 			<trans-unit id="tx_weather2.warningTypes.fog">
+				<source>Fog</source>
 				<target>Nebel</target>
 			</trans-unit>
 			<trans-unit id="tx_weather2.warningTypes.frost">
+				<source>Frost</source>
 				<target>Frost</target>
 			</trans-unit>
 			<trans-unit id="tx_weather2.warningTypes.ice">
+				<source>Ice</source>
 				<target>Glatteis</target>
 			</trans-unit>
 			<trans-unit id="tx_weather2.warningTypes.thaw">
+				<source>Thaw</source>
 				<target>Tauwetter</target>
 			</trans-unit>
 			<trans-unit id="tx_weather2.warningTypes.hotness">
+				<source>Hotness</source>
 				<target>Hitze</target>
 			</trans-unit>
 			<trans-unit id="tx_weather2.warningTypes.uv">
+				<source>UV</source>
 				<target>UV</target>
 			</trans-unit>
 			<trans-unit id="tx_weather2.warningTypes.coast">
+				<source>Coast</source>
 				<target>Küste</target>
 			</trans-unit>
 			<trans-unit id="tx_weather2.warningTypes.lake">
+				<source>Lake</source>
 				<target>Binnensee</target>
 			</trans-unit>
 			<trans-unit id="tx_weather2.warningTypes.sea">
+				<source>Sea</source>
 				<target>See</target>
 			</trans-unit>
 			<trans-unit id="tx_weather2.warningLevels">
+				<source>Display selected warning levels</source>
 				<target>Zeige ausgewählte Warnlevel an</target>
 			</trans-unit>
 			<trans-unit id="tx_weather2.warningLevels.0">
-				<target>0 (Amtliche Wetterwarnung)</target>
+				<source>No warning</source>
+				<target>Kein Warnung</target>
 			</trans-unit>
 			<trans-unit id="tx_weather2.warningLevels.1">
-				<target>1 (Amtliche Wetterwarnung)</target>
-			</trans-unit>
-			<trans-unit id="tx_weather2.warningLevels.20">
-				<target>1.4 (Hitze-Warnung)</target>
-			</trans-unit>
-			<trans-unit id="tx_weather2.warningLevels.10">
-				<target>1.5 (UV-Warnung)</target>
+				<source>Official WARNING</source>
+				<target>Amtliche WARNUNG</target>
 			</trans-unit>
 			<trans-unit id="tx_weather2.warningLevels.2">
-				<target>2 (Amtliche Wetterwarnung)</target>
+				<source>Official WARNING of THIRD STORM</source>
+				<target>Amtliche WARNUNG vor GEWITTER</target>
 			</trans-unit>
 			<trans-unit id="tx_weather2.warningLevels.3">
-				<target>3 (Amtliche Warnung vor markantem Wetter)</target>
+				<source>Official WARNING of STRONG THUNDERSTATES</source>
+				<target>Amtliche WARNUNG vor STARKEM GEWITTER</target>
 			</trans-unit>
 			<trans-unit id="tx_weather2.warningLevels.4">
-				<target>4 (Amtliche Unwetterwarnung)</target>
+				<source>Official STORM WARNING of SEVERE THUNDERSTORM with HEAVY RAIN and HAGUE</source>
+				<target>Amtliche UNWETTERWARNUNG vor SCHWEREM GEWITTER mit HEFTIGEM STARKREGEN und HAGEL</target>
 			</trans-unit>
 			<trans-unit id="tx_weather2.warningLevels.5">
-				<target>5 (Amtliche Warnung vor extremem Unwetter)</target>
+				<source>Official STORM WARNING of extrem THUNDERSTORMS</source>
+				<target>Amtliche UNWETTERWARNUNG vor EXTREMEN Unwetter</target>
+			</trans-unit>
+			<trans-unit id="tx_weather2.warningLevels.10">
+				<source>Hotness warning</source>
+				<target>Hitze-Warnung</target>
+			</trans-unit>
+			<trans-unit id="tx_weather2.warningLevels.20">
+				<source>UV warning</source>
+				<target>UV-Warnung</target>
+			</trans-unit>
+			<trans-unit id="tx_weather2.warningLevels.50">
+				<source>Official WARNING of HEAT</source>
+				<target>Amtliche WARNUNG vor HITZE</target>
+			</trans-unit>
+			<trans-unit id="tx_weather2.warningLevels.51">
+				<source>Official WARNING of extreme HEAT</source>
+				<target>Amtliche WARNUNG vor extremer HITZE</target>
 			</trans-unit>
 			<trans-unit id="tx_weather2.selectedWarnCells">
 				<source>Display warnings for selected cities</source>

diff --git a/Resources/Private/Language/locallang_general.xlf b/Resources/Private/Language/locallang_general.xlf
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <xliff version="1.0">
-	<file source-language="en" datatype="plaintext" original="messages" date="2016-05-04T14:55:13Z"
-				product-name="weather2">
+	<file source-language="en" datatype="plaintext" original="messages" date="2016-05-04T14:55:13Z" product-name="weather2">
 		<header/>
 		<body>
 			<trans-unit id="tx_weather2.name">
@@ -65,28 +64,34 @@
 				<source>Display selected warning levels</source>
 			</trans-unit>
 			<trans-unit id="tx_weather2.warningLevels.0">
-				<source>0 (Official weather warning)</source>
+				<source>No warning</source>
 			</trans-unit>
 			<trans-unit id="tx_weather2.warningLevels.1">
-				<source>1 (Official weather warning)</source>
-			</trans-unit>
-			<trans-unit id="tx_weather2.warningLevels.20">
-				<source>1.4 (UV warning)</source>
-			</trans-unit>
-			<trans-unit id="tx_weather2.warningLevels.10">
-				<source>1.5 (Hotness warning)</source>
+				<source>Official WARNING</source>
 			</trans-unit>
 			<trans-unit id="tx_weather2.warningLevels.2">
-				<source>2 (Official weather warning)</source>
+				<source>Official WARNING of THIRD STORM</source>
 			</trans-unit>
 			<trans-unit id="tx_weather2.warningLevels.3">
-				<source>3 (Official warning of striking weather)</source>
+				<source>Official WARNING of STRONG THUNDERSTATES</source>
 			</trans-unit>
 			<trans-unit id="tx_weather2.warningLevels.4">
-				<source>4 (Official storm warning)</source>
+				<source>Official STORM WARNING of SEVERE THUNDERSTORM with HEAVY RAIN and HAGUE</source>
 			</trans-unit>
 			<trans-unit id="tx_weather2.warningLevels.5">
-				<source>5 (Official warning of extreme weather)</source>
+				<source>Official STORM WARNING of extrem THUNDERSTORMS</source>
+			</trans-unit>
+			<trans-unit id="tx_weather2.warningLevels.10">
+				<source>Hotness warning</source>
+			</trans-unit>
+			<trans-unit id="tx_weather2.warningLevels.20">
+				<source>UV warning</source>
+			</trans-unit>
+			<trans-unit id="tx_weather2.warningLevels.50">
+				<source>Official WARNING of HEAT</source>
+			</trans-unit>
+			<trans-unit id="tx_weather2.warningLevels.51">
+				<source>Official WARNING of extreme HEAT</source>
 			</trans-unit>
 			<trans-unit id="tx_weather2.selectedWarnCells">
 				<source>Display warnings for selected cities</source>

diff --git a/ext_emconf.php b/ext_emconf.php
@@ -4,11 +4,11 @@
     'title' => 'Weather Forecasts and Alerts',
     'description' => 'Display weather forecasts and weather alerts using various Weather APIs. Default APIs: OpenWeatherMap and Deutscher Wetterdienst',
     'category' => 'plugin',
-    'author' => 'Markus Kugler, Stefan Froemken',
+    'author' => 'Stefan Froemken',
     'author_email' => 'projects@jweiland.net',
     'author_company' => 'jweiland.net',
     'state' => 'stable',
-    'version' => '4.1.0',
+    'version' => '4.1.1',
     'constraints' => [
         'depends' => [
             'typo3' => '10.4.29-11.5.99',