Merge pull request solosky#176 from impeeza/impeeza-NewSettingsLanguageApp

New Settings language selection logic

Author: solosky

docs/en/05+5-translation.md

@@ -16,12 +16,11 @@ The script `font_data_gen.sh` only can be run in Git Bash windows in Windows.
 2. Run `fw/scripts/i18n_gen.py` to generate new language files.
 3. Optional: Run `fw/scripts/font_data_gen.sh` to generate new font data if you add new charaters in i18n.csv
 4. Edit `fw/application/src/i18n/language.h` and `fw/application/src/i18n/language.c` to adopt new language
-5. Edit `fw/application/src/app/settings/scene/settings_scene_language.c` to adopt new language
-6. Edit Makefile to include `$(PROJ_DIR)/i18n/ja_JP.c` as C source files
-7. Run `make full` rebuild firmware
+5. Edit Makefile to include `$(PROJ_DIR)/i18n/ja_JP.c` as C source files
+6. Run `make full` rebuild firmware
 
 ## Font notes 
 
 For release build (RELEASE=1), the firmware use wenquanyi_9pt_u8g2.bdf to display unicode characters.  <br />
 Please check new language charater codepoint is included in wenquanyi_9pt_u8g2.bdf or not.<br />
-If not, I am not recommended to support the new language due to the MCU internal flash restrction. 
+If not, I am not recommended to support the new language due to the MCU internal flash restrction. 

fw/application/src/app/settings/scene/settings_scene_language.c

@@ -7,59 +7,28 @@
 #include "utils2.h"
 #include "version2.h"
 
-enum settings_sleep_timeout_menu_t {
-    SETTINGS_LANGUAGE_ZH_HANS,
-    SETTINGS_LANGUAGE_EN_US,
-    SETTINGS_LANGUAGE_ZH_TW,
-    SETTINGS_LANGUAGE_ES_ES,
-    SETTINGS_LANGUAGE_HU_HU,
-    SETTINGS_LANGUAGE_KO_KR,
-    SETTINGS_LANGUAGE_MENU_EXIT,
-};
 
 static void settings_scene_language_list_view_on_selected(mui_list_view_event_t event, mui_list_view_t *p_list_view,
                                                           mui_list_item_t *p_item) {
+
     app_settings_t *app = p_list_view->user_data;
     uint32_t selection = (uint32_t)p_item->user_data;
     settings_data_t *p_settings = settings_get_data();
-    switch (selection) {
-    case SETTINGS_LANGUAGE_ZH_HANS:
-        p_settings->language = LANGUAGE_ZH_HANS;
-        setLanguage(p_settings->language);
-        break;
-
-    case SETTINGS_LANGUAGE_EN_US:
-        p_settings->language = LANGUAGE_EN_US;
-        setLanguage(p_settings->language);
-        break;
-
-    case SETTINGS_LANGUAGE_ZH_TW:
-        p_settings->language = LANGUAGE_ZH_TW;
-        setLanguage(p_settings->language);
-        break;
-
-    case SETTINGS_LANGUAGE_ES_ES:
-        p_settings->language = LANGUAGE_ES_ES;
-        setLanguage(p_settings->language);
-        break;
-
-    case SETTINGS_LANGUAGE_HU_HU:
-        p_settings->language = LANGUAGE_HU_HU;
+    if (selection < LANGUAGE_COUNT){
+        p_settings->language = selection;
         setLanguage(p_settings->language);
-        break;
     }
+
     mui_scene_dispatcher_previous_scene(app->p_scene_dispatcher);
 }
 
 void settings_scene_language_on_enter(void *user_data) {
 
     app_settings_t *app = user_data;
-    mui_list_view_add_item(app->p_list_view, 0xe105, "简体中文", (void *)SETTINGS_LANGUAGE_ZH_HANS);
-    mui_list_view_add_item(app->p_list_view, 0xe105, "繁體中文(臺灣)", (void *)SETTINGS_LANGUAGE_ZH_TW);
-    mui_list_view_add_item(app->p_list_view, 0xe105, "English", (void *)SETTINGS_LANGUAGE_EN_US);
-    mui_list_view_add_item(app->p_list_view, 0xe105, getLangDesc(LANGUAGE_ES_ES), (void *)SETTINGS_LANGUAGE_ES_ES);
-    mui_list_view_add_item(app->p_list_view, 0xe105, getLangDesc(LANGUAGE_HU_HU), (void *)SETTINGS_LANGUAGE_HU_HU);
-    mui_list_view_add_item(app->p_list_view, 0xe069, getLangString(_L_BACK), (void *)SETTINGS_LANGUAGE_MENU_EXIT);
+    for (uint8_t i = 0; i < LANGUAGE_COUNT; i++){
+      mui_list_view_add_item(app->p_list_view, 0xe105, getLangDesc(i), (void *)i);
+    }
+    mui_list_view_add_item(app->p_list_view, 0xe069, getLangString(_L_BACK), (void *)NULL_USER_DATA);
 
     mui_list_view_set_selected_cb(app->p_list_view, settings_scene_language_list_view_on_selected);
     mui_view_dispatcher_switch_to_view(app->p_view_dispatcher, SETTINGS_VIEW_ID_MAIN);
@@ -69,4 +38,4 @@ void settings_scene_language_on_exit(void *user_data) {
     app_settings_t *app = user_data;
     mui_list_view_clear_items(app->p_list_view);
     mui_list_view_set_selected_cb(app->p_list_view, NULL);
-}
+}

fw/application/src/i18n/language.c

@@ -14,7 +14,7 @@ LanguageData languageData[LANGUAGE_COUNT] = {
     [LANGUAGE_HU_HU] = { .strings = lang_hu_HU },
 };
 
-// 当前语言设置
+// 当前语言设置 (Current language setting)
 Language currentLanguage = LANGUAGE_ZH_HANS;
 
 

fw/application/src/i18n/language.h

@@ -25,7 +25,7 @@ extern const char* lang_zh_TW[_L_COUNT];
 extern const char* lang_es_ES[_L_COUNT];
 extern const char* lang_hu_HU[_L_COUNT];
 
-// 获取字符串的函数
+// 获取字符串的函数 (Get language string function)
 const char* getLangString(L_StringID stringID);
 void setLanguage(Language lang);
 Language getLanguage();