diff --git a/React/Modules/RCTI18nUtil.h b/React/Modules/RCTI18nUtil.h index b9871976591efc..0f228721816164 100644 --- a/React/Modules/RCTI18nUtil.h +++ b/React/Modules/RCTI18nUtil.h @@ -17,11 +17,12 @@ */ @interface RCTI18nUtil : NSObject ++ (instancetype)sharedInstance; + - (BOOL)isRTL; - (BOOL)isRTLAllowed; - (void)allowRTL:(BOOL)value; - (BOOL)isRTLForced; - (void)forceRTL:(BOOL)value; -+ (id)sharedInstance; @end diff --git a/React/Modules/RCTI18nUtil.m b/React/Modules/RCTI18nUtil.m index 443c9930233d68..a3a206b2391c0b 100644 --- a/React/Modules/RCTI18nUtil.m +++ b/React/Modules/RCTI18nUtil.m @@ -13,13 +13,15 @@ @implementation RCTI18nUtil -+ (id)sharedInstance { - static RCTI18nUtil *sharedRCTI18nUtilInstance = nil; - @synchronized(self) { - if (sharedRCTI18nUtilInstance == nil) - sharedRCTI18nUtilInstance = [self new]; - } - return sharedRCTI18nUtilInstance; ++ (instancetype)sharedInstance +{ + static RCTI18nUtil *sharedInstance; + static dispatch_once_t onceToken; + dispatch_once(&onceToken, ^{ + sharedInstance = [self new]; + }); + + return sharedInstance; } /**