From 53a7f92b9b362c9fc5c0957341fc1550b8c36966 Mon Sep 17 00:00:00 2001
From: michael starke <michael.starke@hicknhack-software.com>
Date: Fri, 22 Aug 2014 12:43:24 +0200
Subject: [PATCH] Better display of no expiration dates. Handling of cancel now
 does'nt overwrite existing expiry date

---
 MacPass/MPDatePickingViewController.h     |   1 +
 MacPass/MPDatePickingViewController.m     |   4 +++-
 MacPass/MPInspectorViewController.m       |   4 +++-
 MacPass/MPValueTransformerHelper.m        |   2 +-
 MacPass/de.lproj/Localizable.strings      | Bin 10206 -> 10284 bytes
 MacPass/en.lproj/Localizable.strings      | Bin 9574 -> 9656 bytes
 MacPass/fr.lproj/Localizable.strings      | Bin 10288 -> 10370 bytes
 MacPass/nl.lproj/Localizable.strings      | Bin 10210 -> 10290 bytes
 MacPass/zh-Hans.lproj/Localizable.strings | Bin 7880 -> 7962 bytes
 9 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/MacPass/MPDatePickingViewController.h b/MacPass/MPDatePickingViewController.h
index b9162806..426d52cf 100644
--- a/MacPass/MPDatePickingViewController.h
+++ b/MacPass/MPDatePickingViewController.h
@@ -13,6 +13,7 @@
 @property (strong,readonly) NSDate *date;
 @property (weak) IBOutlet NSDatePicker *datePicker;
 @property (weak) IBOutlet NSPopUpButton *presetPopupButton;
+@property (assign, readonly) BOOL didCancel;
 
 - (IBAction)useDate:(id)sender;
 - (IBAction)cancel:(id)sender;
diff --git a/MacPass/MPDatePickingViewController.m b/MacPass/MPDatePickingViewController.m
index dfe1fbd4..c6c110e8 100644
--- a/MacPass/MPDatePickingViewController.m
+++ b/MacPass/MPDatePickingViewController.m
@@ -24,6 +24,7 @@ typedef NS_ENUM(NSUInteger, MPDatePreset) {
 @interface MPDatePickingViewController ()
 
 @property (strong) NSDate *date;
+@property (assign) BOOL didCancel;
 
 @end
 
@@ -57,13 +58,14 @@ typedef NS_ENUM(NSUInteger, MPDatePreset) {
 }
 
 - (IBAction)useDate:(id)sender {
+  self.didCancel = NO;
   self.date = [self.datePicker dateValue];
   id target = [NSApp targetForAction:@selector(performClose:)];
   [target performClose:sender];
 }
 
 - (IBAction)cancel:(id)sender {
-  self.date = nil;
+  self.didCancel = YES;
   id target = [NSApp targetForAction:@selector(performClose:)];
   [target performClose:sender];
 }
diff --git a/MacPass/MPInspectorViewController.m b/MacPass/MPInspectorViewController.m
index 557bdf32..1c90327c 100644
--- a/MacPass/MPInspectorViewController.m
+++ b/MacPass/MPInspectorViewController.m
@@ -235,7 +235,9 @@ typedef NS_ENUM(NSUInteger, MPContentTab) {
   }
   if([popover.contentViewController isKindOfClass:[MPDatePickingViewController class]]) {
     MPDatePickingViewController *viewController = (MPDatePickingViewController *)popover.contentViewController;
-    [self _setExpiryDate:viewController.date];
+    if(!viewController.didCancel) {
+      [self _setExpiryDate:viewController.date];
+    }
   }
   self.popover = nil;
 }
diff --git a/MacPass/MPValueTransformerHelper.m b/MacPass/MPValueTransformerHelper.m
index 61697f8a..7d56269f 100644
--- a/MacPass/MPValueTransformerHelper.m
+++ b/MacPass/MPValueTransformerHelper.m
@@ -30,7 +30,7 @@ NSString *const MPExpiryDateValueTransformer = @"com.hicknhack.macpass.kMPExpiry
                                  transformedValueClass:[NSString class]
                     returningTransformedValueWithBlock:^id(id value) {
                       if(![value isKindOfClass:[NSDate class]]) {
-                        return @""; // Wrong input
+                        return NSLocalizedString(@"NO_EXPIRE_DATE_SET","");
                       }
                       static NSDateFormatter *formatter;
                       if(!formatter) {
diff --git a/MacPass/de.lproj/Localizable.strings b/MacPass/de.lproj/Localizable.strings
index 36b49ed2c9fe9cd8a7dc961e454f070827c920a3..030aba8ad418c223d6575173f7a89fc1ad82ba05 100644
GIT binary patch
delta 62
zcmccTzb0VA4hdBy20sRWhIj^7h6siL22X|{AS<51g~5>_1k4Hsk|C4(C8XIE81fi0
M8B#ZIl+fh|0MvO6@&Et;

delta 12
TcmZ1zaL<3k4vEcdl4|?_CR7Bm

diff --git a/MacPass/en.lproj/Localizable.strings b/MacPass/en.lproj/Localizable.strings
index b8611109fc6b462c30c81539ef752ce74a310b94..6dc93a9be3cc28cd020c5f652e342910eedbc9f7 100644
GIT binary patch
delta 88
zcmaFnwZnUZpSZUYgCB!GLp*~kLj*$rgC|1}kQLA1!r;gd0%ipR$q)u51_cINAO@*U
eWhevUA|Nl7p@N}+Arr_>WhiFQ+w3kb&j$b(K@gMx

delta 12
Tcmdnt{mg5FpZMkl;u3rSCMg8j

diff --git a/MacPass/fr.lproj/Localizable.strings b/MacPass/fr.lproj/Localizable.strings
index 6fd7a10c763ce6e3a0967f67c5c891752fee29d2..b37b4eb2deecac1acabd801b2f8339778dfb3df6 100644
GIT binary patch
delta 88
zcmdlG&=j~KK+;=@!H>b8A)djNA%Y=*!IL2f$ckrhVQ^#!0keXEWC(*2g93vs5Q9{w
eGL!*v5s;V4P{B~ZkO^d`G88lDZT6IW&IbVbZV?0k

delta 12
TcmZn)+z_xKKyvdU$p?G@Beexd

diff --git a/MacPass/nl.lproj/Localizable.strings b/MacPass/nl.lproj/Localizable.strings
index 7704e616722e43ee7ed1cf09eec2ac176072f131..77acbfd9cf6a0ef13bd506b9ff35d3f2eb10d42e 100644
GIT binary patch
delta 86
zcmaFlzbRmYfTX7qgCB!GLp*~kLj*$rgC|1}kQLA1!r;gd0%ipR$q)u51_cINAXZ{1
eV@PEvV#s002f_k|5};TfLnctHWHYDaO+EnYln~JX

delta 12
TcmdlK@W_9IfaK-`$xD0yB=H3q

diff --git a/MacPass/zh-Hans.lproj/Localizable.strings b/MacPass/zh-Hans.lproj/Localizable.strings
index 29b27f4ef1bc467541183a1ef8e6f962c7f0a3d2..d84530aa3f1d364b1db5836fad1d314dade7028f 100644
GIT binary patch
delta 88
zcmX?MJIiiEm9V!GgCB!GLp*~kLj*$rgC|1}kQLA1!r;gd0%ipR$q)u51_cINAO@*U
eWhevUA|Nl7p@N}+Arr_>WhiFQ+gvOh$_)SrDiFZ{

delta 12
TcmbPbcfxi<mGI^>!hYNUB)SC#