Merge branch 'ryu2-master' into develop

Author: odrobnik

Core/Source/DTLocalizableStringEntry.m

@@ -101,7 +101,7 @@ - (void)addComment:(NSString *)comment
     comment = [self _stringByRecognizingNil:comment];
 
 	// remove the quotes
-	comment = [comment stringByTrimmingCharactersInSet:[NSCharacterSet characterSetWithCharactersInString:@"\""]];
+	comment = [comment stringByRemovingSurroundingQuotes];
 
 	if (![comment length])
 	{

Core/Source/NSString+DTLocalizableStringScanner.h

@@ -46,4 +46,11 @@
  @returns The receiver's content with control characters slash-escaped
  */
 - (NSString *)stringByAddingSlashEscapes;
+
+/**
+ Change "foo" to foo.  This will remove just one set of quotes, so that e.g. ""foo"" becomes "foo"
+ If the string does not begin and end with a quote, returns it unmodified.
+ @returns The string with one set of surrounding quotes removed.
+ */
+- (NSString *)stringByRemovingSurroundingQuotes;
 @end

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;
@@ -618,4 +618,16 @@ - (NSString *)stringByAddingSlashEscapes
     return clean;
 }
 
+- (NSString *)stringByRemovingSurroundingQuotes
+{
+  NSUInteger length = [self length];
+  NSString *clean = self;
+
+  if (length >= 2 && [self characterAtIndex:0] == '\"' && [self characterAtIndex:length-1] == '\"') {
+    clean = [self substringWithRange:NSMakeRange(1, length-2)];
+  }
+
+  return clean;
+}
+
 @end

Test/Resources/Slashes_and_Quotes.txt

@@ -1,3 +1,5 @@
 /* Tests if the escaping of double quotes and slashes works */
 
-NSLocalizedString(@"here are three \\\\\\\"\"\"\nslashes&quotes: \\\\\\\"\"\"", nil)
+NSLocalizedString(@"here are three \\\\\\\"\"\"\nslashes&quotes: \\\\\\\"\"\"", nil)
+
+NSLocalizedString(@"bar", @"Test comment ending with \"quotes\"");

Test/Resources/Testcases.txt

@@ -7,6 +7,10 @@ NSString *message = [NSString stringWithFormat:NSLocalizedString(@"\"%@\" has be
 
 NSLocalizedString(@"%@ had been successfully added to the Address Book.\nWould you like to edit the card now?", nil);
 
+NSLocalizedString(@"foo " @"bar", @"Test multi-part quoted strings");
+
+NSLocalizedString(@"Item %1$d of %2$d", @"Test positional params");
+
 // some regular test cases
 
 

Test/Source/UnitTest.m

@@ -179,8 +179,10 @@ - (void)internalTestCaseWithURL:(NSURL *)URL withTempPath:(NSString *)tempPath
             NSString *genstrings1Contents = [NSString stringWithContentsOfFile:genstrings1File usedEncoding:NULL error:NULL];
             NSString *genstrings2Contents = [NSString stringWithContentsOfFile:genstrings2File usedEncoding:NULL error:NULL];
 
-			// size check does not work because predicate editor output repeats comment for each token	
-			// STAssertEquals([genstrings1Contents length], [genstrings2Contents length], @"Different file sizes on %@", genstrings1File);
+			// size check does not work because predicate editor output repeats comment for each token
+      if (![[URL absoluteString] hasSuffix:@"NSPredicateEditor.txt"]) {
+        STAssertEquals([genstrings1Contents length], [genstrings2Contents length], @"Different file sizes on %@", genstrings1File);
+      }
 
             NSDictionary *genstrings1Stuff = [genstrings1Contents propertyListFromStringsFileFormat];
             NSDictionary *genstrings2Stuff = [genstrings2Contents propertyListFromStringsFileFormat];