updated weather terminology

lmarzen · Apr 29, 2024 · f62b256 · f62b256
1 parent fc2ed30
commit f62b256
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 32 deletions.
diff --git a/platformio/src/locales/locale_de_DE.inc b/platformio/src/locales/locale_de_DE.inc
@@ -23,9 +23,9 @@
  * <https://github.com/lmarzen/esp32-weather-epd/issues>
  */
 
+#include "_locale.h"
 #include <vector>
 #include <Arduino.h>
-#include "_locale.h"
 
 // LC_TIME
 // locale-based information,
@@ -178,7 +178,7 @@ const char *TXT_CRIT_LOW_BATTERY_VOLTAGE = "Critically low battery voltage!";
 //
 // Here are a few examples, uncomment the array for your region (or create your
 // own).
-// const std::vector<String> ALERT_URGENCY = {"statement", "watch", "advisory", "warning", "emergency"}; // US National Weather Service
+// const std::vector<String> ALERT_URGENCY = {"outlook", "statement", "watch", "advisory", "warning", "emergency"}; // US National Weather Service
 // const std::vector<String> ALERT_URGENCY = {"yellow", "amber", "red"};                 // United Kingdom's national weather service (MET Office)
 const std::vector<String> ALERT_URGENCY = {"minor", "moderate", "severe", "extreme"}; // METEO
 // const std::vector<String> ALERT_URGENCY = {}; // Disable urgency interpretation (algorithm will fallback to only prefer the most recently issued alerts)
@@ -200,7 +200,7 @@ const std::vector<String> TERM_BIOHAZARD =
 const std::vector<String> TERM_EARTHQUAKE =
     {"earthquake"};
 const std::vector<String> TERM_TSUNAMI =
-    {"tsunami"};
+    {"tsunami", "surf"};
 const std::vector<String> TERM_FIRE =
     {"fire", "red flag"};
 const std::vector<String> TERM_HEAT =
@@ -215,7 +215,7 @@ const std::vector<String> TERM_SANDSTORM =
     {"sandstorm", "blowing dust", "dust storm"};
 const std::vector<String> TERM_FLOOD =
     {"flood", "storm surge", "seiche", "swell", "high seas", "high tides",
-     "tidal surge"};
+     "tidal surge", "hydrologic"};
 const std::vector<String> TERM_VOLCANO =
     {"volcanic", "ash", "volcano", "eruption"};
 const std::vector<String> TERM_AIR_QUALITY =

diff --git a/platformio/src/locales/locale_en_GB.inc b/platformio/src/locales/locale_en_GB.inc
@@ -15,9 +15,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+#include "_locale.h"
 #include <vector>
 #include <Arduino.h>
-#include "_locale.h"
 
 // LC_TIME
 // locale-based information,
@@ -170,7 +170,7 @@ const char *TXT_CRIT_LOW_BATTERY_VOLTAGE = "Critically low battery voltage!";
 //
 // Here are a few examples, uncomment the array for your region (or create your
 // own).
-// const std::vector<String> ALERT_URGENCY = {"statement", "watch", "advisory", "warning", "emergency"}; // US National Weather Service
+// const std::vector<String> ALERT_URGENCY = {"outlook", "statement", "watch", "advisory", "warning", "emergency"}; // US National Weather Service
 const std::vector<String> ALERT_URGENCY = {"yellow", "amber", "red"};                 // United Kingdom's national weather service (MET Office)
 // const std::vector<String> ALERT_URGENCY = {"minor", "moderate", "severe", "extreme"}; // METEO
 // const std::vector<String> ALERT_URGENCY = {}; // Disable urgency interpretation (algorithm will fallback to only prefer the most recently issued alerts)
@@ -192,7 +192,7 @@ const std::vector<String> TERM_BIOHAZARD =
 const std::vector<String> TERM_EARTHQUAKE =
     {"earthquake"};
 const std::vector<String> TERM_TSUNAMI =
-    {"tsunami"};
+    {"tsunami", "surf"};
 const std::vector<String> TERM_FIRE =
     {"fire", "red flag"};
 const std::vector<String> TERM_HEAT =
@@ -207,7 +207,7 @@ const std::vector<String> TERM_SANDSTORM =
     {"sandstorm", "blowing dust", "dust storm"};
 const std::vector<String> TERM_FLOOD =
     {"flood", "storm surge", "seiche", "swell", "high seas", "high tides",
-     "tidal surge"};
+     "tidal surge", "hydrologic"};
 const std::vector<String> TERM_VOLCANO =
     {"volcanic", "ash", "volcano", "eruption"};
 const std::vector<String> TERM_AIR_QUALITY =

