Merge aa97897 into e6f7dd8

Cocoanetics · Dec 18, 2014 · 6c8e963 · 6c8e963
2 parents e6f7dd8 + aa97897
commit 6c8e963
Showing 1 changed file with 56 additions and 51 deletions.
diff --git a/Core/Source/DTLocalizableStringTable.m b/Core/Source/DTLocalizableStringTable.m
@@ -75,58 +75,63 @@ - (void)addEntry:(DTLocalizableStringEntry *)entry
 
 - (NSString*)stringRepresentationWithEncoding:(NSStringEncoding)encoding error:(NSError **)error entryWriteCallback:(DTLocalizableStringEntryWriteCallback)entryWriteCallback
 {
-    NSArray *sortedEntries = [_entries sortedArrayUsingSelector:@selector(compare:)];
-
-	NSMutableString *tmpString = [NSMutableString string];
-
-	for (DTLocalizableStringEntry *entry in sortedEntries)
-	{
-		NSString *key = [entry rawKey];
-		NSString *value = [entry rawValue];
-
-        if (entryWriteCallback)
-        {
-            entryWriteCallback(entry);
-        }
-
-        // multi-line comments are indented
-        NSString *comment = [[entry sortedComments] componentsJoinedByString:@"\n   "];
-        if (!comment)
-        {
-            comment = @"No comment provided by engineer.";
-        }
-
-        if (_shouldDecodeUnicodeSequences) 
-		{
-			// strip the quotes
-			if ([value hasPrefix:@"\""] && [value hasPrefix:@"\""])
-			{
-				value = [value substringWithRange:NSMakeRange(1, [value length]-2)];
-			}
-
-			// value is what we scanned from file, so we first need to decode
-			value = [value stringByReplacingSlashEscapes];
-
-			// decode the unicode sequences
-            value = [value stringByDecodingUnicodeSequences];
-
-			// re-add the slash escapes
-			value = [value stringByAddingSlashEscapes];
-
-			// re-add quotes
-			value = [NSString stringWithFormat:@"\"%@\"", value];
-        }
-
-        // output comment
-        [tmpString appendFormat:@"/* %@ */\n", comment];
-
-        // output line
-        [tmpString appendFormat:@"%@ = %@;\n", key, value];
-
-        [tmpString appendString:@"\n"];
-	}
+  NSArray *sortedEntries = [_entries sortedArrayUsingSelector:@selector(compare:)];
+
+  NSMutableString *tmpString = [NSMutableString string];
+
+  for (DTLocalizableStringEntry *entry in sortedEntries)
+  {
+    NSString *key = [entry rawKey];
+    NSString *value = [entry rawValue];
+
+    if(key.length == 2) {
+      printf("Warning: Ignoring empty key entry\n");
+      continue;
+    }
+
+    if (entryWriteCallback)
+    {
+      entryWriteCallback(entry);
+    }
+
+    // multi-line comments are indented
+    NSString *comment = [[entry sortedComments] componentsJoinedByString:@"\n   "];
+    if (!comment)
+    {
+      comment = @"No comment provided by engineer.";
+    }
+
+    if (_shouldDecodeUnicodeSequences)
+    {
+      // strip the quotes
+      if ([value hasPrefix:@"\""] && [value hasPrefix:@"\""])
+      {
+        value = [value substringWithRange:NSMakeRange(1, [value length]-2)];
+      }
+
+      // value is what we scanned from file, so we first need to decode
+      value = [value stringByReplacingSlashEscapes];
+
+      // decode the unicode sequences
+      value = [value stringByDecodingUnicodeSequences];
+
+      // re-add the slash escapes
+      value = [value stringByAddingSlashEscapes];
+
+      // re-add quotes
+      value = [NSString stringWithFormat:@"\"%@\"", value];
+    }
+
+    // output comment
+    [tmpString appendFormat:@"/* %@ */\n", comment];
+
+    // output line
+    [tmpString appendFormat:@"%@ = %@;\n", key, value];
 
-    return [NSString stringWithString:tmpString];
+    [tmpString appendString:@"\n"];
+  }
+
+  return [NSString stringWithString:tmpString];
 }
 
 - (BOOL)writeToFolderAtURL:(NSURL *)url encoding:(NSStringEncoding)encoding error:(NSError **)error  entryWriteCallback:(DTLocalizableStringEntryWriteCallback)entryWriteCallback;