language enhancement

Author: solosky

fw/application/src/i18n/language.c

@@ -18,6 +18,12 @@ const LanguageData const languageData[LANGUAGE_COUNT] = {
 Language currentLanguage = LANGUAGE_ZH_HANS;
 
 const char *getLangString(L_StringID stringID) {
+    if (stringID >= _L_COUNT) {
+        return "@@STR@@";
+    }
+    if (currentLanguage >= LANGUAGE_COUNT) {
+        return lang_en_US[stringID];
+    }
     const char *string = languageData[currentLanguage].strings[stringID];
     return string && strlen(string) > 0 ? string : lang_en_US[stringID];
 }
@@ -47,6 +53,8 @@ const char *getLangDesc(Language lang) {
         return "日本語";
     } else if (lang == LANGUAGE_PT_PT) {
         return "Português(Portugal)";
+    } else {
+        return "@@LANG@@";
     }
 }
 

fw/application/src/main.c

@@ -93,8 +93,8 @@
 #include "hal_spi_flash.h"
 
 #include "cache.h"
-#include "settings.h"
 #include "i18n/language.h"
+#include "settings.h"
 
 #define APP_SCHED_MAX_EVENT_SIZE 4 /**< Maximum size of scheduler events. */
 #define APP_SCHED_QUEUE_SIZE 16    /**< Maximum number of events in the scheduler queue. */
@@ -104,7 +104,6 @@
 
 #define APP_SHUTDOWN_HANDLER_PRIORITY 1
 
-
 int8_t g_usb_led_marquee_enable = 0; /** dummy for chameleon */
 
 // #define SPI_FLASH
@@ -166,8 +165,6 @@ static bool shutdown_handler(nrf_pwr_mgmt_evt_t event) {
         // save settings
         settings_save();
 
-
-
         hal_spi_flash_sleep();
 
         err_code = bsp_wakeup_button_enable(BTN_ID_SLEEP);
@@ -260,7 +257,7 @@ int main(void) {
     err_code = ntag_emu_init(&default_ntag215);
     APP_ERROR_CHECK(err_code);
 
-    //cache_clean(); //FOR TESTING
+    // cache_clean(); //FOR TESTING
     check_wakeup_src();
 
     err_code = settings_init();
@@ -277,11 +274,8 @@ int main(void) {
 
     NRF_LOG_DEBUG("init done");
 
-    if (p_settings->language >= LANGUAGE_COUNT) {
-        p_settings->language = LANGUAGE_EN_US;
-    }
     setLanguage(p_settings->language);
-    
+
     mui_t *p_mui = mui();
     mui_init(p_mui);