Commit 1fdbee5a authored by Jesse Schettler's avatar Jesse Schettler Committed by Commit Bot

scanning: Add finalized strings for color options

Bug: 1059779
Change-Id: I4370b4f1305a721a911804ccce830cde4c6052ec
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2527887Reviewed-by: default avatarZentaro Kavanagh <zentaro@chromium.org>
Commit-Queue: Jesse Schettler <jschettler@chromium.org>
Cr-Commit-Position: refs/heads/master@{#825861}
parent 90af8b58
...@@ -504,6 +504,15 @@ Try tapping the mic to ask me anything. ...@@ -504,6 +504,15 @@ Try tapping the mic to ask me anything.
<message name="IDS_SCANNING_APP_COLOR_MODE_DROPDOWN_LABEL" desc="The label for the dropdown that displays available color modes (e.g. color, grayscale, black and white, etc.)."> <message name="IDS_SCANNING_APP_COLOR_MODE_DROPDOWN_LABEL" desc="The label for the dropdown that displays available color modes (e.g. color, grayscale, black and white, etc.).">
Color Color
</message> </message>
<message name="IDS_SCANNING_APP_BLACK_AND_WHITE_OPTION_TEXT" desc="The text displayed for the black and white option in the color mode dropdown.">
Black and white
</message>
<message name="IDS_SCANNING_APP_COLOR_OPTION_TEXT" desc="The text displayed for the color option in the color mode dropdown.">
Color
</message>
<message name="IDS_SCANNING_APP_GRAYSCALE_OPTION_TEXT" desc="The text displayed for the grayscale option in the color mode dropdown.">
Grayscale
</message>
<message name="IDS_SCANNING_APP_PAGE_SIZE_DROPDOWN_LABEL" desc="The label for the dropdown that displays available page sizes."> <message name="IDS_SCANNING_APP_PAGE_SIZE_DROPDOWN_LABEL" desc="The label for the dropdown that displays available page sizes.">
Page size Page size
</message> </message>
......
016e35a3f93fdde45296d67436693e542d832cfd
\ No newline at end of file
016e35a3f93fdde45296d67436693e542d832cfd
\ No newline at end of file
016e35a3f93fdde45296d67436693e542d832cfd
\ No newline at end of file
...@@ -52,17 +52,16 @@ export function fileTypeFromString(fileTypeString) { ...@@ -52,17 +52,16 @@ export function fileTypeFromString(fileTypeString) {
* @return {string} * @return {string}
*/ */
export function getColorModeString(mojoColorMode) { export function getColorModeString(mojoColorMode) {
// TODO(jschettler): Replace with finalized i18n strings.
switch (mojoColorMode) { switch (mojoColorMode) {
case chromeos.scanning.mojom.ColorMode.kBlackAndWhite: case chromeos.scanning.mojom.ColorMode.kBlackAndWhite:
return 'Black and White'; return loadTimeData.getString('blackAndWhiteOptionText');
case chromeos.scanning.mojom.ColorMode.kGrayscale: case chromeos.scanning.mojom.ColorMode.kGrayscale:
return 'Grayscale'; return loadTimeData.getString('grayscaleOptionText');
case chromeos.scanning.mojom.ColorMode.kColor: case chromeos.scanning.mojom.ColorMode.kColor:
return 'Color'; return loadTimeData.getString('colorOptionText');
default: default:
assertNotReached(); assertNotReached();
return 'Unknown'; return loadTimeData.getString('blackAndWhiteOptionText');
} }
} }
......
...@@ -53,10 +53,13 @@ void SetUpWebUIDataSource(content::WebUIDataSource* source, ...@@ -53,10 +53,13 @@ void SetUpWebUIDataSource(content::WebUIDataSource* source,
void AddScanningAppStrings(content::WebUIDataSource* html_source) { void AddScanningAppStrings(content::WebUIDataSource* html_source) {
static constexpr webui::LocalizedString kLocalizedStrings[] = { static constexpr webui::LocalizedString kLocalizedStrings[] = {
{"appTitle", IDS_SCANNING_APP_TITLE}, {"appTitle", IDS_SCANNING_APP_TITLE},
{"blackAndWhiteOptionText", IDS_SCANNING_APP_BLACK_AND_WHITE_OPTION_TEXT},
{"colorModeDropdownLabel", IDS_SCANNING_APP_COLOR_MODE_DROPDOWN_LABEL}, {"colorModeDropdownLabel", IDS_SCANNING_APP_COLOR_MODE_DROPDOWN_LABEL},
{"colorOptionText", IDS_SCANNING_APP_COLOR_OPTION_TEXT},
{"defaultSourceOptionText", IDS_SCANNING_APP_DEFAULT_SOURCE_OPTION_TEXT}, {"defaultSourceOptionText", IDS_SCANNING_APP_DEFAULT_SOURCE_OPTION_TEXT},
{"flatbedOptionText", IDS_SCANNING_APP_FLATBED_OPTION_TEXT}, {"flatbedOptionText", IDS_SCANNING_APP_FLATBED_OPTION_TEXT},
{"fileTypeDropdownLabel", IDS_SCANNING_APP_FILE_TYPE_DROPDOWN_LABEL}, {"fileTypeDropdownLabel", IDS_SCANNING_APP_FILE_TYPE_DROPDOWN_LABEL},
{"grayscaleOptionText", IDS_SCANNING_APP_GRAYSCALE_OPTION_TEXT},
{"jpgOptionText", IDS_SCANNING_APP_JPG_OPTION_TEXT}, {"jpgOptionText", IDS_SCANNING_APP_JPG_OPTION_TEXT},
{"moreSettings", IDS_SCANNING_APP_MORE_SETTINGS}, {"moreSettings", IDS_SCANNING_APP_MORE_SETTINGS},
{"myFilesSelectOption", IDS_SCANNING_APP_MY_FILES_SELECT_OPTION}, {"myFilesSelectOption", IDS_SCANNING_APP_MY_FILES_SELECT_OPTION},
......
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