Commit d383bd67 authored by alekseys@chromium.org's avatar alekseys@chromium.org

Get printer's paper size custom_display_name_localized property into account.

BUG=401344

Review URL: https://codereview.chromium.org/447963005

Cr-Commit-Position: refs/heads/master@{#288402}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288402 0039d316-1c4b-4281-b951-d872f2087c98
parent a975cfd5
...@@ -70,7 +70,26 @@ cr.define('print_preview', function() { ...@@ -70,7 +70,26 @@ cr.define('print_preview', function() {
// TODO: Better heuristics for the display name and options grouping. // TODO: Better heuristics for the display name and options grouping.
this.ticketItem_.capability.option.forEach(function(option, index) { this.ticketItem_.capability.option.forEach(function(option, index) {
var selectOption = document.createElement('option'); var selectOption = document.createElement('option');
selectOption.text = option.custom_display_name || option.name; var displayName = option.custom_display_name;
if (!displayName && option.custom_display_name_localized) {
var getLocaleToCompare = function(locale, languageOnly) {
var code = languageOnly ? locale.split('-')[0] : locale;
return code.toLowerCase();
};
var getItemForLocale = function(items, locale, languageOnly) {
locale = getLocaleToCompare(locale, languageOnly);
for (var i = 0; i < items.length; i++) {
if (getLocaleToCompare(items[i].locale) == locale)
return items[i].value;
}
return '';
};
var items = option.custom_display_name_localized;
displayName =
getItemForLocale(items, navigator.language, false) ||
getItemForLocale(items, navigator.language, true);
}
selectOption.text = displayName || option.name;
selectOption.value = JSON.stringify(option); selectOption.value = JSON.stringify(option);
select.add(selectOption); select.add(selectOption);
if (option.is_default) { if (option.is_default) {
......
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