Commit 7fc07db4 authored by Steven Bennetts's avatar Steven Bennetts Committed by Commit Bot

Network settings: WPAD: Show string when not provided

Bug: 804258
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: I865bc4cf3fa00572775227e9b6ce455cfae57c85
Reviewed-on: https://chromium-review.googlesource.com/952464Reviewed-by: default avatarToni Barzic <tbarzic@chromium.org>
Commit-Queue: Steven Bennetts <stevenjb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#541455}
parent 5b6a9fa0
......@@ -1438,6 +1438,9 @@
<message name="IDS_SETTINGS_INTERNET_NETWORK_PROXY_WPAD" desc="Settings > Internet > Network details: Web Proxy Auto Discovery (WPAD) label.">
Web Proxy Auto Discovery URL:
</message>
<message name="IDS_SETTINGS_INTERNET_NETWORK_PROXY_WPAD_NONE" desc="Settings > Internet > Network details: Value for Web Proxy Auto Discovery when no URL is provided.">
Not provided
</message>
<message name="IDS_SETTINGS_INTERNET_MOBILE_SEARCH" desc="Settings > Internet > Message in Mobile section when searching for mobile networks.">
Searching for mobile networks
</message>
......
......@@ -246,6 +246,7 @@ void AddDetailsLocalizedStrings(content::WebUIDataSource* html_source) {
{"networkNameserversGoogle",
IDS_SETTINGS_INTERNET_NETWORK_NAMESERVERS_GOOGLE},
{"networkProxyWpad", IDS_SETTINGS_INTERNET_NETWORK_PROXY_WPAD},
{"networkProxyWpadNone", IDS_SETTINGS_INTERNET_NETWORK_PROXY_WPAD_NONE},
};
for (const auto& entry : localized_strings)
html_source->AddLocalizedString(entry.name, entry.id);
......
......@@ -208,7 +208,8 @@ Polymer({
// Set the Web Proxy Auto Discovery URL.
var ipv4 =
CrOnc.getIPConfigForType(this.networkProperties, CrOnc.IPType.IPV4);
this.WPAD_ = (ipv4 && ipv4.WebProxyAutoDiscoveryUrl) || '';
this.WPAD_ = (ipv4 && ipv4.WebProxyAutoDiscoveryUrl) ||
this.i18n('networkProxyWpadNone');
this.setProxyAsync_(proxy);
},
......
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