diff --git a/platformio/src/locales/locale_en_US.inc b/platformio/src/locales/locale_en_US.inc
@@ -170,7 +170,7 @@ const char *TXT_CRIT_LOW_BATTERY_VOLTAGE = "Critically low battery voltage!";
 //
 // Here are a few examples, uncomment the array for your region (or create your
 // own).
-const std::vector<String> ALERT_URGENCY = {"statement", "watch", "advisory", "warning", "emergency"}; // US National Weather Service
+const std::vector<String> ALERT_URGENCY = {"outlook", "statement", "watch", "advisory", "warning", "emergency"}; // US National Weather Service
 // const std::vector<String> ALERT_URGENCY = {"yellow", "amber", "red"};                 // United Kingdom's national weather service (MET Office)
 // const std::vector<String> ALERT_URGENCY = {"minor", "moderate", "severe", "extreme"}; // METEO
 // const std::vector<String> ALERT_URGENCY = {}; // Disable urgency interpretation (algorithm will fallback to only prefer the most recently issued alerts)
@@ -192,7 +192,7 @@ const std::vector<String> TERM_BIOHAZARD =
 const std::vector<String> TERM_EARTHQUAKE =
     {"earthquake"};
 const std::vector<String> TERM_TSUNAMI =
-    {"tsunami"};
+    {"tsunami", "surf"};
 const std::vector<String> TERM_FIRE =
     {"fire", "red flag"};
 const std::vector<String> TERM_HEAT =
@@ -207,7 +207,7 @@ const std::vector<String> TERM_SANDSTORM =
     {"sandstorm", "blowing dust", "dust storm"};
 const std::vector<String> TERM_FLOOD =
     {"flood", "storm surge", "seiche", "swell", "high seas", "high tides",
-     "tidal surge"};
+     "tidal surge", "hydrologic"};
 const std::vector<String> TERM_VOLCANO =
     {"volcanic", "ash", "volcano", "eruption"};
 const std::vector<String> TERM_AIR_QUALITY =

diff --git a/platformio/src/locales/locale_et_EE.inc b/platformio/src/locales/locale_et_EE.inc
@@ -22,9 +22,9 @@
  * <https://github.com/lmarzen/esp32-weather-epd/issues>
  */
 
+#include "_locale.h"
 #include <vector>
 #include <Arduino.h>
-#include "_locale.h"
 
 // LC_TIME
 // locale-based information,
@@ -177,7 +177,7 @@ const char *TXT_CRIT_LOW_BATTERY_VOLTAGE = "Critically low battery voltage!";
 //
 // Here are a few examples, uncomment the array for your region (or create your
 // own).
-const std::vector<String> ALERT_URGENCY = {"statement", "watch", "advisory", "warning", "emergency"}; // US National Weather Service
+const std::vector<String> ALERT_URGENCY = {"outlook", "statement", "watch", "advisory", "warning", "emergency"}; // US National Weather Service
 // const std::vector<String> ALERT_URGENCY = {"yellow", "amber", "red"};                 // United Kingdom's national weather service (MET Office)
 // const std::vector<String> ALERT_URGENCY = {"minor", "moderate", "severe", "extreme"}; // METEO
 // const std::vector<String> ALERT_URGENCY = {}; // Disable urgency interpretation (algorithm will fallback to only prefer the most recently issued alerts)
@@ -199,7 +199,7 @@ const std::vector<String> TERM_BIOHAZARD =
 const std::vector<String> TERM_EARTHQUAKE =
     {"earthquake"};
 const std::vector<String> TERM_TSUNAMI =
-    {"tsunami"};
+    {"tsunami", "surf"};
 const std::vector<String> TERM_FIRE =
     {"fire", "red flag"};
 const std::vector<String> TERM_HEAT =
@@ -214,7 +214,7 @@ const std::vector<String> TERM_SANDSTORM =
     {"sandstorm", "blowing dust", "dust storm"};
 const std::vector<String> TERM_FLOOD =
     {"flood", "storm surge", "seiche", "swell", "high seas", "high tides",
-     "tidal surge"};
+     "tidal surge", "hydrologic"};
 const std::vector<String> TERM_VOLCANO =
     {"volcanic", "ash", "volcano", "eruption"};
 const std::vector<String> TERM_AIR_QUALITY =

diff --git a/platformio/src/locales/locale_fi_FI.inc b/platformio/src/locales/locale_fi_FI.inc
@@ -178,7 +178,7 @@ const char *TXT_CRIT_LOW_BATTERY_VOLTAGE = "Critically low battery voltage!";
 //
 // Here are a few examples, uncomment the array for your region (or create your
 // own).
