diff --git a/src/graphics/draw/NotificationRenderer.cpp b/src/graphics/draw/NotificationRenderer.cpp index 28e6364bf..0ed77f929 100644 --- a/src/graphics/draw/NotificationRenderer.cpp +++ b/src/graphics/draw/NotificationRenderer.cpp @@ -53,8 +53,8 @@ inline void drawBannerText(OLEDDisplay *display, int16_t x, int16_t y, const cha { #if defined(ST7735_CS) || defined(ST7789_CS) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) || defined(ST7701_CS) || \ defined(HX8357_CS) || defined(ILI9488_CS) || defined(ST7796_CS) || defined(RAK14014) - if (isCJKLanguage() && graphics::screen) { - graphics::screen->drawTextL10n(x, y, text); + if (isCJKLanguage() && ::screen) { + ::screen->drawTextL10n(x, y, text); return; } #endif diff --git a/src/graphics/l10n/Strings.h b/src/graphics/l10n/Strings.h index 2359ecbfd..f053dd0d7 100644 --- a/src/graphics/l10n/Strings.h +++ b/src/graphics/l10n/Strings.h @@ -130,6 +130,7 @@ enum class StringKey : uint8_t { DeleteAll, DeleteAllChats, TemporarilyMute, + Unmute, ToggleBacklight, SleepScreen, SendPosition, diff --git a/src/graphics/l10n/Strings_EN.h b/src/graphics/l10n/Strings_EN.h index 5fe335c07..7a9b674ee 100644 --- a/src/graphics/l10n/Strings_EN.h +++ b/src/graphics/l10n/Strings_EN.h @@ -132,6 +132,7 @@ static const char STR_DELETE_THIS_CHAT_EN[] = "Delete This Chat"; static const char STR_DELETE_ALL_EN[] = "Delete All"; static const char STR_DELETE_ALL_CHATS_EN[] = "Delete All Chats"; static const char STR_TEMPORARILY_MUTE_EN[] = "Temporarily Mute"; +static const char STR_UNMUTE_EN[] = "Unmute"; static const char STR_TOGGLE_BACKLIGHT_EN[] = "Toggle Backlight"; static const char STR_SLEEP_SCREEN_EN[] = "Sleep Screen"; static const char STR_SEND_POSITION_EN[] = "Send Position"; @@ -400,6 +401,8 @@ inline const char *getStringEN(StringKey key) return STR_DELETE_ALL_CHATS_EN; case StringKey::TemporarilyMute: return STR_TEMPORARILY_MUTE_EN; + case StringKey::Unmute: + return STR_UNMUTE_EN; case StringKey::ToggleBacklight: return STR_TOGGLE_BACKLIGHT_EN; case StringKey::SleepScreen: diff --git a/src/graphics/l10n/Strings_ZH.h b/src/graphics/l10n/Strings_ZH.h index f9ee61445..c44925dbe 100644 --- a/src/graphics/l10n/Strings_ZH.h +++ b/src/graphics/l10n/Strings_ZH.h @@ -86,7 +86,7 @@ static const char STR_BEARINGS_ZH[] = "\xe6\x96\xb9\xe4\xbd\x8d"; static const char STR_CREATING_SSL_ZH[] = "\xe6\xad\xa3\xe5\x9c\xa8\xe5\x88\x9b\xe5\xbb\xba SSL \xe8\xaf\x81\xe4\xb9\xa6"; static const char STR_PLEASE_WAIT_ZH[] = "\xe8\xaf\xb7\xe7\xa8\x8d\xe5\x80\x99 . . ."; static const char STR_CRITICAL_FAULT_ZH[] = "\xe4\xb8\xa5\xe9\x87\x8d\xe6\x95\x85\xe9\x9a\x9c"; -static const char STR_FOR_HELP_VISIT_ZH[] = "\xe8\xaf\xb7\xe8\xae\xbf\xe9\x97\xae\x4ee5\xb8\xae\xe5\x8a\xa9"; +static const char STR_FOR_HELP_VISIT_ZH[] = "\xe8\xaf\xb7\xe8\xae\xbf\xe9\x97\xae\x4e\xe5\xb8\xae\xe5\x8a\xa9"; static const char STR_UPDATING_ZH[] = "\xe6\xad\xa3\xe5\x9c\xa8\xe6\x9b\xb4\xe6\x96\xb0"; static const char STR_PLEASE_BE_PATIENT_ZH[] = "\xe8\xaf\xb7\xe8\x80\x90\xe5\xbf\x83\xe7\xad\x89\xe5\xbe\x85\xef\xbc\x8c\xe4\xb8\x8d\xe8\xa6\x81\xe5\x85\xb3\xe9\x97\xad\xe7\x94\xb5\xe6\xba\x90\xe3\x80\x82"; static const char STR_REBOOT_IN_PROGRESS_ZH[] = "\xe6\xad\xa3\xe5\x9c\xa8\xe9\x87\x8d\xe5\x90\xaf..."; @@ -128,6 +128,7 @@ static const char STR_DELETE_THIS_CHAT_ZH[] = "\xe5\x88\xa0\xe9\x99\xa4\xe6\xad\ static const char STR_DELETE_ALL_ZH[] = "\xe5\x88\xa0\xe9\x99\xa4\xe5\x85\xa8\xe9\x83\xa8"; static const char STR_DELETE_ALL_CHATS_ZH[] = "\xe5\x88\xa0\xe9\x99\xa4\xe6\x89\x80\xe6\x9c\x89\xe8\x81\x8a\xe5\xa4\xa9"; static const char STR_TEMPORARILY_MUTE_ZH[] = "\xe4\xb8\xb4\xe6\x97\xb6\xe9\x9d\x99\xe9\x9f\xb3"; +static const char STR_UNMUTE_ZH[] = "\xe5\x8f\x96\xe6\xb6\x88\xe9\x9d\x99\xe9\x9f\xb3"; static const char STR_TOGGLE_BACKLIGHT_ZH[] = "\xe8\x83\x8c\xe5\x85\x89\xe5\xbc\x80\xe5\x85\xb3"; static const char STR_SLEEP_SCREEN_ZH[] = "\xe4\xbc\x91\xe7\x9c\xa0\xe5\xb1\x8f\xe5\xb9\x95"; static const char STR_SEND_POSITION_ZH[] = "\xe5\x8f\x91\xe9\x80\x81\xe4\xbd\x8d\xe7\xbd\xae"; @@ -396,6 +397,8 @@ inline const char *getStringZH(StringKey key) return STR_DELETE_ALL_CHATS_ZH; case StringKey::TemporarilyMute: return STR_TEMPORARILY_MUTE_ZH; + case StringKey::Unmute: + return STR_UNMUTE_ZH; case StringKey::ToggleBacklight: return STR_TOGGLE_BACKLIGHT_ZH; case StringKey::SleepScreen: