Skip to content

Commit 7355f93

Browse files
committed
fixed solosky#194: put language string into text area to reduce mem footprint
1 parent 428bb9d commit 7355f93

File tree

13 files changed

+44
-55
lines changed

13 files changed

+44
-55
lines changed

fw/application/src/i18n/de_DE.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include "string_id.h"
2-
const char * lang_de_DE[_L_COUNT] = {
2+
const char * const lang_de_DE[_L_COUNT] = {
33
[_L_ON] = "AN",
44
[_L_OFF] = "AUF",
55
[_L_ON_F] = "[AN]",

fw/application/src/i18n/en_US.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include "string_id.h"
2-
const char * lang_en_US[_L_COUNT] = {
2+
const char * const lang_en_US[_L_COUNT] = {
33
[_L_ON] = "ON",
44
[_L_OFF] = "OFF",
55
[_L_ON_F] = "[ON]",

fw/application/src/i18n/es_ES.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include "string_id.h"
2-
const char * lang_es_ES[_L_COUNT] = {
2+
const char * const lang_es_ES[_L_COUNT] = {
33
[_L_ON] = "SI",
44
[_L_OFF] = "NO",
55
[_L_ON_F] = "[SI]",

fw/application/src/i18n/fr_FR.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include "string_id.h"
2-
const char * lang_fr_FR[_L_COUNT] = {
2+
const char * const lang_fr_FR[_L_COUNT] = {
33
[_L_ON] = "ACTIVÉ",
44
[_L_OFF] = "DÉSACTIVÉ",
55
[_L_ON_F] = "[ACTIVÉ]",

fw/application/src/i18n/hu_HU.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include "string_id.h"
2-
const char * lang_hu_HU[_L_COUNT] = {
2+
const char * const lang_hu_HU[_L_COUNT] = {
33
[_L_ON] = "BE",
44
[_L_OFF] = "KI",
55
[_L_ON_F] = "[BE]",

fw/application/src/i18n/ja_JP.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include "string_id.h"
2-
const char * lang_ja_JP[_L_COUNT] = {
2+
const char * const lang_ja_JP[_L_COUNT] = {
33
[_L_ON] = "オン",
44
[_L_OFF] = "オフ",
55
[_L_ON_F] = "[オン]",

fw/application/src/i18n/language.c

Lines changed: 32 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,53 @@
11

22
#include "language.h"
33

4-
54
typedef struct {
6-
const char** strings;
5+
const char **strings;
76
} LanguageData;
87

9-
LanguageData languageData[LANGUAGE_COUNT] = {
10-
[LANGUAGE_ZH_HANS] = { .strings = lang_zh_Hans },
11-
[LANGUAGE_EN_US] = { .strings = lang_en_US },
12-
[LANGUAGE_ZH_TW] = { .strings = lang_zh_TW },
13-
[LANGUAGE_ES_ES] = { .strings = lang_es_ES },
14-
[LANGUAGE_HU_HU] = { .strings = lang_hu_HU },
15-
[LANGUAGE_DE_DE] = { .strings = lang_de_DE },
16-
[LANGUAGE_FR_FR] = { .strings = lang_fr_FR },
17-
[LANGUAGE_NL_NL] = { .strings = lang_nl_NL },
18-
[LANGUAGE_PT_BR] = { .strings = lang_pt_BR },
19-
[LANGUAGE_JA_JP] = { .strings = lang_ja_JP },
20-
[LANGUAGE_PT_PT] = { .strings = lang_pt_PT },
8+
const LanguageData const languageData[LANGUAGE_COUNT] = {
9+
[LANGUAGE_ZH_HANS] = {.strings = lang_zh_Hans}, [LANGUAGE_EN_US] = {.strings = lang_en_US},
10+
[LANGUAGE_ZH_TW] = {.strings = lang_zh_TW}, [LANGUAGE_ES_ES] = {.strings = lang_es_ES},
11+
[LANGUAGE_HU_HU] = {.strings = lang_hu_HU}, [LANGUAGE_DE_DE] = {.strings = lang_de_DE},
12+
[LANGUAGE_FR_FR] = {.strings = lang_fr_FR}, [LANGUAGE_NL_NL] = {.strings = lang_nl_NL},
13+
[LANGUAGE_PT_BR] = {.strings = lang_pt_BR}, [LANGUAGE_JA_JP] = {.strings = lang_ja_JP},
14+
[LANGUAGE_PT_PT] = {.strings = lang_pt_PT},
2115
};
2216

2317
// 当前语言设置 (Current language setting)
2418
Language currentLanguage = LANGUAGE_ZH_HANS;
2519

26-
27-
const char* getLangString(L_StringID stringID) {
28-
const char* string = languageData[currentLanguage].strings[stringID];
20+
const char *getLangString(L_StringID stringID) {
21+
const char *string = languageData[currentLanguage].strings[stringID];
2922
return string && strlen(string) > 0 ? string : lang_en_US[stringID];
3023
}
3124

32-
void setLanguage(Language lang) {
33-
currentLanguage = lang;
34-
}
25+
void setLanguage(Language lang) { currentLanguage = lang; }
3526

36-
const char* getLangDesc(Language lang){
37-
if(lang == LANGUAGE_ZH_HANS){
27+
const char *getLangDesc(Language lang) {
28+
if (lang == LANGUAGE_ZH_HANS) {
3829
return "简体中文";
39-
}else if(lang == LANGUAGE_EN_US){
30+
} else if (lang == LANGUAGE_EN_US) {
4031
return "English";
41-
}else if(lang == LANGUAGE_ZH_TW){
32+
} else if (lang == LANGUAGE_ZH_TW) {
4233
return "繁體中文(臺灣)";
43-
}else if(lang == LANGUAGE_ES_ES){
44-
return "Español";
45-
}else if(lang == LANGUAGE_HU_HU){
46-
return "Magyar";
47-
}else if(lang == LANGUAGE_DE_DE){
48-
return "Deutsch";
49-
}else if(lang == LANGUAGE_FR_FR){
50-
return "Français";
51-
}else if(lang == LANGUAGE_NL_NL){
52-
return "Dutch (Nederlands)";
53-
}else if(lang == LANGUAGE_PT_BR){
54-
return "Português(Brazil)";
55-
}else if(lang == LANGUAGE_JA_JP){
56-
return "日本語";
57-
}else if(lang == LANGUAGE_PT_PT){
58-
return "Português(Portugal)";
34+
} else if (lang == LANGUAGE_ES_ES) {
35+
return "Español";
36+
} else if (lang == LANGUAGE_HU_HU) {
37+
return "Magyar";
38+
} else if (lang == LANGUAGE_DE_DE) {
39+
return "Deutsch";
40+
} else if (lang == LANGUAGE_FR_FR) {
41+
return "Français";
42+
} else if (lang == LANGUAGE_NL_NL) {
43+
return "Dutch (Nederlands)";
44+
} else if (lang == LANGUAGE_PT_BR) {
45+
return "Português(Brazil)";
46+
} else if (lang == LANGUAGE_JA_JP) {
47+
return "日本語";
48+
} else if (lang == LANGUAGE_PT_PT) {
49+
return "Português(Portugal)";
5950
}
6051
}
6152

62-
Language getLanguage() {
63-
return currentLanguage;
64-
}
53+
Language getLanguage() { return currentLanguage; }

fw/application/src/i18n/nl_NL.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include "string_id.h"
2-
const char * lang_nl_NL[_L_COUNT] = {
2+
const char * const lang_nl_NL[_L_COUNT] = {
33
[_L_ON] = "AAN",
44
[_L_OFF] = "UIT",
55
[_L_ON_F] = "[AAN]",

fw/application/src/i18n/pt_BR.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include "string_id.h"
2-
const char * lang_pt_BR[_L_COUNT] = {
2+
const char * const lang_pt_BR[_L_COUNT] = {
33
[_L_ON] = "LIGADO",
44
[_L_OFF] = "DESLIGADO",
55
[_L_ON_F] = "[LIGADO]",

fw/application/src/i18n/pt_PT.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include "string_id.h"
2-
const char * lang_pt_PT[_L_COUNT] = {
2+
const char * const lang_pt_PT[_L_COUNT] = {
33
[_L_ON] = "SIM",
44
[_L_OFF] = "NÃO",
55
[_L_ON_F] = "[SIM]",

0 commit comments

Comments
 (0)