From 86819283c07223442f46f346ee4a3d60123b1d50 Mon Sep 17 00:00:00 2001 From: Kevin G Christiano Date: Wed, 17 Mar 2021 11:37:01 -0400 Subject: [PATCH] improve locae check behavior --- MVMCore/MVMCore/Models/Model/ModelRegistry.swift | 1 - MVMCore/MVMCore/Utility/Helpers/MVMCoreGetterUtility.m | 9 +++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/MVMCore/MVMCore/Models/Model/ModelRegistry.swift b/MVMCore/MVMCore/Models/Model/ModelRegistry.swift index 93407d1..791e70e 100644 --- a/MVMCore/MVMCore/Models/Model/ModelRegistry.swift +++ b/MVMCore/MVMCore/Models/Model/ModelRegistry.swift @@ -7,7 +7,6 @@ // Copyright © 2019 myverizon. All rights reserved. // -import Foundation public struct ModelRegistry { diff --git a/MVMCore/MVMCore/Utility/Helpers/MVMCoreGetterUtility.m b/MVMCore/MVMCore/Utility/Helpers/MVMCoreGetterUtility.m index b48f34e..308016f 100644 --- a/MVMCore/MVMCore/Utility/Helpers/MVMCoreGetterUtility.m +++ b/MVMCore/MVMCore/Utility/Helpers/MVMCoreGetterUtility.m @@ -19,8 +19,13 @@ } + (BOOL)userPrefersSpanish { - // This should be enough for us to look at what the user prefers. - return [[[[[NSLocale preferredLanguages] objectAtIndex:0] substringToIndex:2] lowercaseString] isEqualToString:@"es"]; + // Gets preferences based on what the user wants and the app provides. + NSString *languageCode = [[[NSBundle mainBundle] preferredLocalizations] objectAtIndex:0]; + if (languageCode && [languageCode length] > 2) { + return [[[languageCode substringToIndex:2] lowercaseString] isEqualToString:@"es"]; + } else { + return [[languageCode lowercaseString] isEqualToString:@"es"]; + } } + (nullable NSString *)hardcodedStringWithKey:(nonnull NSString *)key {