From 317dd753d9d97f74adefbd1a420ef45af72e2d75 Mon Sep 17 00:00:00 2001 From: Mattt Thompson Date: Sat, 26 Jan 2013 11:32:13 -0500 Subject: [PATCH 1/2] [Issue #737] Updating default Accept-Language header value in AFHTTPClient --- AFNetworking/AFHTTPClient.m | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/AFNetworking/AFHTTPClient.m b/AFNetworking/AFHTTPClient.m index d9a066b..f787805 100644 --- a/AFNetworking/AFHTTPClient.m +++ b/AFNetworking/AFHTTPClient.m @@ -234,8 +234,13 @@ NSArray * AFQueryStringPairsFromKeyAndValue(NSString *key, id value) { self.defaultHeaders = [NSMutableDictionary dictionary]; // Accept-Language HTTP Header; see http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.4 - NSString *preferredLanguageCodes = [[NSLocale preferredLanguages] componentsJoinedByString:@", "]; - [self setDefaultHeader:@"Accept-Language" value:[NSString stringWithFormat:@"%@, en-us;q=0.8", preferredLanguageCodes]]; + NSMutableArray *acceptLanguagesComponents = [NSMutableArray array]; + [[NSLocale preferredLanguages] enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) { + float q = 1.0f - (idx * 0.1f); + [acceptLanguagesComponents addObject:[NSString stringWithFormat:@"%@;q=%0.1g", obj, q]]; + *stop = q <= 0.0f; + }]; + [self setDefaultHeader:@"Accept-Language" value:[acceptLanguagesComponents componentsJoinedByString:@", "]]; #if defined(__IPHONE_OS_VERSION_MIN_REQUIRED) // User-Agent Header; see http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.43 From 9ae534b94f75ea047e5ca55faff2e5f4bddc91a4 Mon Sep 17 00:00:00 2001 From: Mattt Thompson Date: Fri, 1 Feb 2013 22:43:30 +0000 Subject: [PATCH 2/2] Limiting default Accept-Language header to 6 languages --- AFNetworking/AFHTTPClient.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AFNetworking/AFHTTPClient.m b/AFNetworking/AFHTTPClient.m index f787805..7193c81 100644 --- a/AFNetworking/AFHTTPClient.m +++ b/AFNetworking/AFHTTPClient.m @@ -238,7 +238,7 @@ NSArray * AFQueryStringPairsFromKeyAndValue(NSString *key, id value) { [[NSLocale preferredLanguages] enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) { float q = 1.0f - (idx * 0.1f); [acceptLanguagesComponents addObject:[NSString stringWithFormat:@"%@;q=%0.1g", obj, q]]; - *stop = q <= 0.0f; + *stop = q <= 0.5f; }]; [self setDefaultHeader:@"Accept-Language" value:[acceptLanguagesComponents componentsJoinedByString:@", "]];