tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 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
commit 13d56e9bed
2 changed files with 4 additions and 4 deletions
Show stats 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

2
tests/unit/screen_ui_test.cpp
View file

@ -255,7 +255,7 @@ class ScreenRecoveryUITest : public ::testing::Test {
protected:
const std::string kTestLocale = "en-US";
const std::string kTestRtlLocale = "ar";
const std::string kTestRtlLocaleWithSuffix = "ar_EG";
const std::string kTestRtlLocaleWithSuffix = "ar-EG";
void SetUp() override {
ui_ = std::make_unique<TestableScreenRecoveryUI>();