demus/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge.git synced 2026-07-31 07:44:24 +02:00
Code Issues 1 Packages Projects Releases Wiki Activity

Use grams for weight values under 1kg

Browse Source
This commit is contained in:
José Rebelo
2026-04-15 21:43:13 +01:00
parent 802286c0fc
commit 0e704a9c35
15 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/WeightUnit.kt
+5 -1
View File
@@ -44,7 +44,11 @@ enum class WeightUnit {
}
KILOGRAM -> {
context.getString(R.string.weight_scale_kilogram_format, convertedWeight)
if (convertedWeight != 0.0 && convertedWeight < 1) {
context.getString(R.string.weight_scale_gram_format, (convertedWeight * 1000).roundToInt())
} else {
context.getString(R.string.weight_scale_kilogram_format, convertedWeight)
}
}
}
}
app/src/main/res/values-cs/strings.xml
+1 -1
View File
@@ -3962,7 +3962,7 @@
<string name="weight_scale_jin">jin – 市斤</string>
<string name="weight_scale_jin_format">%1$.2f 市斤</string>
<string name="weight_scale_kilogram">kilogram – kg</string>
<string name="weight_scale_kilogram_format">%1$.3f kg</string>
<string name="weight_scale_kilogram_format">%1$.2f kg</string>
<string name="weight_scale_pound">libra – lb</string>
<string name="weight_scale_pound_format">%1$.3f lb</string>
<string name="weight_scale_show_measurement">Zobrazit váhu</string>
app/src/main/res/values-de/strings.xml
+1 -1
View File
@@ -3830,7 +3830,7 @@
<string name="weight_scale_jin">Jin (500 g)</string>
<string name="weight_scale_jin_format">%1$.2f Jin (500 g)</string>
<string name="weight_scale_kilogram">Kilogramm – kg</string>
<string name="weight_scale_kilogram_format">%1$.3f kg</string>
<string name="weight_scale_kilogram_format">%1$.2f kg</string>
<string name="weight_scale_pound">Pfund – lb</string>
<string name="weight_scale_pound_format">%1$.3f lb</string>
<string name="weight_scale_show_measurement">Gewicht anzeigen</string>
app/src/main/res/values-es/strings.xml
+1 -1
View File
@@ -3811,7 +3811,7 @@
<string name="weight_scale_jin">jin - 市斤</string>
<string name="weight_scale_jin_format">%1$.2f 市斤</string>
<string name="weight_scale_kilogram">kilogramo - kg</string>
<string name="weight_scale_kilogram_format">%1$.3f kg</string>
<string name="weight_scale_kilogram_format">%1$.2f kg</string>
<string name="weight_scale_pound">libra - lb</string>
<string name="weight_scale_pound_format">%1$.3f lb</string>
<string name="weight_scale_show_measurement">Mostrar peso</string>
app/src/main/res/values-fr/strings.xml
+1 -1
View File
@@ -3638,7 +3638,7 @@
<string name="unit_celsius">℃</string>
<string name="unit_fahrenheit">℉</string>
<string name="weight_scale_kilogram">kilogramme - Kg</string>
<string name="weight_scale_kilogram_format">%1$.3f Kg</string>
<string name="weight_scale_kilogram_format">%1$.2f Kg</string>
<string name="weight_scale_show_measurement">Afficher poids</string>
<string name="workout_charts">Graphiques d’entraînement</string>
<string name="pref_display_enabled_title">Affichage activé</string>
app/src/main/res/values-hu/strings.xml
+1 -1
View File
@@ -3764,7 +3764,7 @@
<string name="weight_scale_jin">jin - 市斤</string>
<string name="weight_scale_jin_format">%1$.2f 市斤</string>
<string name="weight_scale_kilogram">kilogramm - kg</string>
<string name="weight_scale_kilogram_format">%1$.3f kg</string>
<string name="weight_scale_kilogram_format">%1$.2f kg</string>
<string name="weight_scale_pound">font - lb</string>
<string name="weight_scale_pound_format">%1$.3f lb</string>
<string name="weight_scale_show_measurement">Tömeg megjelenítése</string>
app/src/main/res/values-nb-rNO/strings.xml
+1 -1
View File
@@ -3663,7 +3663,7 @@
<string name="weight_scale_jin">jin - 市斤</string>
<string name="weight_scale_jin_format">%1$.2f 市斤</string>
<string name="weight_scale_kilogram">kilogram - kg</string>
<string name="weight_scale_kilogram_format">%1$.3f kg</string>
<string name="weight_scale_kilogram_format">%1$.2f kg</string>
<string name="weight_scale_pound">pound - lb</string>
<string name="weight_scale_pound_format">%1$.3f lb</string>
<string name="weight_scale_show_measurement">Vis vekt</string>
app/src/main/res/values-nl/strings.xml
+1 -1
View File
@@ -3963,7 +3963,7 @@
<string name="unit_celsius">℃</string>
<string name="unit_fahrenheit">℉</string>
<string name="weight_scale_kilogram">kilogram - kg</string>
<string name="weight_scale_kilogram_format">%1$.3f kg</string>
<string name="weight_scale_kilogram_format">%1$.2f kg</string>
<string name="weight_scale_pound">pond - lb</string>
<string name="weight_scale_pound_format">%1$.3f lb</string>
<string name="weight_scale_show_measurement">Toon gewicht</string>
app/src/main/res/values-pl/strings.xml
+1 -1
View File
@@ -3976,7 +3976,7 @@
<string name="weight_scale_jin">jin - 市斤</string>
<string name="weight_scale_jin_format">%1$.2f 市斤</string>
<string name="weight_scale_kilogram">kilogram - kg</string>
<string name="weight_scale_kilogram_format">%1$.3f kg</string>
<string name="weight_scale_kilogram_format">%1$.2f kg</string>
<string name="weight_scale_pound">funt - lb</string>
<string name="weight_scale_pound_format">%1$.3f lb</string>
<string name="weight_scale_show_measurement">Pokaż wagę</string>
app/src/main/res/values-ru/strings.xml
+1 -1
View File
@@ -3915,7 +3915,7 @@
<string name="first_start_permissions_do_not_ask_again">Больше не спрашивать</string>
<string name="first_start_permissions_do_not_ask_warning_summary">Отказ от предоставления разрешения может вызвать проблемы. Вы можете снова открыть этот экран с экрана настроек.</string>
<string name="weight_scale_kilogram">килограмм - кг</string>
<string name="weight_scale_kilogram_format">%1$.3f кг</string>
<string name="weight_scale_kilogram_format">%1$.2f кг</string>
<string name="weight_scale_pound">фунт - фт</string>
<string name="weight_scale_pound_format">%1$.3f фт</string>
<string name="weight_scale_show_measurement">Показать вес</string>
app/src/main/res/values-ta/strings.xml
+1 -1
View File
@@ -3879,7 +3879,7 @@
<string name="weight_scale_jin">சின் - இச்சிகோ</string>
<string name="weight_scale_jin_format">%1$.2f நகர வகை</string>
<string name="weight_scale_kilogram">கிலோகிராம் - கிலோ</string>
<string name="weight_scale_kilogram_format">%1$.3f கிலோ</string>
<string name="weight_scale_kilogram_format">%1$.2f கிலோ</string>
<string name="weight_scale_pound">பவுண்டு - பவுண்டு</string>
<string name="weight_scale_show_measurement">எடையைக் காட்டு</string>
<string name="weight_scale_stone">கல் - ச்டம்ப்</string>
app/src/main/res/values-tr/strings.xml
+1 -1
View File
@@ -3682,7 +3682,7 @@
<string name="unit_celsius">℃</string>
<string name="unit_fahrenheit">℉</string>
<string name="weight_scale_kilogram">kilogram - kg</string>
<string name="weight_scale_kilogram_format">%1$.3f kg</string>
<string name="weight_scale_kilogram_format">%1$.2f kg</string>
<string name="weight_scale_pound_format">%1$.3f lb</string>
<string name="weight_scale_show_measurement">Ağırlığı Göster</string>
<string name="weight_scale_stone_format">%1$d st %2$d lb</string>
app/src/main/res/values-uk/strings.xml
+1 -1
View File
@@ -3803,7 +3803,7 @@
<string name="weight_scale_jin">чути - 市斤</string>
<string name="weight_scale_jin_format">%1$.2f 市斤</string>
<string name="weight_scale_kilogram">кілограм - кг</string>
<string name="weight_scale_kilogram_format">%1$.3f кг</string>
<string name="weight_scale_kilogram_format">%1$.2f кг</string>
<string name="weight_scale_pound">фунт - фунт</string>
<string name="weight_scale_pound_format">%1$.3f фунт</string>
<string name="weight_scale_show_measurement">Показати вагу</string>
app/src/main/res/values-zh-rCN/strings.xml
+1 -1
View File
@@ -3953,7 +3953,7 @@
<string name="weight_scale_jin">市斤</string>
<string name="weight_scale_jin_format">%1$.2f 市斤</string>
<string name="weight_scale_kilogram">千克 - kg</string>
<string name="weight_scale_kilogram_format">%1$.3f kg</string>
<string name="weight_scale_kilogram_format">%1$.2f kg</string>
<string name="weight_scale_pound">磅 - lb</string>
<string name="weight_scale_pound_format">%1$.3f lb</string>
<string name="weight_scale_show_measurement">显示体重</string>
app/src/main/res/values/strings.xml
+2 -1
View File
@@ -4364,7 +4364,8 @@
<string name="weight_scale_jin">jin - 市斤</string>
<string name="weight_scale_jin_format">%1$.2f 市斤</string>
<string name="weight_scale_kilogram">kilogram - kg</string>
<string name="weight_scale_kilogram_format">%1$.3f kg</string>
<string name="weight_scale_kilogram_format">%1$.2f kg</string>
<string name="weight_scale_gram_format">%1$d g</string>
<string name="weight_scale_pound">pound - lb</string>
<string name="weight_scale_pound_format">%1$.3f lb</string>
<string name="weight_scale_show_measurement">Show Weight</string>