Commit da6bff87 authored by Scott Violet's avatar Scott Violet Committed by Commit Bot

Revert "Crostini settings string changes."

This reverts commit da531d49.

Reason for revert: I think this is the source of tast failures on the waterfall. See https://ci.chromium.org/p/chromium/builders/ci/chromeos-kevin-rel/29675 for one. I think the issue is that it looks like tast tests have hard coded the string to search for, and since you're renaming it the string is no longer found:
https://source.chromium.org/chromiumos/chromiumos/codesearch/+/master:src/platform/tast-tests/src/chromiumos/tast/local/crostini/ui/settings/settings.go;l=52?q=tast-tests%20Linux%20(Beta)&ss=chromiumos%2Fchromiumos%2Fcodesearch:src%2Fplatform%2Ftast-tests%2F

Original change's description:
> Crostini settings string changes.
>
> Instead of "Linux (Beta)", now shows as "Developers"
>
> Bug: 1140370
> Change-Id: Id4e076b5d918e41e22e5c59d65958da9e75a3f55
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2486528
> Commit-Queue: Nicholas Verne <nverne@chromium.org>
> Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
> Reviewed-by: David Munro <davidmunro@google.com>
> Auto-Submit: Nicholas Verne <nverne@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#820205}

TBR=khorimoto@chromium.org,nverne@chromium.org,davidmunro@google.com

Change-Id: I6aa9216749d2d175b145821bf514c1642496e0e0
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1140370
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2495327Reviewed-by: default avatarScott Violet <sky@chromium.org>
Commit-Queue: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#820262}
parent 97ad28f7
...@@ -751,15 +751,12 @@ ...@@ -751,15 +751,12 @@
</message> </message>
<!-- Crostini section. --> <!-- Crostini section. -->
<message name="IDS_OS_SETTINGS_TAG_CROSTINI" desc="Text for search result item which, when clicked, navigates the user to Linux (a.k.a. Crostini) settings. Alternate phrase for: 'Crostini, Developers'"> <message name="IDS_OS_SETTINGS_TAG_CROSTINI" desc="Text for search result item which, when clicked, navigates the user to Linux (a.k.a. Crostini) settings. Alternate phrase for: 'Crostini'">
Linux Linux
</message> </message>
<message name="IDS_OS_SETTINGS_TAG_CROSTINI_ALT1" desc="Text for search result item which, when clicked, navigates the user to Linux (a.k.a. Crostini) settings. Alternate phrase for: 'Linux, Developers'"> <message name="IDS_OS_SETTINGS_TAG_CROSTINI_ALT1" desc="Text for search result item which, when clicked, navigates the user to Linux (a.k.a. Crostini) settings. Alternate phrase for: 'Linux'">
Crostini Crostini
</message> </message>
<message name="IDS_OS_SETTINGS_TAG_CROSTINI_ALT2" desc="Text for search result item which, when clicked, navigates the user to Linux (a.k.a. Crostini) settings. Alternate phrase for: 'Linux, Crostini'">
Developers
</message>
<message name="IDS_OS_SETTINGS_TAG_CROSTINI_SHARED_FOLDERS" desc="Text for search result item which, when clicked, navigates the user to Linux (a.k.a. Crostini) settings, with the option to share folders with the Chromebook. Alternate phrase for: 'Linux shared directories', 'Crostini shared folders', 'Crostini shared directories'"> <message name="IDS_OS_SETTINGS_TAG_CROSTINI_SHARED_FOLDERS" desc="Text for search result item which, when clicked, navigates the user to Linux (a.k.a. Crostini) settings, with the option to share folders with the Chromebook. Alternate phrase for: 'Linux shared directories', 'Crostini shared folders', 'Crostini shared directories'">
Linux shared folders Linux shared folders
</message> </message>
......
479226be7e58aca337d957fd411b0b628b37d76d
\ No newline at end of file
...@@ -1163,11 +1163,11 @@ ...@@ -1163,11 +1163,11 @@
</message> </message>
<!-- Crostini --> <!-- Crostini -->
<message name="IDS_SETTINGS_CROSTINI_TITLE" desc="The title of Crostini section. It is meant to be used by software developers."> <message name="IDS_SETTINGS_CROSTINI_TITLE" desc="The title of Crostini section.">
Developers Linux (Beta)
</message> </message>
<message name="IDS_SETTINGS_CROSTINI_LABEL" desc="The text associated with the primary section setting. This contains settings for a Linux container running in a virtual machine for use by software developers."> <message name="IDS_SETTINGS_CROSTINI_LABEL" desc="The text associated with the primary section setting.">
Linux development environment Linux
</message> </message>
<message name="IDS_SETTINGS_CROSTINI_SHARED_PATHS" desc="Label for managing shared folders in Crostini."> <message name="IDS_SETTINGS_CROSTINI_SHARED_PATHS" desc="Label for managing shared folders in Crostini.">
Manage shared folders Manage shared folders
......
479226be7e58aca337d957fd411b0b628b37d76d
\ No newline at end of file
479226be7e58aca337d957fd411b0b628b37d76d
\ No newline at end of file
...@@ -41,8 +41,7 @@ const std::vector<SearchConcept>& GetCrostiniOptedInSearchConcepts() { ...@@ -41,8 +41,7 @@ const std::vector<SearchConcept>& GetCrostiniOptedInSearchConcepts() {
mojom::SearchResultDefaultRank::kHigh, mojom::SearchResultDefaultRank::kHigh,
mojom::SearchResultType::kSubpage, mojom::SearchResultType::kSubpage,
{.subpage = mojom::Subpage::kCrostiniDetails}, {.subpage = mojom::Subpage::kCrostiniDetails},
{IDS_OS_SETTINGS_TAG_CROSTINI_ALT1, IDS_OS_SETTINGS_TAG_CROSTINI_ALT2, {IDS_OS_SETTINGS_TAG_CROSTINI_ALT1, SearchConcept::kAltTagEnd}},
SearchConcept::kAltTagEnd}},
{IDS_OS_SETTINGS_TAG_CROSTINI_USB_PREFERENCES, {IDS_OS_SETTINGS_TAG_CROSTINI_USB_PREFERENCES,
mojom::kCrostiniUsbPreferencesSubpagePath, mojom::kCrostiniUsbPreferencesSubpagePath,
mojom::SearchResultIcon::kPenguin, mojom::SearchResultIcon::kPenguin,
...@@ -94,8 +93,7 @@ const std::vector<SearchConcept>& GetCrostiniOptedOutSearchConcepts() { ...@@ -94,8 +93,7 @@ const std::vector<SearchConcept>& GetCrostiniOptedOutSearchConcepts() {
mojom::SearchResultDefaultRank::kMedium, mojom::SearchResultDefaultRank::kMedium,
mojom::SearchResultType::kSection, mojom::SearchResultType::kSection,
{.section = mojom::Section::kCrostini}, {.section = mojom::Section::kCrostini},
{IDS_OS_SETTINGS_TAG_CROSTINI_ALT1, IDS_OS_SETTINGS_TAG_CROSTINI_ALT2, {IDS_OS_SETTINGS_TAG_CROSTINI_ALT1, SearchConcept::kAltTagEnd}},
SearchConcept::kAltTagEnd}},
{IDS_OS_SETTINGS_TAG_CROSTINI_SETUP, {IDS_OS_SETTINGS_TAG_CROSTINI_SETUP,
mojom::kCrostiniSectionPath, mojom::kCrostiniSectionPath,
mojom::SearchResultIcon::kPenguin, mojom::SearchResultIcon::kPenguin,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment