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

am: 13d56e9bed

Change-Id: Icd9b2db1895f3329f34ca959d072abc5226d7cdd

screen_ui.cpp

@@ -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

tests/unit/screen_ui_test.cpp

@@ -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>();