From 2a7419c63c6156588abe537257567171a55121ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakob=20R=C3=B6ssner?= Date: Tue, 4 Feb 2025 18:14:45 +1100 Subject: [PATCH 1/2] fix: i18n improvements --- apps/web/src/locales/de.ts | 7 +++++-- apps/web/src/locales/en.ts | 7 +++++-- apps/web/src/locales/id.ts | 9 ++++++--- apps/web/src/locales/zh-CN.ts | 3 +++ apps/web/src/pages/settings/index.tsx | 8 ++++++-- 5 files changed, 25 insertions(+), 9 deletions(-) diff --git a/apps/web/src/locales/de.ts b/apps/web/src/locales/de.ts index c46795ad..b9c5767f 100644 --- a/apps/web/src/locales/de.ts +++ b/apps/web/src/locales/de.ts @@ -34,9 +34,12 @@ export default { "settings.wind speed units": "Windgeschwindigkeitseinheit", "settings.language": "Sprache", - "settings.english": "Englisch", + "settings.celsius": "Celsius", + "settings.fahrenheit": "Fahrenheit", + + "settings.english": "English", "settings.german": "Deutsch", - "settings.indonesian": "Indonesisch", + "settings.indonesian": "Bahasa Indonesia", "settings.chinese": "中文", // locationsettings page translations diff --git a/apps/web/src/locales/en.ts b/apps/web/src/locales/en.ts index e93d9d14..3ce88c56 100644 --- a/apps/web/src/locales/en.ts +++ b/apps/web/src/locales/en.ts @@ -34,9 +34,12 @@ export default { "settings.wind speed units": "Wind speed units", "settings.language": "Language", + "settings.celsius": "Celsius", + "settings.fahrenheit": "Fahrenheit", + "settings.english": "English", - "settings.german": "German", - "settings.indonesian": "Indonesian", + "settings.german": "Deutsch", + "settings.indonesian": "Bahasa Indonesia", "settings.chinese": "中文", // locationsettings page translations diff --git a/apps/web/src/locales/id.ts b/apps/web/src/locales/id.ts index 9b6a36a8..9bf2f314 100644 --- a/apps/web/src/locales/id.ts +++ b/apps/web/src/locales/id.ts @@ -34,9 +34,12 @@ export default { "settings.wind speed units": "Satuan kecepatan angin", "settings.language": "Bahasa", - "settings.english": "Inggris", - "settings.german": "Jerman", - "settings.indonesian": "Indonesia", + "settings.celsius": "Celcius", + "settings.fahrenheit": "Fahrenheit", + + "settings.english": "English", + "settings.german": "Deutsch", + "settings.indonesian": "Bahasa Indonesia", "settings.chinese": "中文", // locationsettings page translations diff --git a/apps/web/src/locales/zh-CN.ts b/apps/web/src/locales/zh-CN.ts index c63572cb..87737cea 100644 --- a/apps/web/src/locales/zh-CN.ts +++ b/apps/web/src/locales/zh-CN.ts @@ -34,6 +34,9 @@ export default { "settings.wind speed units": "风速单位", "settings.language": "语言", + "settings.celsius": "摄氏度", + "settings.fahrenheit": "华氏度", + "settings.english": "English", "settings.german": "Deutsch", "settings.indonesian": "Bahasa Indonesia", diff --git a/apps/web/src/pages/settings/index.tsx b/apps/web/src/pages/settings/index.tsx index 20dfcfc3..33b4e685 100644 --- a/apps/web/src/pages/settings/index.tsx +++ b/apps/web/src/pages/settings/index.tsx @@ -52,7 +52,9 @@ const Settings = observer(() => { }`} onClick={() => handleTemperatureUnitClick("Celsius")} > -

Celsius (°C)

+

+ {translationSettings("celsius")} (°C) +

{temperatureUnit$.get() === "Celsius" && ( )} @@ -63,7 +65,9 @@ const Settings = observer(() => { }`} onClick={() => handleTemperatureUnitClick("Fahrenheit")} > -

Fahrenheit (°F)

+

+ {translationSettings("fahrenheit")} (°F) +

{temperatureUnit$.get() === "Fahrenheit" && ( )} From 9318d17d0204a2669d86daa7850f6f5dc32141fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakob=20R=C3=B6ssner?= Date: Wed, 5 Feb 2025 16:31:08 +1100 Subject: [PATCH 2/2] fix: i18n improvements --- apps/web/src/locales/de.ts | 5 ----- apps/web/src/locales/en.ts | 5 ----- apps/web/src/locales/id.ts | 7 +------ apps/web/src/locales/zh-CN.ts | 5 ----- apps/web/src/pages/settings/index.tsx | 16 ++++------------ 5 files changed, 5 insertions(+), 33 deletions(-) diff --git a/apps/web/src/locales/de.ts b/apps/web/src/locales/de.ts index b9c5767f..8d1381c8 100644 --- a/apps/web/src/locales/de.ts +++ b/apps/web/src/locales/de.ts @@ -37,11 +37,6 @@ export default { "settings.celsius": "Celsius", "settings.fahrenheit": "Fahrenheit", - "settings.english": "English", - "settings.german": "Deutsch", - "settings.indonesian": "Bahasa Indonesia", - "settings.chinese": "中文", - // locationsettings page translations "locationsettings.add new location": "Füge einen Ort hinzu", "locationsettings.add new location button": "Hinzufügen", diff --git a/apps/web/src/locales/en.ts b/apps/web/src/locales/en.ts index 3ce88c56..b3b2e336 100644 --- a/apps/web/src/locales/en.ts +++ b/apps/web/src/locales/en.ts @@ -37,11 +37,6 @@ export default { "settings.celsius": "Celsius", "settings.fahrenheit": "Fahrenheit", - "settings.english": "English", - "settings.german": "Deutsch", - "settings.indonesian": "Bahasa Indonesia", - "settings.chinese": "中文", - // locationsettings page translations "locationsettings.add new location": "Add new location", "locationsettings.add new location button": "Add new location", diff --git a/apps/web/src/locales/id.ts b/apps/web/src/locales/id.ts index 9bf2f314..0937ec35 100644 --- a/apps/web/src/locales/id.ts +++ b/apps/web/src/locales/id.ts @@ -34,14 +34,9 @@ export default { "settings.wind speed units": "Satuan kecepatan angin", "settings.language": "Bahasa", - "settings.celsius": "Celcius", + "settings.celsius": "Celsius", "settings.fahrenheit": "Fahrenheit", - "settings.english": "English", - "settings.german": "Deutsch", - "settings.indonesian": "Bahasa Indonesia", - "settings.chinese": "中文", - // locationsettings page translations "locationsettings.add new location": "Tambah lokasi baru", "locationsettings.add new location button": "Tambah lokasi baru", diff --git a/apps/web/src/locales/zh-CN.ts b/apps/web/src/locales/zh-CN.ts index 87737cea..63474a82 100644 --- a/apps/web/src/locales/zh-CN.ts +++ b/apps/web/src/locales/zh-CN.ts @@ -37,11 +37,6 @@ export default { "settings.celsius": "摄氏度", "settings.fahrenheit": "华氏度", - "settings.english": "English", - "settings.german": "Deutsch", - "settings.indonesian": "Bahasa Indonesia", - "settings.chinese": "中文", - // locationsettings page translations "locationsettings.add new location": "添加新位置", "locationsettings.add new location button": "添加新位置", diff --git a/apps/web/src/pages/settings/index.tsx b/apps/web/src/pages/settings/index.tsx index 33b4e685..3fd418c2 100644 --- a/apps/web/src/pages/settings/index.tsx +++ b/apps/web/src/pages/settings/index.tsx @@ -159,9 +159,7 @@ const Settings = observer(() => { width={20} height={20} /> -

- {translationSettings("english")} -

+

English

{locale === "en" && ( )} @@ -178,9 +176,7 @@ const Settings = observer(() => { width={20} height={20} /> -

- {translationSettings("german")} -

+

Deutsch

{locale === "de" && ( )} @@ -197,9 +193,7 @@ const Settings = observer(() => { width={20} height={20} /> -

- {translationSettings("indonesian")} -

+

Bahasa Indonesia

{locale === "id" && ( )} @@ -216,9 +210,7 @@ const Settings = observer(() => { width={20} height={20} /> -

- {translationSettings("chinese")} -

+

中文

{locale === "zh-CN" && ( )}