-// const std::vector<String> ALERT_URGENCY = {"statement", "watch", "advisory", "warning", "emergency"}; // US National Weather Service
+// const std::vector<String> ALERT_URGENCY = {"outlook", "statement", "watch", "advisory", "warning", "emergency"}; // US National Weather Service
 const std::vector<String> ALERT_URGENCY = {"yellow", "amber", "red"};                 // United Kingdom's national weather service (MET Office)
 // const std::vector<String> ALERT_URGENCY = {"minor", "moderate", "severe", "extreme"}; // METEO
 // const std::vector<String> ALERT_URGENCY = {}; // Disable urgency interpretation (algorithm will fallback to only prefer the most recently issued alerts)
@@ -200,7 +200,7 @@ const std::vector<String> TERM_BIOHAZARD =
 const std::vector<String> TERM_EARTHQUAKE =
     {"earthquake"};
 const std::vector<String> TERM_TSUNAMI =
-    {"tsunami"};
+    {"tsunami", "surf"};
 const std::vector<String> TERM_FIRE =
     {"fire", "red flag"};
 const std::vector<String> TERM_HEAT =
@@ -215,7 +215,7 @@ const std::vector<String> TERM_SANDSTORM =
     {"sandstorm", "blowing dust", "dust storm"};
 const std::vector<String> TERM_FLOOD =
     {"flood", "storm surge", "seiche", "swell", "high seas", "high tides",
-     "tidal surge"};
+     "tidal surge", "hydrologic"};
 const std::vector<String> TERM_VOLCANO =
     {"volcanic", "ash", "volcano", "eruption"};
 const std::vector<String> TERM_AIR_QUALITY =

diff --git a/platformio/src/locales/locale_fr_FR.inc b/platformio/src/locales/locale_fr_FR.inc
@@ -23,9 +23,9 @@
  * <https://github.com/lmarzen/esp32-weather-epd/issues>
  */
 
+#include "_locale.h"
 #include <vector>
 #include <Arduino.h>
-#include "_locale.h"
 
 // LC_TIME
 // locale-based information,
@@ -178,7 +178,7 @@ const char *TXT_CRIT_LOW_BATTERY_VOLTAGE = "Critically low battery voltage!";
 //
 // Here are a few examples, uncomment the array for your region (or create your
 // own).
-// const std::vector<String> ALERT_URGENCY = {"statement", "watch", "advisory", "warning", "emergency"}; // US National Weather Service
+// const std::vector<String> ALERT_URGENCY = {"outlook", "statement", "watch", "advisory", "warning", "emergency"}; // US National Weather Service
 const std::vector<String> ALERT_URGENCY = {"yellow", "amber", "red"};                 // United Kingdom's national weather service (MET Office)
 // const std::vector<String> ALERT_URGENCY = {"minor", "moderate", "severe", "extreme"}; // METEO
 // const std::vector<String> ALERT_URGENCY = {}; // Disable urgency interpretation (algorithm will fallback to only prefer the most recently issued alerts)
@@ -200,13 +200,13 @@ const std::vector<String> TERM_BIOHAZARD =
 const std::vector<String> TERM_EARTHQUAKE =
     {"earthquake"};
 const std::vector<String> TERM_TSUNAMI =
-    {"tsunami"};
+    {"tsunami", "surf"};
 const std::vector<String> TERM_FIRE =
     {"fire", "red flag"};
 const std::vector<String> TERM_HEAT =
     {"heat"};
 const std::vector<String> TERM_WINTER =
