PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix matches_locale function

Browse Source 
matches_locale was expecting input locale string to have at most one
underscore; as a result "zh_CN_#Hans" ignores "zh_CN" and matches into
"zh". Fix the match function and add unit tests.

Bug: 27837319
Change-Id: I4e8a66f91cae6ac2a46b6bf21f670d5ea564c7c8
This commit is contained in:
Tianjie Xu
2016-04-19 15:02:41 -07:00
parent e8d0ecccf7
commit 2430e2978b
4 changed files with 44 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
minui/resources.cpp
+8 -13
View File
@@ -370,21 +370,16 @@ int res_create_alpha_surface(const char* name, GRSurface** pSurface) {
return result;
}
static int matches_locale(const char* loc, const char* locale) {
if (locale == NULL) return 0;
// This function tests if a locale string stored in PNG (prefix) matches
// the locale string provided by the system (locale).
bool matches_locale(const char* prefix, const char* locale) {
if (locale == NULL) return false;
if (strcmp(loc, locale) == 0) return 1;
// Return true if the whole string of prefix matches the top part of
// locale. For instance, prefix == "en" matches locale == "en_US";
// and prefix == "zh_CN" matches locale == "zh_CN_#Hans".
// if loc does *not* have an underscore, and it matches the start
// of locale, and the next character in locale *is* an underscore,
// that's a match. For instance, loc == "en" matches locale ==
// "en_US".
int i;
for (i = 0; loc[i] != 0 && loc[i] != '_'; ++i);
if (loc[i] == '_') return 0;
return (strncmp(locale, loc, i) == 0 && locale[i] == '_');
return (strncmp(prefix, locale, strlen(prefix)) == 0);
}
int res_create_localized_alpha_surface(const char* name,