diff --git a/SoObjects/SOGo/NSObject+Utilities.h b/SoObjects/SOGo/NSObject+Utilities.h index 8c97b2fd9..d34fd1c9e 100644 --- a/SoObjects/SOGo/NSObject+Utilities.h +++ b/SoObjects/SOGo/NSObject+Utilities.h @@ -27,6 +27,7 @@ @class NSArray; @class NSString; @class WOContext; +@class NSNull; @interface NSObject (SOGoObjectUtilities) diff --git a/SoObjects/SOGo/NSObject+Utilities.m b/SoObjects/SOGo/NSObject+Utilities.m index 08994c9e6..9b7f48d8a 100644 --- a/SoObjects/SOGo/NSObject+Utilities.m +++ b/SoObjects/SOGo/NSObject+Utilities.m @@ -110,7 +110,7 @@ static NSMutableDictionary *translationCache = nil; while (!label && (language = [languages nextObject])) { - if (![translationCache objectForKey: language]) { + if (![translationCache objectForKey: language] || [[translationCache objectForKey: language] objectForKey: key] != [NSNull null]) { paths = [bundle pathsForResourcesOfType: @"strings" inDirectory: [NSString stringWithFormat: @"%@.lproj", language]