Merge branch 'release/1.3.2'

ygini · ygini · commit 45c0b2318ec9 · 2017-10-30T03:31:07.000+01:00
diff --git a/src/HITDevKit/HITDevKit/HITBasicPlugin.h b/src/HITDevKit/HITDevKit/HITBasicPlugin.h
@@ -16,8 +16,10 @@
 
 - (instancetype)initWithSettings:(NSDictionary*)settings;
 
+- (NSString*)localizedString:(id)dictionaryOrArray;
+
 @end
 
 @interface HITBasicPlugin (MustBeDefinedInSubclass)
 - (NSMenuItem*)prepareNewMenuItem;
-@end
+@end
diff --git a/src/HITDevKit/HITDevKit/HITBasicPlugin.m b/src/HITDevKit/HITDevKit/HITBasicPlugin.m
@@ -45,4 +45,23 @@ - (void)stopAndPrepareForRelease {
     self.allowedToRun = NO;
 }
 
+- (NSString*)localizedString:(id)dictionaryOrArray {
+    if ([dictionaryOrArray isKindOfClass:[NSDictionary class]]) {
+        NSString *selectedValue = nil;
+        
+        for (NSString *localIdentifier in @[
+                                            [[NSLocale currentLocale] localeIdentifier],
+                                            [[NSLocale currentLocale] languageCode],
+                                            @"en"]) {
+            selectedValue = [dictionaryOrArray objectForKey:localIdentifier];
+            if (selectedValue) {
+                break;
+            }
+        }
+        
+        return selectedValue;
+    } else {
+        return dictionaryOrArray;
+    }
+}
 @end
diff --git a/src/HITDevKit/HITDevKit/HITSimplePlugin.m b/src/HITDevKit/HITDevKit/HITSimplePlugin.m
@@ -13,7 +13,7 @@
 @implementation HITSimplePlugin
 
 -(NSMenuItem *)prepareNewMenuItem {
-    NSString *title = [self.settings objectForKey:kHITSimplePluginTitleKey];
+    NSString *title = [self localizedString:[self.settings objectForKey:kHITSimplePluginTitleKey]];
     if (!title) {
         title = @"";
     }
diff --git a/src/HITDevKit/HITDevKit/Info.plist b/src/HITDevKit/HITDevKit/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>225</string>
+	<string>235</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2015 Yoann Gini (Open Source Project). All rights reserved.</string>
 	<key>NSPrincipalClass</key>
diff --git a/src/Hello IT.xcodeproj/project.pbxproj b/src/Hello IT.xcodeproj/project.pbxproj
@@ -281,6 +281,7 @@
 		F8340B8B1C96CF9000C820D7 /* statusbar@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "statusbar@2x.png"; sourceTree = "<group>"; };
 		F89B59391DA7DC350028D75F /* Reachability.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Reachability.h; sourceTree = "<group>"; };
 		F89B593A1DA7DC350028D75F /* Reachability.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Reachability.m; sourceTree = "<group>"; };
+		F8B315891FA6BB1400839784 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/MainMenu.strings; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -841,6 +842,7 @@
 			isa = PBXVariantGroup;
 			children = (
 				E1D068071B51D08E00567172 /* Base */,
+				F8B315891FA6BB1400839784 /* fr */,
 			);
 			name = MainMenu.xib;
 			sourceTree = "<group>";
@@ -852,6 +854,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -904,6 +907,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
diff --git a/src/Hello IT/Info.plist b/src/Hello IT/Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.1</string>
+	<string>1.3.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>225</string>
+	<string>235</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>
@@ -39,5 +39,7 @@
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
+	<key>NSUserNotificationAlertStyle</key>
+	<string>alert</string>
 </dict>
 </plist>
diff --git a/src/Hello IT/fr.lproj/MainMenu.strings b/src/Hello IT/fr.lproj/MainMenu.strings
@@ -0,0 +1 @@
+
diff --git a/src/Plugins/ADPass/ADPass/HITPADPass.m b/src/Plugins/ADPass/ADPass/HITPADPass.m
@@ -21,6 +21,8 @@
 #define kHITPADPassNotifTitle @"notificationTitle"
 #define kHITPADPassNotifMessageFormat @"notificationMessageFormat"
 #define kHITPADPassNotifOfflineMessageFormat @"notificationOfflineMessageFormat"
+#define kHITPADPassNotifChangePasswordTitle @"notificationChangePasswordTitle"
+#define kHITPADPassNotifLaterTitle @"notificationLaterTitle"
 
 #define kHITPADPassAlertXDaysBefore @"alertXDaysBefore"
 
