diff --git a/client/src/__locales/ru.json b/client/src/__locales/ru.json index 5782d4d3..c21746e5 100644 --- a/client/src/__locales/ru.json +++ b/client/src/__locales/ru.json @@ -77,7 +77,7 @@ "check_updates_btn": "\u041f\u0440\u043e\u0432\u0435\u0440\u0438\u0442\u044c \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u044f", "new_filter_btn": "\u0414\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u043d\u043e\u0432\u043e\u0433\u043e \u0444\u0438\u043b\u044c\u0442\u0440\u0430", "enter_valid_filter_url": "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u0434\u0435\u0439\u0441\u0442\u0432\u0443\u044e\u0449\u0438\u0439 URL \u0434\u043b\u044f \u043f\u043e\u0434\u043f\u0438\u0441\u043a\u0438 \u043d\u0430 \u0444\u0438\u043b\u044c\u0442\u0440 \u0438\u043b\u0438 \u0444\u0430\u0439\u043b hosts.", - "custom_filter_rules": "\u041f\u0440\u0430\u0432\u0438\u043b\u043e \u0443\u0434\u0430\u043b\u0435\u043d\u043e \u0438\u0437 \u0430\u0432\u0442\u043e\u0440\u0441\u043a\u043e\u0433\u043e \u0441\u043f\u0438\u0441\u043a\u0430 \u043f\u0440\u0430\u0432\u0438\u043b \u0444\u0438\u043b\u044c\u0442\u0440\u0430\u0446\u0438\u0438", + "custom_filter_rules": "\u041F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044C\u0441\u043A\u0438\u0439 \u0444\u0438\u043B\u044C\u0442\u0440", "custom_filter_rules_hint": "\u0412\u0432\u043e\u0434\u0438\u0442\u0435 \u043f\u043e \u043e\u0434\u043d\u043e\u043c\u0443 \u043f\u0440\u0430\u0432\u0438\u043b\u0443 \u043d\u0430 \u0441\u0442\u0440\u043e\u0447\u043a\u0443. \u0412\u044b \u043c\u043e\u0436\u0435\u0442\u0435 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c \u043f\u0440\u0430\u0432\u0438\u043b\u0430 \u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u043a\u0438 \u0438\u043b\u0438 \u0441\u0438\u043d\u0442\u0430\u043a\u0441\u0438\u0441 \u0444\u0430\u0439\u043b\u043e\u0432 hosts.", "examples_title": "\u041f\u0440\u0438\u043c\u0435\u0440\u044b", "example_meaning_filter_block": "\u0437\u0430\u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0434\u043e\u0441\u0442\u0443\u043f \u043a \u0434\u043e\u043c\u0435\u043d\u0443 example.org \u0438 \u0432\u0441\u0435\u043c \u0435\u0433\u043e \u043f\u043e\u0434\u0434\u043e\u043c\u0435\u043d\u0430\u043c", diff --git a/client/src/components/Logs/index.js b/client/src/components/Logs/index.js index 5bd088ba..ca1c9b5d 100644 --- a/client/src/components/Logs/index.js +++ b/client/src/components/Logs/index.js @@ -69,13 +69,14 @@ class Logs extends Component { renderBlockingButton(isFiltered, domain) { const buttonClass = isFiltered ? 'btn-outline-secondary' : 'btn-outline-danger'; const buttonText = isFiltered ? 'unblock_btn' : 'block_btn'; + const buttonType = isFiltered ? 'unblock' : 'block'; return (
@@ -126,7 +127,7 @@ class Logs extends Component { if (reason === 'FilteredBlackList' || reason === 'NotFilteredWhiteList') { if (filterId === 0) { - filterName = 'custom_filter_rules'; + filterName = t('custom_filter_rules'); } else { const filterItem = Object.keys(filters) .filter(key => filters[key].id === filterId); @@ -167,7 +168,7 @@ class Logs extends Component { filterMethod: (filter, row) => { if (filter.value === 'filtered') { // eslint-disable-next-line no-underscore-dangle - return row._original.reason.indexOf('Filtered') === 0; + return row._original.reason.indexOf('Filtered') === 0 || row._original.reason === 'NotFilteredWhiteList'; } return true; },