-    {"blizzard", "winter", "ice", "snow", "sleet", "cold", "freezing rain", 
+    {"blizzard", "winter", "ice", "snow", "sleet", "cold", "freezing rain",
      "wind chill", "freeze", "frost", "hail"};
 const std::vector<String> TERM_LIGHTNING =
     {"thunderstorm", "storm cell", "pulse storm", "squall line", "supercell",
@@ -215,7 +215,7 @@ const std::vector<String> TERM_SANDSTORM =
     {"sandstorm", "blowing dust", "dust storm"};
 const std::vector<String> TERM_FLOOD =
     {"flood", "storm surge", "seiche", "swell", "high seas", "high tides",
-     "tidal surge"};
+     "tidal surge", "hydrologic"};
 const std::vector<String> TERM_VOLCANO =
     {"volcanic", "ash", "volcano", "eruption"};
 const std::vector<String> TERM_AIR_QUALITY =

diff --git a/platformio/src/locales/locale_nl_BE.inc b/platformio/src/locales/locale_nl_BE.inc
@@ -22,9 +22,9 @@
  * <https://github.com/lmarzen/esp32-weather-epd/issues>
  */
 
+#include "_locale.h"
 #include <vector>
 #include <Arduino.h>
-#include "_locale.h"
 
 // LC_TIME
 // locale-based information,
@@ -177,7 +177,7 @@ const char *TXT_CRIT_LOW_BATTERY_VOLTAGE = "Critically low battery voltage!";
 //
 // Here are a few examples, uncomment the array for your region (or create your
 // own).
-// const std::vector<String> ALERT_URGENCY = {"statement", "watch", "advisory", "warning", "emergency"}; // US National Weather Service
+// const std::vector<String> ALERT_URGENCY = {"outlook", "statement", "watch", "advisory", "warning", "emergency"}; // US National Weather Service
 // const std::vector<String> ALERT_URGENCY = {"yellow", "amber", "red"};                 // United Kingdom's national weather service (MET Office)
 const std::vector<String> ALERT_URGENCY = {"minor", "moderate", "severe", "extreme"}; // METEO
 // const std::vector<String> ALERT_URGENCY = {}; // Disable urgency interpretation (algorithm will fallback to only prefer the most recently issued alerts)
@@ -199,7 +199,7 @@ const std::vector<String> TERM_BIOHAZARD =
 const std::vector<String> TERM_EARTHQUAKE =
     {"earthquake"};
 const std::vector<String> TERM_TSUNAMI =
-    {"tsunami"};
+    {"tsunami", "surf"};
 const std::vector<String> TERM_FIRE =
     {"fire", "red flag"};
 const std::vector<String> TERM_HEAT =
@@ -214,7 +214,7 @@ const std::vector<String> TERM_SANDSTORM =
     {"sandstorm", "blowing dust", "dust storm"};
 const std::vector<String> TERM_FLOOD =
     {"flood", "storm surge", "seiche", "swell", "high seas", "high tides",
-     "tidal surge"};
+     "tidal surge", "hydrologic"};
 const std::vector<String> TERM_VOLCANO =
     {"volcanic", "ash", "volcano", "eruption"};
 const std::vector<String> TERM_AIR_QUALITY =

diff --git a/platformio/src/locales/locale_pt_BR.inc b/platformio/src/locales/locale_pt_BR.inc
@@ -22,9 +22,9 @@
  * <https://github.com/lmarzen/esp32-weather-epd/issues>
  */
 
+#include "_locale.h"
 #include <vector>
 #include <Arduino.h>
-#include "_locale.h"
 
 // LC_TIME
 // locale-based information,
@@ -37,7 +37,6 @@
 //   time formats, month and day names, and other time-related settings for the
 //   LC_TIME category.
 //   https://www.gnu.org/software/libc/sources.html
-
 // D_T_FMT                 string for formatting date and time
 const char *LC_D_T_FMT     = "%a %d %b %Y %T";
 // D_FMT                   date format string
@@ -179,7 +178,7 @@ const char *TXT_CRIT_LOW_BATTERY_VOLTAGE = "Voltagem da bateria criticamente bai
 //
 // Here are a few examples, uncomment the array for your region (or create your
 // own).
-const std::vector<String> ALERT_URGENCY = {"statement", "watch", "advisory", "warning", "emergency"}; // US National Weather Service
+const std::vector<String> ALERT_URGENCY = {"outlook", "statement", "watch", "advisory", "warning", "emergency"}; // US National Weather Service
 // const std::vector<String> ALERT_URGENCY = {"yellow", "amber", "red"};                 // United Kingdom's national weather service (MET Office)
 // const std::vector<String> ALERT_URGENCY = {"minor", "moderate", "severe", "extreme"}; // METEO
 // const std::vector<String> ALERT_URGENCY = {}; // Disable urgency interpretation (algorithm will fallback to only prefer the most recently issued alerts)
@@ -201,7 +200,7 @@ const std::vector<String> TERM_BIOHAZARD =
 const std::vector<String> TERM_EARTHQUAKE =
     {"earthquake"};
 const std::vector<String> TERM_TSUNAMI =
-    {"tsunami"};
+    {"tsunami", "surf"};
 const std::vector<String> TERM_FIRE =
     {"fire", "red flag"};
 const std::vector<String> TERM_HEAT =
@@ -216,7 +215,7 @@ const std::vector<String> TERM_SANDSTORM =
     {"sandstorm", "blowing dust", "dust storm"};
 const std::vector<String> TERM_FLOOD =
     {"flood", "storm surge", "seiche", "swell", "high seas", "high tides",
-     "tidal surge"};
+     "tidal surge", "hydrologic"};
 const std::vector<String> TERM_VOLCANO =
     {"volcanic", "ash", "volcano", "eruption"};
 const std::vector<String> TERM_AIR_QUALITY =