Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions apps/web/src/locales/de.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,8 @@ export default {
"settings.wind speed units": "Windgeschwindigkeitseinheit",
"settings.language": "Sprache",

"settings.english": "Englisch",
"settings.german": "Deutsch",
"settings.indonesian": "Indonesisch",
"settings.chinese": "中文",
"settings.celsius": "Celsius",
"settings.fahrenheit": "Fahrenheit",

// locationsettings page translations
"locationsettings.add new location": "Füge einen Ort hinzu",
Expand Down
6 changes: 2 additions & 4 deletions apps/web/src/locales/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,8 @@ export default {
"settings.wind speed units": "Wind speed units",
"settings.language": "Language",

"settings.english": "English",
"settings.german": "German",
"settings.indonesian": "Indonesian",
"settings.chinese": "中文",
"settings.celsius": "Celsius",
"settings.fahrenheit": "Fahrenheit",

// locationsettings page translations
"locationsettings.add new location": "Add new location",
Expand Down
6 changes: 2 additions & 4 deletions apps/web/src/locales/id.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,8 @@ export default {
"settings.wind speed units": "Satuan kecepatan angin",
"settings.language": "Bahasa",

"settings.english": "Inggris",
"settings.german": "Jerman",
"settings.indonesian": "Indonesia",
"settings.chinese": "中文",
"settings.celsius": "Celsius",
"settings.fahrenheit": "Fahrenheit",

// locationsettings page translations
"locationsettings.add new location": "Tambah lokasi baru",
Expand Down
6 changes: 2 additions & 4 deletions apps/web/src/locales/zh-CN.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,8 @@ export default {
"settings.wind speed units": "风速单位",
"settings.language": "语言",

"settings.english": "English",
"settings.german": "Deutsch",
"settings.indonesian": "Bahasa Indonesia",
"settings.chinese": "中文",
"settings.celsius": "摄氏度",
"settings.fahrenheit": "华氏度",

// locationsettings page translations
"locationsettings.add new location": "添加新位置",
Expand Down
24 changes: 10 additions & 14 deletions apps/web/src/pages/settings/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,9 @@ const Settings = observer(() => {
}`}
onClick={() => handleTemperatureUnitClick("Celsius")}
>
<p className={styles.buttontext}>Celsius (°C)</p>
<p className={styles.buttontext}>
{translationSettings("celsius")} (°C)
</p>
{temperatureUnit$.get() === "Celsius" && (
<RxCheck width={20} height={20} className="h-9 w-9" />
)}
Expand All @@ -63,7 +65,9 @@ const Settings = observer(() => {
}`}
onClick={() => handleTemperatureUnitClick("Fahrenheit")}
>
<p className={styles.buttontext}>Fahrenheit (°F)</p>
<p className={styles.buttontext}>
{translationSettings("fahrenheit")} (°F)
</p>
{temperatureUnit$.get() === "Fahrenheit" && (
<RxCheck width={20} height={20} className="h-9 w-9" />
)}
Expand Down Expand Up @@ -155,9 +159,7 @@ const Settings = observer(() => {
width={20}
height={20}
/>
<p className={`${styles.buttontext} ml-2`}>
{translationSettings("english")}
</p>
<p className={`${styles.buttontext} ml-2`}>English</p>
{locale === "en" && (
<RxCheck width={20} height={20} className="h-9 w-9" />
)}
Expand All @@ -174,9 +176,7 @@ const Settings = observer(() => {
width={20}
height={20}
/>
<p className={`${styles.buttontext} ml-2`}>
{translationSettings("german")}
</p>
<p className={`${styles.buttontext} ml-2`}>Deutsch</p>
{locale === "de" && (
<RxCheck width={20} height={20} className="h-9 w-9" />
)}
Expand All @@ -193,9 +193,7 @@ const Settings = observer(() => {
width={20}
height={20}
/>
<p className={`${styles.buttontext} ml-2`}>
{translationSettings("indonesian")}
</p>
<p className={`${styles.buttontext} ml-2`}>Bahasa Indonesia</p>
{locale === "id" && (
<RxCheck width={20} height={20} className="h-9 w-9" />
)}
Expand All @@ -212,9 +210,7 @@ const Settings = observer(() => {
width={20}
height={20}
/>
<p className={`${styles.buttontext} ml-2`}>
{translationSettings("chinese")}
</p>
<p className={`${styles.buttontext} ml-2`}>中文</p>
{locale === "zh-CN" && (
<RxCheck width={20} height={20} className="h-9 w-9" />
)}
Expand Down
Loading