diff --git a/app/brave_settings_strings.grdp b/app/brave_settings_strings.grdp index 0bb0caf81c33..1819e7f1508d 100644 --- a/app/brave_settings_strings.grdp +++ b/app/brave_settings_strings.grdp @@ -205,7 +205,7 @@ Shields Down - + Shields @@ -298,10 +298,6 @@ Enable custom filters that block regional and language-specific trackers and Annoyances. - - Enable custom filters that block regional and language-specific trackers and - <a target="_blank" href="$1">Annoyances</a>. - Add custom filter lists @@ -835,7 +831,7 @@ The Snowflake extension necessary for this functionality could not be downloaded. Please check your Internet connection and try again. - + Select a built-in bridge diff --git a/browser/resources/settings/default_brave_shields_page/brave_adblock_subpage.html b/browser/resources/settings/default_brave_shields_page/brave_adblock_subpage.html index 819ac29bef2d..0cee044d426f 100644 --- a/browser/resources/settings/default_brave_shields_page/brave_adblock_subpage.html +++ b/browser/resources/settings/default_brave_shields_page/brave_adblock_subpage.html @@ -245,10 +245,30 @@ > [[item.subscription_url]] - + + + + + + + ${this.i18n('adblockSubscribeUrlDownloadFailed')}` - } else if (last_successful_update_attempt !== last_update_attempt) { - return `${last_updated_pretty_text} ${this.i18n('adblockSubscribeUrlUpdateFailed')}` - } else { - return last_updated_pretty_text - } + isEqual_(lhs, rhs) { + return lhs === rhs + } + + isFailedUpdate_(item) { + return item.last_successful_update_attempt !== 0 && item.last_successful_update_attempt !== item.last_update_attempt + } + + isLastAttemptFailed_(item) { + return item.last_successful_update_attempt !== 0 && item.last_successful_update_attempt === item.last_update_attempt } } diff --git a/browser/ui/webui/settings/brave_settings_localized_strings_provider.cc b/browser/ui/webui/settings/brave_settings_localized_strings_provider.cc index db865c77f5cc..e738dd3019ea 100644 --- a/browser/ui/webui/settings/brave_settings_localized_strings_provider.cc +++ b/browser/ui/webui/settings/brave_settings_localized_strings_provider.cc @@ -580,7 +580,6 @@ void BraveAddCommonStrings(content::WebUIDataSource* html_source, {"walletNetworkReset", IDS_BRAVE_WALLET_NETWORK_RESET}, {"walletNetworkSetAsActive", IDS_BRAVE_WALLET_NETWORK_SET_AS_ACTIVE}, {"adblockContentFilteringLabel", IDS_BRAVE_ADBLOCK_CONTENT_FILTERING_LABEL}, - {"adblockContentFilteringDesc", IDS_BRAVE_ADBLOCK_CONTENT_FILTERING_DESC}, {"adblockAddCustomFiltersListsLabel", IDS_BRAVE_ADBLOCK_ADD_CUSTOM_FILTERS_LISTS_LABEL}, {"adblockContentFilterLabelDesc",