porting of iOS/Andorid name while merging LAng files

cescofry · Jun 28, 2013 · b3f8e16 · b3f8e16
1 parent 08fcfa5
commit b3f8e16
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/Strings/ZFLangFile.m b/Strings/ZFLangFile.m
@@ -134,6 +134,7 @@ - (BOOL)mergeWithFile:(ZFLangFile *)file {
         [self.iOStranslations setObject:obj forKey:key];
         mergeIOS = YES;
     }];
+    if (!self.iOSName && file.iOSName) self.iOSName = file.iOSName;
 
     __block BOOL mergeAndroid = NO;
     [file.androidTranslations enumerateKeysAndObjectsUsingBlock:^(NSString *key, NSDictionary *obj, BOOL *stop) {
@@ -143,6 +144,10 @@ - (BOOL)mergeWithFile:(ZFLangFile *)file {
         mergeAndroid = YES;
     }];
 
+
+    if (!self.androidName && file.androidName) self.androidName = file.androidName;
+
+
     BOOL didMerge = (mergeIOS || mergeAndroid);
     if (didMerge) {
         self.allKeys = nil;