@@ -38,6 +40,8 @@ @interface HITPADPass () <NSUserNotificationCenterDelegate>
 @property NSString *notificationTitle;
 @property NSString *notificationMessageFormat;
 @property NSString *notificationOfflineMessageFormat;
+@property NSString *notificationChangePasswordTitle;
+@property NSString *notificationLaterTitle;
 
 @property NSInteger alertXDaysBefore;
 
@@ -82,10 +86,14 @@ - (instancetype)initWithSettings:(NSDictionary*)settings
         NSString *defaultNotificationTitle = @"🔐 📆 ⚠️";
         NSString *defaultNotificationMessageFormat = @"Your password will expire on %@. Change it before!";
         NSString *defaultNotificationOfflineMessageFormat = @"Your password will expire on %@. Come back on your corporate network and change it before!";
+        NSString *defaultNotificationChangePasswordTitle = @"🔑";
+        NSString *defaultNotificationLaterTitle = @"⏰";
         
         _notificationTitle = [settings objectForKey:kHITPADPassNotifTitle];
         _notificationMessageFormat = [settings objectForKey:kHITPADPassNotifMessageFormat];
         _notificationOfflineMessageFormat = [settings objectForKey:kHITPADPassNotifOfflineMessageFormat];
+        _notificationChangePasswordTitle = [settings objectForKey:kHITPADPassNotifChangePasswordTitle];
+        _notificationLaterTitle = [settings objectForKey:kHITPADPassNotifLaterTitle];
         
         if ([_notificationTitle length] == 0) {
             _notificationTitle = [[NSBundle bundleForClass:[self class]] localizedStringForKey:kHITPADPassNotifTitle value:defaultNotificationTitle table:nil];
@@ -98,8 +106,15 @@ - (instancetype)initWithSettings:(NSDictionary*)settings
         if ([_notificationOfflineMessageFormat length] == 0) {
             _notificationOfflineMessageFormat = [[NSBundle bundleForClass:[self class]] localizedStringForKey:kHITPADPassNotifOfflineMessageFormat value:defaultNotificationOfflineMessageFormat table:nil];
         }
-
-
+        
+        if ([_notificationChangePasswordTitle length] == 0) {
+            _notificationChangePasswordTitle = [[NSBundle bundleForClass:[self class]] localizedStringForKey:kHITPADPassNotifChangePasswordTitle value:defaultNotificationChangePasswordTitle table:nil];
+        }
+        
+        if ([_notificationLaterTitle length] == 0) {
+            _notificationLaterTitle = [[NSBundle bundleForClass:[self class]] localizedStringForKey:kHITPADPassNotifLaterTitle value:defaultNotificationLaterTitle table:nil];
+        }
+        
     }
     return self;
 }
@@ -149,7 +164,6 @@ - (void)updateTitle {
         
         if (components.hour >= 10 && notifNeeded) {
             [self sendUserNotification];
-            [[NSUserDefaults standardUserDefaults] setObject:[NSDate date] forKey:kHITPADPassLastNotifKey];
         }
     }
 }
