DTLocalizableStringTable: Added 'writeAsStringEncoding:error:entryWri…

…teCallback:' method
Cocoanetics · Jul 27, 2012 · a6ae102 · a6ae102
1 parent ace9543
commit a6ae102
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 13 deletions.
diff --git a/Core/Source/DTLocalizableStringTable.h b/Core/Source/DTLocalizableStringTable.h
@@ -21,6 +21,7 @@ typedef void(^DTLocalizableStringEntryWriteCallback)(DTLocalizableStringEntry *)
 
 - (void)addEntry:(DTLocalizableStringEntry *)entry;
 
+- (NSString*)writeAsStringEncoding:(NSStringEncoding)encoding error:(NSError **)error entryWriteCallback:(DTLocalizableStringEntryWriteCallback)entryWriteCallback;
 - (BOOL)writeToFolderAtURL:(NSURL *)url encoding:(NSStringEncoding)encoding error:(NSError **)error entryWriteCallback:(DTLocalizableStringEntryWriteCallback)entryWriteCallback;
 
 @end
diff --git a/Core/Source/DTLocalizableStringTable.m b/Core/Source/DTLocalizableStringTable.m
@@ -75,25 +75,14 @@ - (void)addEntry:(DTLocalizableStringEntry *)entry
 	[_entryIndexByKey setObject:entry forKey:entry.rawKey];
 }
 
-- (BOOL)writeToFolderAtURL:(NSURL *)url encoding:(NSStringEncoding)encoding error:(NSError **)error  entryWriteCallback:(DTLocalizableStringEntryWriteCallback)entryWriteCallback;
+- (NSString*)writeAsStringEncoding:(NSStringEncoding)encoding error:(NSError **)error entryWriteCallback:(DTLocalizableStringEntryWriteCallback)entryWriteCallback
 {
-	NSString *fileName = [_name stringByAppendingPathExtension:@"strings"];
-	NSString *tablePath = [[url path] stringByAppendingPathComponent:fileName];
-	NSURL *tableURL = [NSURL fileURLWithPath:tablePath];
-
-	if (!tableURL)
-	{
-		// this must be junk
-		return NO;
-	}
-
-	NSArray *sortedEntries = [_entries sortedArrayUsingSelector:@selector(compare:)];
+    NSArray *sortedEntries = [_entries sortedArrayUsingSelector:@selector(compare:)];
 
 	NSMutableString *tmpString = [NSMutableString string];
 
 	for (DTLocalizableStringEntry *entry in sortedEntries)
 	{
-
 		NSString *key = [entry rawKey];
 		NSString *value = [entry rawValue];
 
@@ -138,6 +127,23 @@ - (BOOL)writeToFolderAtURL:(NSURL *)url encoding:(NSStringEncoding)encoding erro
 
         [tmpString appendString:@"\n"];
 	}
+
+    return [NSString stringWithString:tmpString];
+}
+
+- (BOOL)writeToFolderAtURL:(NSURL *)url encoding:(NSStringEncoding)encoding error:(NSError **)error  entryWriteCallback:(DTLocalizableStringEntryWriteCallback)entryWriteCallback;
+{
+	NSString *fileName = [_name stringByAppendingPathExtension:@"strings"];
+	NSString *tablePath = [[url path] stringByAppendingPathComponent:fileName];
+	NSURL *tableURL = [NSURL fileURLWithPath:tablePath];
+
+	if (!tableURL)
+	{
+		// this must be junk
+		return NO;
+	}
+
+    NSString *tmpString = [self writeAsStringEncoding:encoding error:error entryWriteCallback:entryWriteCallback];
 
 	return [tmpString writeToURL:tableURL
 					  atomically:YES