andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-07 16:29:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #627 from MichaelDvP/dev

Browse Source 
Fallback to en on empty entity string
This commit is contained in:
Proddy
2022-09-19 22:41:18 +05:30
committed by GitHub
parent 96070d6b42 106517fc8b
commit 918c0315eb
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/helpers.cpp
View File

@@ -705,10 +705,9 @@ std::string Helpers::translated_word(const __FlashStringHelper * const * strings
uint8_t index = 0; uint8_t index = 0;
// see how many translations we have for this entity. if there is no translation for this, revert to EN // see how many translations we have for this entity. if there is no translation for this, revert to EN
if (Helpers::count_items(strings) >= language_index + 1) { if (Helpers::count_items(strings) >= language_index + 1 && !read_flash_string(strings[language_index]).empty()) {
index = language_index; index = language_index;
} }
return to_lower ? toLower(read_flash_string(strings[index])) : read_flash_string(strings[index]); return to_lower ? toLower(read_flash_string(strings[index])) : read_flash_string(strings[index]);
} }
@@ -719,7 +718,7 @@ const __FlashStringHelper * Helpers::translated_fword(const __FlashStringHelper
uint8_t index = 0; uint8_t index = 0;
// see how many translations we have for this entity. if there is no translation for this, revert to EN // see how many translations we have for this entity. if there is no translation for this, revert to EN
if (Helpers::count_items(strings) >= language_index + 1) { if (Helpers::count_items(strings) >= language_index + 1 && !read_flash_string(strings[language_index]).empty()) {
index = language_index; index = language_index;
} }
return strings[index]; return strings[index];