Skip to content

Commit 2611ba1

Browse files
committed
Saving time in a log file according to the local time zone
1 parent 414307f commit 2611ba1

File tree

2 files changed

+15
-6
lines changed

2 files changed

+15
-6
lines changed

TinyTimeTracker/TinyTimeTracker.xcodeproj/project.pbxproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@
330330
"$(inherited)",
331331
"@executable_path/../Frameworks",
332332
);
333-
MARKETING_VERSION = 1.1.0;
333+
MARKETING_VERSION = 1.1.1;
334334
PRODUCT_BUNDLE_IDENTIFIER = nyok.TinyTimeTracker;
335335
PRODUCT_NAME = "$(TARGET_NAME)";
336336
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -360,7 +360,7 @@
360360
"$(inherited)",
361361
"@executable_path/../Frameworks",
362362
);
363-
MARKETING_VERSION = 1.1.0;
363+
MARKETING_VERSION = 1.1.1;
364364
PRODUCT_BUNDLE_IDENTIFIER = nyok.TinyTimeTracker;
365365
PRODUCT_NAME = "$(TARGET_NAME)";
366366
PROVISIONING_PROFILE_SPECIFIER = "";

TinyTimeTracker/TinyTimeTracker/AppDelegate.swift

+13-4
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
2222
let iconWork = NSImage(named:NSImage.Name("IconWork"))
2323
let iconRest = NSImage(named:NSImage.Name("IconRest"))
2424
let paths = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask)
25+
var localDate = Date().currentTimeZoneDate()
2526

2627
@IBOutlet weak var statusMenu: NSMenu!
2728
@IBOutlet weak var startStopMenuItem: NSMenuItem!
@@ -37,12 +38,12 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
3738
stopAllTimer()
3839
saveStats(logMessage: workTimerMenuItem.title + "\n")
3940
saveStats(logMessage: restTimerMenuItem.title + "\n")
40-
let logMessage = NSLocalizedString("logMessageStop", comment: "") + ": " + String("\(NSDate())\n")
41+
let logMessage = NSLocalizedString("logMessageStop", comment: "") + ": " + String("\(localDate)\n")
4142
saveStats(logMessage: logMessage)
4243
statusItem.button?.image = icon
4344
}
4445
else {
45-
let logMessage = "\n" + NSLocalizedString("logMessageStart", comment: "") + ": " + String("\(NSDate())\n")
46+
let logMessage = "\n" + NSLocalizedString("logMessageStart", comment: "") + ": " + String("\(localDate)\n")
4647
saveStats(logMessage: logMessage)
4748
workTimerMenuItem.title = NSLocalizedString("textWork", comment: "") + String(": 00:00:00")
4849
restTimerMenuItem.title = NSLocalizedString("textRest", comment: "") + String(": 00:00:00")
@@ -75,7 +76,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
7576
stopAllTimer()
7677
saveStats(logMessage: workTimerMenuItem.title + "\n")
7778
saveStats(logMessage: restTimerMenuItem.title + "\n")
78-
let logMessage = NSLocalizedString("logMessageStop", comment: "") + " " + String("\(NSDate())\n")
79+
let logMessage = NSLocalizedString("logMessageStop", comment: "") + " " + String("\(localDate)\n")
7980
saveStats(logMessage: logMessage)
8081
}
8182
NSApp.terminate(self)
@@ -223,7 +224,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
223224
statisticsMenuItem.title = NSLocalizedString("errorMessageWrite", comment: "") + " " + logFile.path
224225
}
225226
} else {
226-
let logMessage = NSLocalizedString("logMessageCreate", comment: "") + ": " + String("\(NSDate())\n") + logMessage
227+
let logMessage = NSLocalizedString("logMessageCreate", comment: "") + ": " + String("\(localDate)\n") + logMessage
227228
do {
228229
try logMessage.write(to: logFile, atomically: true, encoding: String.Encoding.utf8)
229230
} catch {
@@ -233,3 +234,11 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
233234
}
234235
}
235236

237+
extension Date {
238+
func currentTimeZoneDate() -> String {
239+
let dateFormatter = DateFormatter()
240+
dateFormatter.timeZone = TimeZone.current
241+
dateFormatter.dateFormat = "yyyy-MM-dd HH:mm:ss ZZZ"
242+
return dateFormatter.string(from: self)
243+
}
244+
}

0 commit comments

Comments
 (0)