Formatting

Core/XMPPMessage.h

@@ -37,12 +37,12 @@
 - (NSString *)type;
 - (NSString *)subject;
 - (NSString *)body;
-- (NSString *)bodyWithLang:(NSString *)lang;
+- (NSString *)bodyForLanguage:(NSString *)language;
 - (NSString *)thread;
 
 - (void)addSubject:(NSString *)subject;
 - (void)addBody:(NSString *)body;
-- (void)addBody:(NSString*)body withLang:(NSString*)lang;
+- (void)addBody:(NSString *)body withLanguage:(NSString *)language;
 - (void)addThread:(NSString *)thread;
 
 - (BOOL)isChatMessage;

Core/XMPPMessage.m

@@ -163,29 +163,25 @@ - (NSString *)body
 	return [[self elementForName:@"body"] stringValue];
 }
 
-- (NSString*)bodyWithLang:(NSString*)lang
+- (NSString *)bodyForLanguage:(NSString *)language
 {
-    if (lang == nil)
+    if ([language length] == 0)
+    {
         return [self body];
-    NSArray *bodies = [self elementsForName:@"body"];
-    if (bodies == nil)
-        return nil;
-    for (int i = 0; i < bodies.count; i++)
+    }
+
+    NSString *bodyForLanguage = nil;
+
+    for (NSXMLElement *bodyElement in [self elementsForName:@"body"])
     {
-        DDXMLElement *elem = [bodies objectAtIndex:i];
-        DDXMLNode *langAttr = [elem attributeForName:@"lang"];
-        if (lang == nil)
-        {
-            if (langAttr == nil)
-                return [elem stringValue];
-        }
-        else
+        if ([language isEqualToString:[[bodyElement attributeForName:@"xml:lang"] stringValue]])
         {
-            if ([lang isEqualToString:[langAttr stringValue]])
-                return [elem stringValue];
+            bodyForLanguage = [bodyElement stringValue];
+            break;
         }
     }
-    return nil;
+
+    return bodyForLanguage;
 }
 
 - (NSString *)thread
@@ -205,11 +201,15 @@ - (void)addBody:(NSString *)body
     [self addChild:bodyElement];
 }
 
-- (void)addBody:(NSString *)body withLang:(NSString *)lang
+- (void)addBody:(NSString *)body withLanguage:(NSString *)language
 {
     NSXMLElement *bodyElement = [NSXMLElement elementWithName:@"body" stringValue:body];
-    if (lang)
-        [bodyElement addAttributeWithName:@"xml:lang" stringValue:lang];
+
+    if ([language length])
+    {
+        [bodyElement addAttributeWithName:@"xml:lang" stringValue:language];
+    }
+
     [self addChild:bodyElement];
 }