Don't add positional specifiers if the format specifier already has them

Author: ryu2

Core/Source/NSString+DTLocalizableStringScanner.m

@@ -15,7 +15,7 @@ - (NSString *)stringByNumberingFormatPlaceholders
     static dispatch_once_t onceToken;
     static NSRegularExpression *matchNonEscapedPercent = nil;
     dispatch_once(&onceToken, ^{
-        matchNonEscapedPercent = [NSRegularExpression regularExpressionWithPattern:@"(?<=[^%]|^)(?:(?:%%)*)(%)(?:[^%]|$)" options:0 error:NULL];
+        matchNonEscapedPercent = [NSRegularExpression regularExpressionWithPattern:@"(?<=[^%]|^)(?:(?:%%)*)(%(?!\\d+\\$))(?:[^%]|$)" options:0 error:NULL];
     });
 
     __block NSMutableString *tmpString = nil;

Test/Resources/Testcases.txt

@@ -9,6 +9,8 @@ NSLocalizedString(@"%@ had been successfully added to the Address Book.\nWould y
 
 NSLocalizedString(@"foo " @"bar", @"Test multi-part quoted strings");
 
+NSLocalizedString(@"Item %1$d of %2$d", @"Test positional params");
+
 // some regular test cases