Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(160)

Unified Diff: source/common/locmap.c

Issue 845603002: Update ICU to 54.1 step 1 (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/icu.git@master
Patch Set: remove unusued directories Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « source/common/loclikely.cpp ('k') | source/common/locutil.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/common/locmap.c
diff --git a/source/common/locmap.c b/source/common/locmap.c
index da591df3ae5d39c2187c5e8f6444b91dc8824df9..59809c6c688681b5c94ac18812b2f31c48fc0256 100644
--- a/source/common/locmap.c
+++ b/source/common/locmap.c
@@ -29,11 +29,6 @@
#include "cstring.h"
#include "cmemory.h"
-/**
- * Chromium has its own implementation to determine the default locale that uses
- * Windows locale API where available and falls back to the old API at run-time.
- */
-#if 0
#if U_PLATFORM == U_PF_WINDOWS && defined(_MSC_VER) && (_MSC_VER >= 1500)
/*
* TODO: It seems like we should widen this to
@@ -45,7 +40,6 @@
*/
#define USE_WINDOWS_LOCALE_API
#endif
-#endif
#ifdef USE_WINDOWS_LOCALE_API
#include <windows.h>
@@ -300,7 +294,7 @@ ILCID_POSIX_SUBTABLE(es) {
{0x540a, "es_US"},
{0x380a, "es_UY"},
{0x200a, "es_VE"},
- {0xe40a, "es_419"},
+ {0x580a, "es_419"},
{0x040a, "es_ES@collation=traditional"},
{0x040a, "es@collation=traditional"}
};
@@ -468,7 +462,8 @@ ILCID_POSIX_SUBTABLE(mn) {
{0x7c50, "mn_Mong"},
{0x0850, "mn_Mong_CN"},
{0x0850, "mn_CN"},
- {0x7850, "mn_Cyrl"}
+ {0x7850, "mn_Cyrl"},
+ {0x0c50, "mn_Mong_MN"}
};
ILCID_POSIX_ELEMENT_ARRAY(0x0458, mni,mni_IN)
« no previous file with comments | « source/common/loclikely.cpp ('k') | source/common/locutil.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698