 		var toTranslate : String = ""
 		switch unit {
 			
-		case NSCalendarUnit.Year where singular:		toTranslate = (abbreviated ? "yr" : "year")
-		case NSCalendarUnit.Year where !singular:		toTranslate = (abbreviated ? "yrs" : "years")
-			
-		case NSCalendarUnit.Month where singular:		toTranslate = (abbreviated ? "mo" : "month")
-		case NSCalendarUnit.Month where !singular:		toTranslate = (abbreviated ? "mos" : "months")
-			
-		case NSCalendarUnit.WeekOfYear where singular:	toTranslate = (abbreviated ? "wk" : "week")
-		case NSCalendarUnit.WeekOfYear where !singular: toTranslate = (abbreviated ? "wks" : "weeks")
-			
-		case NSCalendarUnit.Day where singular:			toTranslate = "day"
-		case NSCalendarUnit.Day where !singular:		toTranslate = "days"
-			
-		case NSCalendarUnit.Hour where singular:		toTranslate = (abbreviated ? "hr" : "hour")
-		case NSCalendarUnit.Hour where !singular:		toTranslate = (abbreviated ? "hrs" : "hours")
-			
-		case NSCalendarUnit.Minute where singular:		toTranslate = (abbreviated ? "min" : "minute")
-		case NSCalendarUnit.Minute where !singular:		toTranslate = (abbreviated ? "mins" : "minutes")
-			
-		case NSCalendarUnit.Second where singular:		toTranslate = (abbreviated ? "s" : "second")
-		case NSCalendarUnit.Second where !singular:		toTranslate = (abbreviated ? "s" : "seconds")
+		case NSCalendarUnit.CalendarUnitYear where singular:		toTranslate = (abbreviated ? "yr" : "year")
+		case NSCalendarUnit.CalendarUnitYear where !singular:		toTranslate = (abbreviated ? "yrs" : "years")
+			
+		case NSCalendarUnit.CalendarUnitMonth where singular:		toTranslate = (abbreviated ? "mo" : "month")
+		case NSCalendarUnit.CalendarUnitMonth where !singular:		toTranslate = (abbreviated ? "mos" : "months")
+			
+		case NSCalendarUnit.CalendarUnitWeekOfYear where singular:	toTranslate = (abbreviated ? "wk" : "week")
+		case NSCalendarUnit.CalendarUnitWeekOfYear where !singular: toTranslate = (abbreviated ? "wks" : "weeks")
+			
+		case NSCalendarUnit.CalendarUnitDay where singular:			toTranslate = "day"
+		case NSCalendarUnit.CalendarUnitDay where !singular:		toTranslate = "days"
+			
+		case NSCalendarUnit.CalendarUnitHour where singular:		toTranslate = (abbreviated ? "hr" : "hour")
+		case NSCalendarUnit.CalendarUnitHour where !singular:		toTranslate = (abbreviated ? "hrs" : "hours")
+			
+		case NSCalendarUnit.CalendarUnitMinute where singular:		toTranslate = (abbreviated ? "min" : "minute")
+		case NSCalendarUnit.CalendarUnitMinute where !singular:		toTranslate = (abbreviated ? "mins" : "minutes")
+			
+		case NSCalendarUnit.CalendarUnitSecond where singular:		toTranslate = (abbreviated ? "s" : "second")
+		case NSCalendarUnit.CalendarUnitSecond where !singular:		toTranslate = (abbreviated ? "s" : "seconds")
 			
 		default:													toTranslate = ""
 		}

		return NSBundle.mainBundle().localizedStringForKey(self, value: nil, table: "SwiftDates")
	}
	
	func _sdToCalendarUnit() -> NSCalendarUnit? {
		switch self {
		case "year":
			return NSCalendarUnit.Year
		case "month":
			return NSCalendarUnit.Month
		case "week":
			return NSCalendarUnit.WeekOfYear
		case "day":
			return NSCalendarUnit.Day
		case "hour":
			return NSCalendarUnit.Hour
		case "minute":
			return NSCalendarUnit.Minute
		case "second":
			return NSCalendarUnit.Second
		default:
			return nil
		}

	/**
	Return true if current date's day is not a weekend day
	
	:returns: true if date's day is a week day, not a weekend day
	*/
	func isWeekday() -> Bool {
		return !self.isWeekend()
