diff options
author | Tianjie Xu <xunchang@google.com> | 2017-03-28 21:42:53 +0200 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-03-28 21:42:54 +0200 |
commit | 713d915636d64d42bf94e3cf93e3c469201129d6 (patch) | |
tree | 762e0afe7b612674b2d83c964c89b63ead3c8794 /minui/resources.cpp | |
parent | Merge changes from topic 'sinkfn' (diff) | |
parent | Add the missing sr-Latn into png files and rename the png locale header (diff) | |
download | android_bootable_recovery-713d915636d64d42bf94e3cf93e3c469201129d6.tar android_bootable_recovery-713d915636d64d42bf94e3cf93e3c469201129d6.tar.gz android_bootable_recovery-713d915636d64d42bf94e3cf93e3c469201129d6.tar.bz2 android_bootable_recovery-713d915636d64d42bf94e3cf93e3c469201129d6.tar.lz android_bootable_recovery-713d915636d64d42bf94e3cf93e3c469201129d6.tar.xz android_bootable_recovery-713d915636d64d42bf94e3cf93e3c469201129d6.tar.zst android_bootable_recovery-713d915636d64d42bf94e3cf93e3c469201129d6.zip |
Diffstat (limited to 'minui/resources.cpp')
-rw-r--r-- | minui/resources.cpp | 33 |
1 files changed, 23 insertions, 10 deletions
diff --git a/minui/resources.cpp b/minui/resources.cpp index c0f9c5c85..86c731b02 100644 --- a/minui/resources.cpp +++ b/minui/resources.cpp @@ -25,8 +25,11 @@ #include <sys/types.h> #include <unistd.h> +#include <regex> +#include <string> #include <vector> +#include <android-base/strings.h> #include <png.h> #include "minui/minui.h" @@ -371,16 +374,26 @@ int res_create_alpha_surface(const char* name, GRSurface** pSurface) { // 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 == nullptr) { - return false; - } - - // 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". - - return (strncmp(prefix, locale, strlen(prefix)) == 0); +bool matches_locale(const std::string& prefix, const std::string& locale) { + // According to the BCP 47 format, A locale string may consists of: + // language-{extlang}-{script}-{region}-{variant} + // The locale headers in PNG mostly consist of language-{region} except for sr-Latn, and some + // android's system locale can have the format language-{script}-{region}. + + // Return true if the whole string of prefix matches the top part of locale. Otherwise try to + // match the locale string without the {script} section. + // For instance, prefix == "en" matches locale == "en-US", prefix == "sr-Latn" matches locale + // == "sr-Latn-BA", and prefix == "zh-CN" matches locale == "zh-Hans-CN". + if (android::base::StartsWith(locale, prefix.c_str())) { + return true; + } + + size_t separator = prefix.find('-'); + if (separator == std::string::npos) { + return false; + } + std::regex loc_regex(prefix.substr(0, separator) + "-[A-Za-z]*" + prefix.substr(separator)); + return std::regex_match(locale, loc_regex); } int res_create_localized_alpha_surface(const char* name, |