Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 02:14:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1342753 - Use app locale in DateTimeFormat.cpp, instead of OS locale. r=m_kato

Browse Source 
MozReview-Commit-ID: SPsNYxe493

--HG--
extra : rebase_source : b611ad61c83577ac1d42adce504ceb1b3731f59e
This commit is contained in:
Zibi Braniecki 2017-02-27 09:36:50 -08:00
parent af830bacf3
commit 1618c4af60
1 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
intl/locale/DateTimeFormat.cpp
View File

@ -7,7 +7,7 @@
#include "DateTimeFormat.h"
#include "nsCOMPtr.h"
#include "nsIServiceManager.h"
#include "nsILocaleService.h"
#include "mozilla/intl/LocaleService.h"
#include "unicode/udatpg.h"
namespace mozilla {
@ -17,29 +17,16 @@ nsCString* DateTimeFormat::mLocale = nullptr;
/*static*/ nsresult
DateTimeFormat::Initialize()
{
nsAutoString localeStr;
nsresult rv = NS_OK;
if (!mLocale) {
mLocale = new nsCString();
} else if (!mLocale->IsEmpty()) {
if (mLocale) {
return NS_OK;
}
nsCOMPtr<nsILocaleService> localeService =
do_GetService(NS_LOCALESERVICE_CONTRACTID, &rv);
if (NS_SUCCEEDED(rv)) {
nsCOMPtr<nsILocale> appLocale;
rv = localeService->GetApplicationLocale(getter_AddRefs(appLocale));
if (NS_SUCCEEDED(rv)) {
rv = appLocale->GetCategory(NS_LITERAL_STRING("NSILOCALE_TIME"), localeStr);
if (NS_SUCCEEDED(rv) && !localeStr.IsEmpty()) {
*mLocale = NS_LossyConvertUTF16toASCII(localeStr); // cache locale name
}
}
}
mLocale = new nsCString();
nsAutoCString locale;
intl::LocaleService::GetInstance()->GetAppLocale(locale);
mLocale->Assign(locale);
return rv;
return NS_OK;
}
// performs a locale sensitive date formatting operation on the time_t parameter