From a3f4390a25c4275c6c85955b7a6070695581fa0a Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Mon, 26 Oct 2020 16:12:51 +0100 Subject: [PATCH] Allow translations (static or dynamic) --- radio/src/thirdparty/libopenui/src/filechoice.cpp | 9 +++++++-- radio/src/thirdparty/libopenui/src/libopenui_file.h | 4 +--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/radio/src/thirdparty/libopenui/src/filechoice.cpp b/radio/src/thirdparty/libopenui/src/filechoice.cpp index 7a2319596..162c2bb1b 100644 --- a/radio/src/thirdparty/libopenui/src/filechoice.cpp +++ b/radio/src/thirdparty/libopenui/src/filechoice.cpp @@ -23,8 +23,13 @@ #include "theme.h" #include "message_dialog.h" -extern const char STR_SDCARD[]; -extern const char STR_NO_FILES_ON_SD[]; +#if !defined(STR_SDCARD) + #define STR_SDCARD "SD" +#endif + +#if !defined(STR_NO_FILES_ON_SD) + #define STR_NO_FILES_ON_SD "No files on SD Card!" +#endif FileChoice::FileChoice(FormGroup * parent, const rect_t & rect, std::string folder, const char * extension, int maxlen, std::function getValue, std::function setValue): ChoiceBase(parent, rect, CHOICE_TYPE_FOLDER), diff --git a/radio/src/thirdparty/libopenui/src/libopenui_file.h b/radio/src/thirdparty/libopenui/src/libopenui_file.h index e75cda9ee..8bccd2ff6 100644 --- a/radio/src/thirdparty/libopenui/src/libopenui_file.h +++ b/radio/src/thirdparty/libopenui/src/libopenui_file.h @@ -23,7 +23,6 @@ #include #include #include "ff.h" -// #include "libopenui_defines.h" constexpr uint8_t LEN_FILE_EXTENSION_MAX = 5; // longest used, including the dot, excluding null term. @@ -32,8 +31,7 @@ bool isExtensionMatching(const char * extension, const char * pattern, char * ma FRESULT sdReadDir(DIR * dir, FILINFO * fno, bool & firstTime); // comparison, not case sensitive. -inline bool compare_nocase(const std::string &first, const std::string &second) +inline bool compare_nocase(const std::string & first, const std::string & second) { return strcasecmp(first.c_str(), second.c_str()) < 0; } -