@@ -22,6 +22,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
22
22
let iconWork = NSImage ( named: NSImage . Name ( " IconWork " ) )
23
23
let iconRest = NSImage ( named: NSImage . Name ( " IconRest " ) )
24
24
let paths = FileManager . default. urls ( for: . documentDirectory, in: . userDomainMask)
25
+ var localDate = Date ( ) . currentTimeZoneDate ( )
25
26
26
27
@IBOutlet weak var statusMenu : NSMenu !
27
28
@IBOutlet weak var startStopMenuItem : NSMenuItem !
@@ -37,12 +38,12 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
37
38
stopAllTimer ( )
38
39
saveStats ( logMessage: workTimerMenuItem. title + " \n " )
39
40
saveStats ( logMessage: restTimerMenuItem. title + " \n " )
40
- let logMessage = NSLocalizedString ( " logMessageStop " , comment: " " ) + " : " + String( " \( NSDate ( ) ) \n " )
41
+ let logMessage = NSLocalizedString ( " logMessageStop " , comment: " " ) + " : " + String( " \( localDate ) \n " )
41
42
saveStats ( logMessage: logMessage)
42
43
statusItem. button? . image = icon
43
44
}
44
45
else {
45
- let logMessage = " \n " + NSLocalizedString( " logMessageStart " , comment: " " ) + " : " + String( " \( NSDate ( ) ) \n " )
46
+ let logMessage = " \n " + NSLocalizedString( " logMessageStart " , comment: " " ) + " : " + String( " \( localDate ) \n " )
46
47
saveStats ( logMessage: logMessage)
47
48
workTimerMenuItem. title = NSLocalizedString ( " textWork " , comment: " " ) + String( " : 00:00:00 " )
48
49
restTimerMenuItem. title = NSLocalizedString ( " textRest " , comment: " " ) + String( " : 00:00:00 " )
@@ -75,7 +76,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
75
76
stopAllTimer ( )
76
77
saveStats ( logMessage: workTimerMenuItem. title + " \n " )
77
78
saveStats ( logMessage: restTimerMenuItem. title + " \n " )
78
- let logMessage = NSLocalizedString ( " logMessageStop " , comment: " " ) + " " + String( " \( NSDate ( ) ) \n " )
79
+ let logMessage = NSLocalizedString ( " logMessageStop " , comment: " " ) + " " + String( " \( localDate ) \n " )
79
80
saveStats ( logMessage: logMessage)
80
81
}
81
82
NSApp . terminate ( self )
@@ -223,7 +224,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
223
224
statisticsMenuItem. title = NSLocalizedString ( " errorMessageWrite " , comment: " " ) + " " + logFile. path
224
225
}
225
226
} else {
226
- let logMessage = NSLocalizedString ( " logMessageCreate " , comment: " " ) + " : " + String( " \( NSDate ( ) ) \n " ) + logMessage
227
+ let logMessage = NSLocalizedString ( " logMessageCreate " , comment: " " ) + " : " + String( " \( localDate ) \n " ) + logMessage
227
228
do {
228
229
try logMessage. write ( to: logFile, atomically: true , encoding: String . Encoding. utf8)
229
230
} catch {
@@ -233,3 +234,11 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
233
234
}
234
235
}
235
236
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