From 9a70f347c9f279bf7b4ad8f24e78e3e524767ed5 Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Tue, 25 Jun 2013 18:07:45 +0000 Subject: Ensure we use the current locale when looking up fallback fonts per character http://crbug.com/183830 R=scroggo@google.com Review URL: https://codereview.chromium.org/17691002 git-svn-id: http://skia.googlecode.com/svn/trunk@9751 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/ports/SkFontConfigParser_android.cpp | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'src/ports/SkFontConfigParser_android.cpp') diff --git a/src/ports/SkFontConfigParser_android.cpp b/src/ports/SkFontConfigParser_android.cpp index 9214d1bf61..b1c815993a 100644 --- a/src/ports/SkFontConfigParser_android.cpp +++ b/src/ports/SkFontConfigParser_android.cpp @@ -254,7 +254,7 @@ void SkFontConfigParser::GetTestFontFamilies(SkTDArray &fontFamilie /** * Read the persistent locale. */ -void SkFontConfigParser::GetLocale(AndroidLocale &locale) +SkString SkFontConfigParser::GetLocale() { char propLang[PROP_VALUE_MAX], propRegn[PROP_VALUE_MAX]; __system_property_get("persist.sys.language", propLang); @@ -269,8 +269,14 @@ void SkFontConfigParser::GetLocale(AndroidLocale &locale) strcpy(propRegn, "US"); } } - strncpy(locale.language, propLang, 2); - locale.language[2] = '\0'; - strncpy(locale.region, propRegn, 2); - locale.region[2] = '\0'; + + SkString locale(6); + char* localeCStr = locale.writable_str(); + + strncpy(localeCStr, propLang, 2); + localeCStr[2] = '-'; + strncpy(&localeCStr[3], propRegn, 2); + localeCStr[5] = '\0'; + + return locale; } -- cgit v1.2.3