Skip to content

Added optional parameter to convenience Date initializer to allow generating dates against a specific calendar. Farsi also added as a language. #217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
djdrzzy wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added optional parameter to convenience Date initializer to allow generating dates against a specific calendar. Farsi also added as a language. #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
76ec0f3
Added optional parameter to convenience Date initializer to allow gen…
Jun 21, 2017
fb1d24c
Added farsi to our DateTools bundle.
Jun 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions DateToolsSwift/DateTools/Date+Inits.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,16 @@ public extension Date {
* - parameter dateString: Date in the formatting given by the format parameter
* - parameter format: Format style using Apple's date formatting guide
* - parameter timeZone: Time zone of date
* - parameter calendar: The calendar to generate the date against. By default it is the current calendar
*/
public init(dateString: String, format: String, timeZone: TimeZone) {
public init(dateString: String, format: String, timeZone: TimeZone, calendar: Calendar = Calendar.current) {
let dateFormatter = DateFormatter()
dateFormatter.dateStyle = .none;
dateFormatter.timeStyle = .none;
dateFormatter.timeZone = timeZone;
dateFormatter.dateFormat = format;

dateFormatter.dateStyle = .none
dateFormatter.timeStyle = .none
dateFormatter.timeZone = timeZone
dateFormatter.dateFormat = format
dateFormatter.calendar = calendar

guard let date = dateFormatter.date(from: dateString) else {
self = Date()
return
Expand Down
Binary file added DateToolsSwift/DateTools/DateTools.bundle/fa.lproj/DateTools.strings
View file
Open in desktop
Binary file not shown.
9 changes: 8 additions & 1 deletion DateToolsSwift/Tests/DateToolsTests/DateToolsTestsTests/DateInitsExtensionTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,14 @@ class DateDateToolsTests: XCTestCase {
let testDate = Date(year: 2011, month: 12, day: 25)
XCTAssertTrue(testDate.year == controlDate.year && testDate.month == controlDate.month && testDate.day == controlDate.day)
}


func testInitWithDatestringFormatTimezoneCalendar() {
let testDate = Date(dateString: "2011 12 25 4:30:30.000", format: "yyyy MM dd HH:mm:ss.SSS", timeZone: TimeZone(abbreviation: "CST")!, calendar: Calendar(identifier: .persian))
self.formatter.timeZone = TimeZone(abbreviation: "CST")
controlDate = self.formatter.date(from: "2633 03 16 4:30:30.000")!
XCTAssertTrue(testDate == controlDate)
}

func testInitWithDatestringFormatTimezone() {
let testDate = Date(dateString: "2011 12 25 4:30:30.000", format: "yyyy MM dd HH:mm:ss.SSS", timeZone: TimeZone(abbreviation: "CST")!)
self.formatter.timeZone = TimeZone(abbreviation: "CST")
Expand Down