From f8db9fa6032c84d99d1775a133abbd6790abc75d Mon Sep 17 00:00:00 2001
From: Luke Marzen <98473324+lmarzen@users.noreply.github.com>
Date: Sun, 27 Oct 2024 13:34:08 -0500
Subject: [PATCH] moved locale include files to the include directory

---
 README.md                                            | 2 +-
 platformio/include/_locale.h                         | 1 -
 platformio/{src => include}/locales/locale_de_DE.inc | 0
 platformio/{src => include}/locales/locale_en_GB.inc | 0
 platformio/{src => include}/locales/locale_en_US.inc | 0
 platformio/{src => include}/locales/locale_et_EE.inc | 0
 platformio/{src => include}/locales/locale_fi_FI.inc | 0
 platformio/{src => include}/locales/locale_fr_FR.inc | 0
 platformio/{src => include}/locales/locale_it_IT.inc | 0
 platformio/{src => include}/locales/locale_nl_BE.inc | 0
 platformio/{src => include}/locales/locale_pt_BR.inc | 0
 platformio/src/{locales => }/locale.cpp              | 5 ++---
 12 files changed, 3 insertions(+), 5 deletions(-)
 rename platformio/{src => include}/locales/locale_de_DE.inc (100%)
 rename platformio/{src => include}/locales/locale_en_GB.inc (100%)
 rename platformio/{src => include}/locales/locale_en_US.inc (100%)
 rename platformio/{src => include}/locales/locale_et_EE.inc (100%)
 rename platformio/{src => include}/locales/locale_fi_FI.inc (100%)
 rename platformio/{src => include}/locales/locale_fr_FR.inc (100%)
 rename platformio/{src => include}/locales/locale_it_IT.inc (100%)
 rename platformio/{src => include}/locales/locale_nl_BE.inc (100%)
 rename platformio/{src => include}/locales/locale_pt_BR.inc (100%)
 rename platformio/src/{locales => }/locale.cpp (86%)

diff --git a/README.md b/README.md
index a7568e845..28f81eb3e 100644
--- a/README.md
+++ b/README.md
@@ -200,7 +200,7 @@ PlatformIO for VSCode is used for managing dependencies, code compilation, and u
 
 5. Configure Options.
 
-   - Most configuration options are located in [config.cpp](platformio/src/config.cpp), with a few  in [config.h](platformio/include/config.h). Locale/language options can also be found in locales/locale_**.cpp.
+   - Most configuration options are located in [config.cpp](platformio/src/config.cpp), with a few  in [config.h](platformio/include/config.h). Locale/language options can also be found in include/locales/locale_*.inc.
 
    - Important settings to configure in config.cpp:
 
diff --git a/platformio/include/_locale.h b/platformio/include/_locale.h
index 6b2cf642d..8a3231a8c 100644
--- a/platformio/include/_locale.h
+++ b/platformio/include/_locale.h
@@ -272,5 +272,4 @@ extern const char *TXT_WL_CONNECT_FAILED;
 extern const char *TXT_WL_CONNECTION_LOST;
 extern const char *TXT_WL_DISCONNECTED;
 
-
 #endif
diff --git a/platformio/src/locales/locale_de_DE.inc b/platformio/include/locales/locale_de_DE.inc
similarity index 100%
rename from platformio/src/locales/locale_de_DE.inc
rename to platformio/include/locales/locale_de_DE.inc
diff --git a/platformio/src/locales/locale_en_GB.inc b/platformio/include/locales/locale_en_GB.inc
similarity index 100%
rename from platformio/src/locales/locale_en_GB.inc
rename to platformio/include/locales/locale_en_GB.inc
diff --git a/platformio/src/locales/locale_en_US.inc b/platformio/include/locales/locale_en_US.inc
similarity index 100%
rename from platformio/src/locales/locale_en_US.inc
rename to platformio/include/locales/locale_en_US.inc
diff --git a/platformio/src/locales/locale_et_EE.inc b/platformio/include/locales/locale_et_EE.inc
similarity index 100%
rename from platformio/src/locales/locale_et_EE.inc
rename to platformio/include/locales/locale_et_EE.inc
diff --git a/platformio/src/locales/locale_fi_FI.inc b/platformio/include/locales/locale_fi_FI.inc
similarity index 100%
rename from platformio/src/locales/locale_fi_FI.inc
rename to platformio/include/locales/locale_fi_FI.inc
diff --git a/platformio/src/locales/locale_fr_FR.inc b/platformio/include/locales/locale_fr_FR.inc
similarity index 100%
rename from platformio/src/locales/locale_fr_FR.inc
rename to platformio/include/locales/locale_fr_FR.inc
diff --git a/platformio/src/locales/locale_it_IT.inc b/platformio/include/locales/locale_it_IT.inc
similarity index 100%
rename from platformio/src/locales/locale_it_IT.inc
rename to platformio/include/locales/locale_it_IT.inc
diff --git a/platformio/src/locales/locale_nl_BE.inc b/platformio/include/locales/locale_nl_BE.inc
similarity index 100%
rename from platformio/src/locales/locale_nl_BE.inc
rename to platformio/include/locales/locale_nl_BE.inc
diff --git a/platformio/src/locales/locale_pt_BR.inc b/platformio/include/locales/locale_pt_BR.inc
similarity index 100%
rename from platformio/src/locales/locale_pt_BR.inc
rename to platformio/include/locales/locale_pt_BR.inc
diff --git a/platformio/src/locales/locale.cpp b/platformio/src/locale.cpp
similarity index 86%
rename from platformio/src/locales/locale.cpp
rename to platformio/src/locale.cpp
index 7a03ea2d8..43d37287f 100644
--- a/platformio/src/locales/locale.cpp
+++ b/platformio/src/locale.cpp
@@ -1,5 +1,5 @@
 /* Locale source for esp32-weather-epd.
- * Copyright (C) 2022-2023  Luke Marzen
+ * Copyright (C) 2022-2024  Luke Marzen
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,8 +18,7 @@
 #include "config.h"
 
 #define STR(s) #s
-#define X_LOCALE_INC(code) STR(locale_ ## code.inc)
+#define X_LOCALE_INC(code) STR(locales/locale_ ## code.inc)
 #define LOCALE_INC(code) X_LOCALE_INC(code)
 
 #include LOCALE_INC(LOCALE)
-