Commit 97181f82 authored by Jesse Schettler's avatar Jesse Schettler Committed by Commit Bot

scanning: Add finalized strings for page sizes

Bug: 1059779
Change-Id: I1eed0f1e46a7e176e26568db33de769196f7f89c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2527858
Commit-Queue: Jesse Schettler <jschettler@chromium.org>
Reviewed-by: default avatarZentaro Kavanagh <zentaro@chromium.org>
Cr-Commit-Position: refs/heads/master@{#825916}
parent 6bf0ba95
...@@ -516,6 +516,15 @@ Try tapping the mic to ask me anything. ...@@ -516,6 +516,15 @@ Try tapping the mic to ask me anything.
<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>
<message name="IDS_SCANNING_APP_A4_OPTION_TEXT" desc="The text displayed for the A4 option in the page size dropdown.">
A4
</message>
<message name="IDS_SCANNING_APP_LETTER_OPTION_TEXT" desc="The text displayed for the Letter option in the page size dropdown.">
Letter
</message>
<message name="IDS_SCANNING_APP_FIT_TO_SCAN_AREA_OPTION_TEXT" desc="The text displayed for the fit to scan area option in the page size dropdown.">
Fit to scan area
</message>
<message name="IDS_SCANNING_APP_RESOLUTION_DROPDOWN_LABEL" desc="The label for the dropdown that displays available resolutions (e.g. 150 dpi, 300 dpi, etc.)."> <message name="IDS_SCANNING_APP_RESOLUTION_DROPDOWN_LABEL" desc="The label for the dropdown that displays available resolutions (e.g. 150 dpi, 300 dpi, etc.).">
Resolution Resolution
</message> </message>
......
24935b270bb4a2b51ca21bdfdff3a922bc80a05a
\ No newline at end of file
24935b270bb4a2b51ca21bdfdff3a922bc80a05a
\ No newline at end of file
24935b270bb4a2b51ca21bdfdff3a922bc80a05a
\ No newline at end of file
...@@ -72,17 +72,16 @@ export function getColorModeString(mojoColorMode) { ...@@ -72,17 +72,16 @@ export function getColorModeString(mojoColorMode) {
* @return {string} * @return {string}
*/ */
export function getPageSizeString(pageSize) { export function getPageSizeString(pageSize) {
// TODO(jschettler): Replace with finalized i18n strings.
switch (pageSize) { switch (pageSize) {
case chromeos.scanning.mojom.PageSize.kIsoA4: case chromeos.scanning.mojom.PageSize.kIsoA4:
return 'A4'; return loadTimeData.getString('a4OptionText');
case chromeos.scanning.mojom.PageSize.kNaLetter: case chromeos.scanning.mojom.PageSize.kNaLetter:
return 'Letter'; return loadTimeData.getString('letterOptionText');
case chromeos.scanning.mojom.PageSize.kMax: case chromeos.scanning.mojom.PageSize.kMax:
return 'Fit to scan area'; return loadTimeData.getString('fitToScanAreaOptionText');
default: default:
assertNotReached(); assertNotReached();
return 'Unknown'; return loadTimeData.getString('letterOptionText');
} }
} }
......
...@@ -52,6 +52,7 @@ void SetUpWebUIDataSource(content::WebUIDataSource* source, ...@@ -52,6 +52,7 @@ 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[] = {
{"a4OptionText", IDS_SCANNING_APP_A4_OPTION_TEXT},
{"appTitle", IDS_SCANNING_APP_TITLE}, {"appTitle", IDS_SCANNING_APP_TITLE},
{"blackAndWhiteOptionText", IDS_SCANNING_APP_BLACK_AND_WHITE_OPTION_TEXT}, {"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},
...@@ -59,8 +60,11 @@ void AddScanningAppStrings(content::WebUIDataSource* html_source) { ...@@ -59,8 +60,11 @@ void AddScanningAppStrings(content::WebUIDataSource* html_source) {
{"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},
{"fitToScanAreaOptionText",
IDS_SCANNING_APP_FIT_TO_SCAN_AREA_OPTION_TEXT},
{"grayscaleOptionText", IDS_SCANNING_APP_GRAYSCALE_OPTION_TEXT}, {"grayscaleOptionText", IDS_SCANNING_APP_GRAYSCALE_OPTION_TEXT},
{"jpgOptionText", IDS_SCANNING_APP_JPG_OPTION_TEXT}, {"jpgOptionText", IDS_SCANNING_APP_JPG_OPTION_TEXT},
{"letterOptionText", IDS_SCANNING_APP_LETTER_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},
{"noScannersHelpLinkLabel", IDS_SCANNING_APP_NO_SCANNERS_HELP_LINK_LABEL}, {"noScannersHelpLinkLabel", IDS_SCANNING_APP_NO_SCANNERS_HELP_LINK_LABEL},
......
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