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

Merge "screen_ui: Fix an issue in RTL locale detection."

Browse Source
This commit is contained in:
Treehugger Robot
2018-05-11 21:46:52 +00:00
committed by Gerrit Code Review
parent db6dc14bff 347a659d9b
commit 13d56e9bed
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
screen_ui.cpp
View File

@@ -1101,9 +1101,9 @@ void ScreenRecoveryUI::SetLocale(const std::string& new_locale) {
rtl_locale_ = false;
if (!new_locale.empty()) {
size_t underscore = new_locale.find('_');
// lang has the language prefix prior to '_', or full string if '_' doesn't exist.
std::string lang = new_locale.substr(0, underscore);
size_t separator = new_locale.find('-');
// lang has the language prefix prior to the separator, or full string if none exists.
std::string lang = new_locale.substr(0, separator);
// A bit cheesy: keep an explicit list of supported RTL languages.
if (lang == "ar" || // Arabic