From 9410c4787508bfd3b32a194b8dd3b6a34fab4002 Mon Sep 17 00:00:00 2001 From: VstudioLAB <57193516+VstudioLAB@users.noreply.github.com> Date: Wed, 22 Nov 2023 00:25:17 +0100 Subject: [PATCH] Added French Added french langage as an option for tag content --- ESP32_AP-Flasher/data/www/index.html.gz | Bin 4834 -> 4843 bytes ESP32_AP-Flasher/platformio.ini | 5 +++-- ESP32_AP-Flasher/src/language.cpp | 14 ++++++++++---- ESP32_AP-Flasher/wwwroot/index.html | 1 + 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/ESP32_AP-Flasher/data/www/index.html.gz b/ESP32_AP-Flasher/data/www/index.html.gz index feffb6d4574d5c3086fd023bef556a82c65cb1ec..e76fb1fa7efc1019ebbffe0249630388b1f02f26 100644 GIT binary patch delta 4714 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 C*cE*M diff --git a/ESP32_AP-Flasher/platformio.ini b/ESP32_AP-Flasher/platformio.ini index 7e4a9ae3..e0759d1c 100644 --- a/ESP32_AP-Flasher/platformio.ini +++ b/ESP32_AP-Flasher/platformio.ini @@ -37,8 +37,8 @@ build_flags = -D ILI9341_DRIVER -D SMOOTH_FONT -upload_port = COM11 -monitor_port = COM11 +;upload_port = COM11 +;monitor_port = COM11 ; ---------------------------------------------------------------------------------------- ; !!! this configuration expects the Mini_AP ; @@ -325,6 +325,7 @@ build_src_filter = [env:ESP32_S3_16_8_YELLOW_AP] board = esp32-s3-devkitc-1 board_build.partitions = large_spiffs_16MB.csv + build_unflags = -std=gnu++11 -D ARDUINO_USB_MODE=1 diff --git a/ESP32_AP-Flasher/src/language.cpp b/ESP32_AP-Flasher/src/language.cpp index 7d5b9923..61eabf54 100644 --- a/ESP32_AP-Flasher/src/language.cpp +++ b/ESP32_AP-Flasher/src/language.cpp @@ -7,7 +7,7 @@ int defaultLanguage = 0; -String languageList[] = {"EN - English", "NL - Nederlands", "DE - Deutsch", "NO - Norwegian"}; +String languageList[] = {"EN - English", "NL - Nederlands", "DE - Deutsch", "NO - Norwegian", "FR - French"}; /*EN English language section*/ String languageEnDaysShort[] = {"SU", "MO", "TU", "WE", "TH", "FR", "SA"}; @@ -33,9 +33,15 @@ String languageNoDays[] = {"Søndag", "Mandag", "Tirsdag", "Onsdag", "Torsdag", String languageNoMonth[] = {"Januar", "Februar", "Mars", "April", "Mai", "Juni", "Juli", "August", "September", "Oktober", "November", "Desember"}; /*END Norwegian language section END*/ -String* languageDaysShort[] = {languageEnDaysShort, languageNlDaysShort, languageDeDaysShort, languageNoDaysShort}; -String* languageDays[] = {languageEnDays, languageNlDays, languageDeDays, languageNoDays}; -String* languageMonth[] = {languageEnMonth, languageNlMonth, languageDeMonth, languageNoMonth}; +/*FR French language section*/ +String languageFrDaysShort[] = {"DI", "LU", "MA", "ME", "JE", "VE", "SA"}; +String languageFrDays[] = {"Dimanche", "Lundi", "Mardi", "Mercredi", "Jeudi", "Vendredi", "Samedi"}; +String languageFrMonth[] = {"Janvier", "Fevrier", "Mars", "Avril", "Mai", "Juin", "Juillet", "Aout", "Septembre", "Octobre", "Novembre", "Decembre"}; +/*END French language section END*/ + +String* languageDaysShort[] = {languageEnDaysShort, languageNlDaysShort, languageDeDaysShort, languageNoDaysShort, languageFrDaysShort}; +String* languageDays[] = {languageEnDays, languageNlDays, languageDeDays, languageNoDays, languageFrDays}; +String* languageMonth[] = {languageEnMonth, languageNlMonth, languageDeMonth, languageNoMonth, languageFrMonth}; int currentLanguage = defaultLanguage; diff --git a/ESP32_AP-Flasher/wwwroot/index.html b/ESP32_AP-Flasher/wwwroot/index.html index 3d2fa76a..88ea06d1 100644 --- a/ESP32_AP-Flasher/wwwroot/index.html +++ b/ESP32_AP-Flasher/wwwroot/index.html @@ -287,6 +287,7 @@ +