Initial implementation of MassFormatter.

Author: jszumski

Foundation/NSMassFormatter.swift

@@ -67,7 +67,7 @@ open class MassFormatter : Formatter {
     // Format a number in kilograms to a localized string with the locale-appropriate unit and an appropriate scale (e.g. 1.2kg = 2.64lb in the US locale).
     open func string(fromKilograms numberInKilograms: Double) -> String {
         //Convert to the locale-appropriate unit
-        let unitFromKilograms = unit(fromKilograms: numberInKilograms)
+        let unitFromKilograms = convertedUnit(fromKilograms: numberInKilograms)
 
         //Map the unit to UnitMass type for conversion later
         let unitMassFromKilograms = MassFormatter.unitMass[unitFromKilograms]!
@@ -102,7 +102,7 @@ open class MassFormatter : Formatter {
     // Return the locale-appropriate unit, the same unit used by -stringFromKilograms:.
     open func unitString(fromKilograms numberInKilograms: Double, usedUnit unitp: UnsafeMutablePointer<Unit>?) -> String {
         //Convert to the locale-appropriate unit
-        let unitFromKilograms = unit(fromKilograms: numberInKilograms)
+        let unitFromKilograms = convertedUnit(fromKilograms: numberInKilograms)
         unitp?.pointee = unitFromKilograms
 
         //Map the unit to UnitMass type for conversion later
@@ -133,7 +133,7 @@ open class MassFormatter : Formatter {
     ///
     /// - Parameter numberInKilograms: the magnitude in terms of kilograms
     /// - Returns: Returns the appropriate unit
-    private func unit(fromKilograms numberInKilograms: Double) -> Unit {
+    private func convertedUnit(fromKilograms numberInKilograms: Double) -> Unit {
         if numberFormatter.locale.sr3202_fix_isMetricSystemLocale() {
             if numberInKilograms > 1.0 || numberInKilograms <= 0.0 {
                 return .kilogram