From e3866fda452797cc10793018f567089b154eb7cf Mon Sep 17 00:00:00 2001 From: bsongis Date: Wed, 2 Jul 2014 21:38:05 +0200 Subject: [PATCH] Fixes #1395 --- radio/src/gui/menus.cpp | 3 ++- radio/src/translations.cpp | 3 +++ radio/src/translations.h | 8 +++++++- radio/src/translations/cz.h.txt | 12 +++++++++--- radio/src/translations/de.h.txt | 10 ++++++++-- radio/src/translations/en.h.txt | 10 ++++++++-- radio/src/translations/es.h.txt | 10 ++++++++-- radio/src/translations/fi.h.txt | 10 ++++++++-- radio/src/translations/fr.h.txt | 10 ++++++++-- radio/src/translations/it.h.txt | 10 ++++++++-- radio/src/translations/pl.h.txt | 10 ++++++++-- radio/src/translations/pt.h.txt | 10 ++++++++-- radio/src/translations/se.h.txt | 10 ++++++++-- 13 files changed, 93 insertions(+), 23 deletions(-) diff --git a/radio/src/gui/menus.cpp b/radio/src/gui/menus.cpp index d994fa3a9..7d15d55c0 100644 --- a/radio/src/gui/menus.cpp +++ b/radio/src/gui/menus.cpp @@ -1074,8 +1074,9 @@ void displayWarning(uint8_t event) { s_warning_result = false; displayBox(); - if (s_warning_info) + if (s_warning_info) { lcd_putsnAtt(16, WARNING_LINE_Y+FH, s_warning_info, s_warning_info_len, WARNING_INFO_FLAGS); + } lcd_puts(16, WARNING_LINE_Y+2*FH, s_warning_type == WARNING_TYPE_ASTERISK ? STR_EXIT : STR_POPUPS); switch (event) { #if defined(ROTARY_ENCODER_NAVIGATION) diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index 6a25a8fc2..64269b7a4 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -127,6 +127,9 @@ const pm_char STR_OPEN9X[] PROGMEM = // The 0-terminated-strings const pm_char STR_POPUPS[] PROGMEM = TR_POPUPS; +#if !defined(OFS_EXIT) + const pm_char STR_EXIT[] PROGMEM = TR_EXIT; +#endif const pm_char STR_MENUWHENDONE[] PROGMEM = TR_MENUWHENDONE; const pm_char STR_FREE[] PROGMEM = TR_FREE; const pm_char STR_DELETEMODEL[] PROGMEM = TR_DELETEMODEL; diff --git a/radio/src/translations.h b/radio/src/translations.h index ccf5dc138..01b43a68b 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -291,7 +291,13 @@ extern const pm_char STR_OPEN9X[]; #define NO_INDENT(x) (x)+LEN_INDENT extern const pm_char STR_POPUPS[]; -#define STR_EXIT (STR_POPUPS + OFS_EXIT) + +#if defined(OFS_EXIT) + #define STR_EXIT (STR_POPUPS + OFS_EXIT) +#else + extern const pm_char STR_EXIT[]; +#endif + extern const pm_char STR_MENUWHENDONE[]; extern const pm_char STR_FREE[]; #define LEN_FREE PSIZE(TR_FREE) diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index b1c39e5b4..49268f082 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -485,10 +485,16 @@ #define TR_ENTER "[MENU]" #endif -#define TR_POPUPS TR_ENTER"\010[EXIT]" -#define OFS_EXIT sizeof(TR_ENTER) +#define TR_EXIT "[EXIT]" -#define TR_MENUWHENDONE CENTER "\011"TR_ENTER" > DALŠÍ" +#if defined(PCBTARANIS) + #define TR_POPUPS TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER +#else + #define TR_POPUPS TR_ENTER "\010" TR_EXIT + #define OFS_EXIT sizeof(TR_ENTER) +#endif + +#define TR_MENUWHENDONE CENTER "\011" TR_ENTER " > DALŠÍ" #define TR_FREE TR("volné:", "volných") #define TR_DELETEMODEL "SMAZAT MODEL" #define TR_COPYINGMODEL "Kopíruji model.." diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index a386abe07..a2e1dc94d 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -485,8 +485,14 @@ #define TR_ENTER "[MENU]" #endif -#define TR_POPUPS TR_ENTER"\010[EXIT]" -#define OFS_EXIT sizeof(TR_ENTER) +#define TR_EXIT "[EXIT]" + +#if defined(PCBTARANIS) + #define TR_POPUPS TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER +#else + #define TR_POPUPS TR_ENTER "\010" TR_EXIT + #define OFS_EXIT sizeof(TR_ENTER) +#endif #define TR_MENUWHENDONE CENTER"\010"TR_ENTER" > Weiter" #define TR_FREE "frei" diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index d61dada9e..fdbc73d84 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -485,8 +485,14 @@ #define TR_ENTER "[MENU]" #endif -#define TR_POPUPS TR_ENTER "\010[EXIT]" -#define OFS_EXIT sizeof(TR_ENTER) +#define TR_EXIT "[EXIT]" + +#if defined(PCBTARANIS) + #define TR_POPUPS TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER +#else + #define TR_POPUPS TR_ENTER "\010" TR_EXIT + #define OFS_EXIT sizeof(TR_ENTER) +#endif #define TR_MENUWHENDONE CENTER "\006" TR_ENTER " WHEN DONE" #define TR_FREE "free" diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index 3c560894b..95b5bda08 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -485,8 +485,14 @@ #define TR_ENTER "[MENU]" #endif -#define TR_POPUPS TR_ENTER "\010[SALIR]" -#define OFS_EXIT sizeof(TR_ENTER) +#define TR_EXIT "[SALIR]" + +#if defined(PCBTARANIS) + #define TR_POPUPS TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER +#else + #define TR_POPUPS TR_ENTER "\010" TR_EXIT + #define OFS_EXIT sizeof(TR_ENTER) +#endif #define TR_MENUWHENDONE CENTER "\007" TR_ENTER " AL ACABAR " #define TR_FREE "libre" diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index 667d1bc97..6aa072f44 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -485,8 +485,14 @@ #define TR_ENTER "[MENU]" #endif -#define TR_POPUPS TR_ENTER "\010[EXIT]" -#define OFS_EXIT sizeof(TR_ENTER) +#define TR_EXIT "[EXIT]" + +#if defined(PCBTARANIS) + #define TR_POPUPS TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER +#else + #define TR_POPUPS TR_ENTER "\010" TR_EXIT + #define OFS_EXIT sizeof(TR_ENTER) +#endif #define TR_MENUWHENDONE CENTER "\006" TR_ENTER " WHEN DONE" #define TR_FREE "free" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index a11912f00..1b2334918 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -485,8 +485,14 @@ #define TR_ENTER "[MENU]" #endif -#define TR_POPUPS TR_ENTER"\010[EXIT]" -#define OFS_EXIT sizeof(TR_ENTER) +#define TR_EXIT "[EXIT]" + +#if defined(PCBTARANIS) + #define TR_POPUPS TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER +#else + #define TR_POPUPS TR_ENTER "\010" TR_EXIT + #define OFS_EXIT sizeof(TR_ENTER) +#endif #define TR_MENUWHENDONE CENTER"\006"TR_ENTER" QUAND PRET" #define TR_FREE "disp" diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index 288d67b84..7091fe6cb 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -485,8 +485,14 @@ #define TR_ENTER "[Menù]" #endif -#define TR_POPUPS TR_ENTER"\004[EXIT]" -#define OFS_EXIT sizeof(TR_ENTER) +#define TR_EXIT "[EXIT]" + +#if defined(PCBTARANIS) + #define TR_POPUPS TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER +#else + #define TR_POPUPS TR_ENTER "\010" TR_EXIT + #define OFS_EXIT sizeof(TR_ENTER) +#endif #define TR_MENUWHENDONE CENTER "\007" TR_ENTER " Conferma" #define TR_FREE "disp" diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index 2cc3c58bf..6c11cbc43 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -485,8 +485,14 @@ #define TR_ENTER "[MENU]" #endif -#define TR_POPUPS TR_ENTER "\010[WYJŚ]" -#define OFS_EXIT sizeof(TR_ENTER) +#define TR_EXIT "[WYJŚ]" + +#if defined(PCBTARANIS) + #define TR_POPUPS TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER +#else + #define TR_POPUPS TR_ENTER "\010" TR_EXIT + #define OFS_EXIT sizeof(TR_ENTER) +#endif #define TR_MENUWHENDONE CENTER "\006"TR_ENTER " > DALEJ " #define TR_FREE "woln" diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index 8abb180d9..52ea7c9f8 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -485,8 +485,14 @@ #define TR_ENTER "[MENU]" #endif -#define TR_POPUPS TR_ENTER"\010[EXIT]" -#define OFS_EXIT sizeof(TR_ENTER) +#define TR_EXIT "[EXIT]" + +#if defined(PCBTARANIS) + #define TR_POPUPS TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER +#else + #define TR_POPUPS TR_ENTER "\010" TR_EXIT + #define OFS_EXIT sizeof(TR_ENTER) +#endif #define TR_MENUWHENDONE CENTER"\006"TR_ENTER"QDO PRONTO" #define TR_FREE "Livre" diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index 3136e6d2c..00a12cc77 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -485,8 +485,14 @@ #define TR_ENTER "[MENU]" #endif -#define TR_POPUPS TR_ENTER"\010[EXIT]" -#define OFS_EXIT sizeof(TR_ENTER) +#define TR_EXIT "[EXIT]" + +#if defined(PCBTARANIS) + #define TR_POPUPS TR_EXIT "\010" "\010" "\010" "\010" TR_ENTER +#else + #define TR_POPUPS TR_ENTER "\010" TR_EXIT + #define OFS_EXIT sizeof(TR_ENTER) +#endif #define TR_MENUWHENDONE CENTER "\011" TR_ENTER " Avslutar " #define TR_FREE "kvar"