Commit 5261a054 by Demid Merzlyakov

Remove unit from temperature.

parent 7cb5705a
...@@ -8,11 +8,11 @@ ...@@ -8,11 +8,11 @@
import Foundation import Foundation
extension Measurement { extension Measurement {
private static func formatter(style: Formatter.UnitStyle) -> MeasurementFormatter { private static func formatter(style: Formatter.UnitStyle, unitOptions: MeasurementFormatter.UnitOptions = .providedUnit) -> MeasurementFormatter {
let fmt = MeasurementFormatter() let fmt = MeasurementFormatter()
fmt.locale = Settings.shared.locale fmt.locale = Settings.shared.locale
fmt.unitStyle = style fmt.unitStyle = .short
fmt.unitOptions = .providedUnit fmt.unitOptions = unitOptions
fmt.numberFormatter.maximumFractionDigits = 0 fmt.numberFormatter.maximumFractionDigits = 0
return fmt return fmt
} }
...@@ -38,6 +38,10 @@ extension Temperature { ...@@ -38,6 +38,10 @@ extension Temperature {
var settingsConverted:Measurement { var settingsConverted:Measurement {
return self.converted(to: Settings.shared.temperatureType) return self.converted(to: Settings.shared.temperatureType)
} }
var shortString:String {
return Measurement.formatter(style: .short, unitOptions: .temperatureWithoutUnit).string(from: self)
}
} }
extension WindSpeed { extension WindSpeed {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment