- OCCapabilities+PasswordPolicy: only generate rules for non-zero len…

…gth requirements

- OCPasswordPolicyRuleByteLength: replace inaccurate message with accurate one

ownCloudSDK/Password Policy/OCCapabilities+PasswordPolicy.m

@@ -40,32 +40,32 @@ - (OCPasswordPolicy *)passwordPolicy
 	}
 
 	// Minimum and maximum length
-	if ((self.passwordPolicyMinCharacters != nil) ||
+	if (((self.passwordPolicyMinCharacters != nil) && (self.passwordPolicyMinCharacters.intValue > 0)) ||
 	    (self.passwordPolicyMaxCharacters != nil))
 	{
 		[rules addObject:[OCPasswordPolicyRule characterCountMinimum:self.passwordPolicyMinCharacters maximum:self.passwordPolicyMaxCharacters]];
 	}
 
 	// Minimum lower-case characters
-	if (self.passwordPolicyMinLowerCaseCharacters != nil)
+	if ((self.passwordPolicyMinLowerCaseCharacters != nil) && (self.passwordPolicyMinLowerCaseCharacters.intValue > 0))
 	{
 		[rules addObject:[OCPasswordPolicyRule lowercaseCharactersMinimum:self.passwordPolicyMinLowerCaseCharacters maximum:nil]];
 	}
 
 	// Minimum upper-case characters
-	if (self.passwordPolicyMinUpperCaseCharacters != nil)
+	if ((self.passwordPolicyMinUpperCaseCharacters != nil) && (self.passwordPolicyMinUpperCaseCharacters.intValue > 0))
 	{
 		[rules addObject:[OCPasswordPolicyRule uppercaseCharactersMinimum:self.passwordPolicyMinUpperCaseCharacters maximum:nil]];
 	}
 
 	// Minimum digits
-	if (self.passwordPolicyMinDigits != nil)
+	if ((self.passwordPolicyMinDigits != nil) && (self.passwordPolicyMinDigits.intValue > 0))
 	{
 		[rules addObject:[OCPasswordPolicyRule digitsMinimum:self.passwordPolicyMinDigits maximum:nil]];
 	}
 
 	// Minimum special characters
-	if ((self.passwordPolicyMinSpecialCharacters != nil) && (self.passwordPolicySpecialCharacters != nil))
+	if ((self.passwordPolicyMinSpecialCharacters != nil) && (self.passwordPolicyMinSpecialCharacters.intValue > 0) && (self.passwordPolicySpecialCharacters != nil))
 	{
 		[rules addObject:[OCPasswordPolicyRule specialCharacters:self.passwordPolicySpecialCharacters minimum:self.passwordPolicyMinSpecialCharacters]];
 	}

ownCloudSDK/Password Policy/OCPasswordPolicyRuleByteLength.m

@@ -44,7 +44,7 @@ - (instancetype)initWithEncoding:(NSStringEncoding)encoding maximumByteLength:(N
 		_encoding = encoding;
 		_maximumByteLength = maximumByteLength;
 
-		self.localizedDescription = OCLocalizedFormat(@"Less than {{byteLength}} bytes.", @{ @"byteLength" : @(maximumByteLength).stringValue });
+		self.localizedDescription = OCLocalizedFormat(@"At most {{byteLength}} bytes.", @{ @"byteLength" : @(maximumByteLength).stringValue });
 	}
 
 	return (self);

ownCloudSDK/Resources/de.lproj/Localizable.strings

@@ -223,7 +223,7 @@
 "At least {{min}} special characters: {{specialCharacters}}" = "Mindestens {{min}} Sonderzeichen: {{specialCharacters}}";
 
 // OCPasswordPolicyRuleByteLength
-"Less than {{byteLength}} bytes." = "Weniger als {{byteLength}} Bytes.";
+"At most {{byteLength}} bytes." = "Maximal {{byteLength}} Bytes.";
 "Password can't be converted to {{encoding}}." = "Passwort kann nicht als {{encoding}} kodiert werden.";
 "Longer than {{byteLength}} bytes in {{encoding}} encoding." = "Länger als {{byteLength}} Bytes in {{encoding}} Encodierung.";
 

ownCloudSDK/Resources/en.lproj/Localizable.strings

@@ -223,7 +223,7 @@
 "At least {{min}} special characters: {{specialCharacters}}" = "At least {{min}} special characters: {{specialCharacters}}";
 
 // OCPasswordPolicyRuleByteLength
-"Less than {{byteLength}} bytes." = "Less than {{byteLength}} bytes.";
+"At most {{byteLength}} bytes." = "At most {{byteLength}} bytes.";
 "Password can't be converted to {{encoding}}." = "Password can't be converted to {{encoding}}.";
 "Longer than {{byteLength}} bytes in {{encoding}} encoding." = "Longer than {{byteLength}} bytes in {{encoding}} encoding.";