mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-11 12:25:53 +00:00
6b58571417
This potentially changes behavior. On my machine, the old code returned NS_ERROR_FAILURE because the dictionary did not have a "countryCode" entry, but this new implementation correctly returns the string "CA". MozReview-Commit-ID: 17Vme0fcAIw --HG-- extra : rebase_source : 9ffc388ae98b11cb37c37957a8721e92284208c3 extra : source : e1a14b0c638571ec7f7aaec56f11d4b77dfb4dd5
42 lines
1.1 KiB
Plaintext
42 lines
1.1 KiB
Plaintext
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#include "nsString.h"
|
|
#include "MacHelpers.h"
|
|
#include "nsObjCExceptions.h"
|
|
|
|
#import <Foundation/Foundation.h>
|
|
|
|
namespace mozilla {
|
|
|
|
nsresult
|
|
GetSelectedCityInfo(nsAString& aCountryCode)
|
|
{
|
|
NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
|
|
|
|
// Can be replaced with [[NSLocale currentLocale] countryCode] once we build
|
|
// with the 10.12 SDK.
|
|
id countryCode = [[NSLocale currentLocale] objectForKey:NSLocaleCountryCode];
|
|
|
|
if (![countryCode isKindOfClass:[NSString class]]) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
const char* countryCodeUTF8 = [(NSString*)countryCode UTF8String];
|
|
|
|
if (!countryCodeUTF8) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
AppendUTF8toUTF16(countryCodeUTF8, aCountryCode);
|
|
return NS_OK;
|
|
|
|
NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
|
|
}
|
|
|
|
} // namespace Mozilla
|
|
|