@@ -213,11 +227,13 @@ - (void)sendUserNotification {
     asl_log(NULL, NULL, ASL_LEVEL_NOTICE, "Notification to change AD password is requested.");
     NSUserNotification *notification = [NSUserNotification new];
     
-    notification.identifier = [[NSBundle bundleForClass:[self class]] bundleIdentifier];
-    
     notification.title = self.notificationTitle;
     NSString *infoTextFormat = self.lastADRequestSucceded ? self.notificationMessageFormat : self.notificationOfflineMessageFormat;
     
+    notification.hasActionButton = YES;
+    notification.actionButtonTitle = self.notificationChangePasswordTitle;
+    notification.otherButtonTitle = self.notificationLaterTitle;
+    
     NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
     [dateFormatter setDateStyle:NSDateFormatterMediumStyle];
     [dateFormatter setTimeStyle:NSDateFormatterShortStyle];
@@ -226,13 +242,16 @@ - (void)sendUserNotification {
     notification.informativeText = [NSString stringWithFormat:infoTextFormat, stringDate];
     
     [[NSUserNotificationCenter defaultUserNotificationCenter] deliverNotification:notification];
+    [[NSUserDefaults standardUserDefaults] setObject:[NSDate date] forKey:kHITPADPassLastNotifKey];
 }
 
 - (void)userNotificationCenter:(NSUserNotificationCenter *)center didActivateNotification:(NSUserNotification *)notification {
-    if ([notification.identifier isEqualToString:[[NSBundle bundleForClass:[self class]] bundleIdentifier]] && notification.activationType != NSUserNotificationActivationTypeNone) {
-        [self mainAction:notification];
-        [center removeDeliveredNotification:notification];
-    }
+    [self mainAction:notification];
+    [center removeDeliveredNotification:notification];
+}
+
+-(BOOL)userNotificationCenter:(NSUserNotificationCenter *)center shouldPresentNotification:(nonnull NSUserNotification *)notification {
+    return YES;
 }
 
 @end
diff --git a/src/Plugins/ADPass/ADPass/en.lproj/Localizable.strings b/src/Plugins/ADPass/ADPass/en.lproj/Localizable.strings
@@ -17,3 +17,5 @@
 "notificationTitle" = "Password is about to expire!";
 "notificationMessageFormat" = "Your password will expire on %@. Change it before!";
 "notificationOfflineMessageFormat" = "Your password will expire on %@. Come back on your corporate network and change it before!";
+"notificationChangePasswordTitle" = "Let's do it";
+"notificationLaterTitle" = "Later";
diff --git a/src/Plugins/ADPass/ADPass/fr.lproj/Localizable.strings b/src/Plugins/ADPass/ADPass/fr.lproj/Localizable.strings
@@ -10,10 +10,12 @@
 // `%ld` is the format used to display the number of days before password expire.
 // To show `Your password will expire in 42d` use format `Your password will expire in %ldd`
 
-"willExpireFormat" = "MDP expire dans %ldj";
+"willExpireFormat" = "Votre mot de passe expire dans %ldj";
 "tooltip" = "Nombre de jours avant que votre mot de passe ne change, pensez à le changer avant !";
 "disabledTooltip" = "Votre système d'information est injoignable. L'information actuelle est basée sur la dernière valeur enregistrée et vous ne pouvez pas changer votre mot de passe.";
 
 "notificationTitle" = "Votre mot de passe va expirer !";
 "notificationMessageFormat" = "Votre mot de passe expire le %@. Changez-le avant !";
 "notificationOfflineMessageFormat" = "Votre mot de passe expire le %@. Retournez sur votre réseau d'entreprise et changez-le avant la date butoire !";
+"notificationChangePasswordTitle" = "Maintenant";
+"notificationLaterTitle" = "Plus tard";
diff --git a/src/Plugins/OpenApplication/OpenApplication/Info.plist b/src/Plugins/OpenApplication/OpenApplication/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>225</string>
+	<string>235</string>
 	<key>HITPFunctionIdentifier</key>
 	<string>public.open.application</string>
 	<key>NSHumanReadableCopyright</key>
diff --git a/src/Plugins/OpenResource/OpenResource/Info.plist b/src/Plugins/OpenResource/OpenResource/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>225</string>
+	<string>235</string>
 	<key>HITPFunctionIdentifier</key>
 	<string>public.open.resource</string>
 	<key>NSHumanReadableCopyright</key>
diff --git a/src/Plugins/Quit/Quit/Info.plist b/src/Plugins/Quit/Quit/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>225</string>
+	<string>235</string>
 	<key>HITPFunctionIdentifier</key>
 	<string>public.quit</string>
 	<key>NSHumanReadableCopyright</key>
diff --git a/src/Plugins/ScriptedItem/CustomScripts/com.github.ygini.hello-it.ip.sh b/src/Plugins/ScriptedItem/CustomScripts/com.github.ygini.hello-it.ip.sh
@@ -17,16 +17,18 @@
 mode=0
 mainBSDInterface=$(route -n get 8.8.8.8 | grep "interface: " | awk -F ": " '{print $2}')
 
-while getopts "m:i:" o; do
-	case "${o}" in
-		m)
-			mode=${OPTARG}
-			;;
-		i)
-			mainBSDInterface=${OPTARG}
-			;;
-	esac
-done
+function handleOptions {
+	while getopts "m:i:" o; do
+		case "${o}" in
+			m)
+				mode=${OPTARG}
+				;;
+			i)
+				mainBSDInterface=${OPTARG}
+				;;
+		esac
+	done
+}
 	
 function handleStateUpdate {
 	mode=$1
diff --git a/src/Plugins/ScriptedItem/CustomScripts/com.github.ygini.hello-it.public-ip.sh b/src/Plugins/ScriptedItem/CustomScripts/com.github.ygini.hello-it.public-ip.sh
@@ -17,16 +17,18 @@
 mode=0
 public_ip_url="https://ip.abelionni.com/script/"
 
-while getopts "m:u:" o; do
-	case "${o}" in
-		m)
-			mode=${OPTARG}
-			;;
-		u)
-			public_ip_url=${OPTARG}
-			;;
-	esac
-done
+function handleOptions {
+    while getopts "m:u:" o; do
+        case "${o}" in
+            m)
+                mode=${OPTARG}
+                ;;
+            u)
+                public_ip_url=${OPTARG}
+                ;;
+        esac
+    done
+}
 	
 function handleStateUpdate {
 	mode=$1
diff --git a/src/Plugins/ScriptedItem/CustomScripts/com.github.ygini.hello-it.scriptlib.sh b/src/Plugins/ScriptedItem/CustomScripts/com.github.ygini.hello-it.scriptlib.sh
@@ -92,6 +92,11 @@ function debugLog {
     echo "hitp-log-debug: $1"
 }
 
+# override this function if you need to parse your options array before everything else
+function handleOptions {
+:
+}
+
 # override this function to specify what to do when the user clic on your menu item
 function onClickAction {
 :
@@ -135,6 +140,7 @@ function main {
 	if [ "$HELLO_IT_ARGS_AVAILABLE" == "yes" ] 
 	then
 		options=("$HELLO_IT_ARGS")
+        handleOptions $options
 	fi
 	
 	case "$run_option" in
diff --git a/src/Plugins/ScriptedItem/ScriptedItem/HITPScriptedItem.m b/src/Plugins/ScriptedItem/ScriptedItem/HITPScriptedItem.m
@@ -91,7 +91,7 @@ - (instancetype)initWithSettings:(NSDictionary*)settings
 }
 
 -(NSMenuItem *)prepareNewMenuItem {
-    NSString *title = [self.settings objectForKey:kHITSimplePluginTitleKey];
+    NSString *title = [self localizedString:[self.settings objectForKey:kHITSimplePluginTitleKey]];
     if (!title) {
         title = @"…";
     }
diff --git a/src/Plugins/ScriptedItem/ScriptedItem/Info.plist b/src/Plugins/ScriptedItem/ScriptedItem/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>225</string>
+	<string>235</string>
 	<key>HITPFunctionIdentifier</key>
 	<string>public.script.item</string>
 	<key>NSHumanReadableCopyright</key>
diff --git a/src/Plugins/Separator/Separator/Info.plist b/src/Plugins/Separator/Separator/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>225</string>
+	<string>235</string>
 	<key>HITPFunctionIdentifier</key>
 	<string>public.separator</string>
 	<key>NSHumanReadableCopyright</key>
diff --git a/src/Plugins/SubMenu/SubMenu/Info.plist b/src/Plugins/SubMenu/SubMenu/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>225</string>
+	<string>235</string>
 	<key>HITPFunctionIdentifier</key>
 	<string>public.submenu</string>
 	<key>NSHumanReadableCopyright</key>
diff --git a/src/Plugins/TestHTTP/TestHTTP/Info.plist b/src/Plugins/TestHTTP/TestHTTP/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>225</string>
+	<string>235</string>
 	<key>HITPFunctionIdentifier</key>
 	<string>public.test.http</string>
 	<key>NSHumanReadableCopyright</key>
diff --git a/src/Plugins/Title/Title/Info.plist b/src/Plugins/Title/Title/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>225</string>
+	<string>235</string>
 	<key>HITPFunctionIdentifier</key>
 	<string>public.title</string>
 	<key>NSHumanReadableCopyright</key>

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`@implementation HITSimplePlugin`
`14`	`14`
`15`	`15`	`-(NSMenuItem *)prepareNewMenuItem {`
`16`		`- NSString *title = [self.settings objectForKey:kHITSimplePluginTitleKey];`
	`16`	`+ NSString *title = [self localizedString:[self.settings objectForKey:kHITSimplePluginTitleKey]];`
`17`	`17`	`if (!title) {`
`18`	`18`	`title = @"";`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ - (instancetype)initWithSettings:(NSDictionary*)settings`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`-(NSMenuItem *)prepareNewMenuItem {`
`94`		`- NSString *title = [self.settings objectForKey:kHITSimplePluginTitleKey];`
	`94`	`+ NSString *title = [self localizedString:[self.settings objectForKey:kHITSimplePluginTitleKey]];`
`95`	`95`	`if (!title) {`
`96`	`96`	`title = @"…";`
`97`	`97`	`}`