Skip to content

Commit

Permalink
Correct pound unit from lbs to lb (#12)
Browse files Browse the repository at this point in the history
lbs to lb
  • Loading branch information
DigiH authored Jun 24, 2022
1 parent 56f7499 commit 27f5cc0
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion qml/DeviceScale.qml
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ Loader {
anchors.bottom: parent.bottom
anchors.bottomMargin: 2

text: (settingsManager.tempUnit === 'C') ? "kg" : "lbs"
text: (settingsManager.tempUnit === 'C') ? "kg" : "lb"
opacity: 0.66
font.pixelSize: isPhone ? 20 : 22
font.bold: false
Expand Down
4 changes: 2 additions & 2 deletions qml/DeviceWidget.qml
Original file line number Diff line number Diff line change
Expand Up @@ -744,7 +744,7 @@ Item {
}
} else if (boxDevice.isScale) {
text.text = (settingsManager.tempUnit === 'C') ? boxDevice.weight.toFixed(1) : (boxDevice.weight * 2.20462).toFixed(1)
unit.text = (settingsManager.tempUnit === 'C') ? qsTr("kg") : qsTr("lbs")
unit.text = (settingsManager.tempUnit === 'C') ? qsTr("kg") : qsTr("lb")
}
}

Expand Down Expand Up @@ -790,7 +790,7 @@ Item {
textOne.font.pixelSize = bigAssMode ? 26 : 24
textTwo.font.pixelSize = bigAssMode ? 22 : 20

textOne.text = (settingsManager.tempUnit === 'C') ? boxDevice.weight.toFixed(1) + qsTr("kg") : (boxDevice.weight * 2.20462).toFixed(1) + qsTr("lbs")
textOne.text = (settingsManager.tempUnit === 'C') ? boxDevice.weight.toFixed(1) + qsTr("kg") : (boxDevice.weight * 2.20462).toFixed(1) + qsTr("lb")
if (boxDevice.impedance > 0) textTwo.text = boxDevice.impedance + " Ω"
} else if (boxDevice.isMotionSensor) {
textOne.font.pixelSize = bigAssMode ? 26 : 24
Expand Down
2 changes: 1 addition & 1 deletion qml/components/ChartScaleDataAio.qml
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ Item {
// print data
if (wei > 0) {
dataIndicator.visible = true
dataIndicator.text = wei.toFixed(1) + (settingsManager.tempUnit === "F" ? "lbs" : "kg")
dataIndicator.text = wei.toFixed(1) + (settingsManager.tempUnit === "F" ? "lb" : "kg")
if (currentDevice.hasImpedance && imp > 0) {
dataIndicator.text += " / " + imp.toFixed(0) + "Ω"
}
Expand Down

0 comments on commit 27f5cc0

Please sign in to comment.