From 24230a5130005e274e1d8d3fe8eaca13cb978b9c Mon Sep 17 00:00:00 2001 From: Kevin Decherf Date: Sun, 23 Jun 2019 22:13:44 +0200 Subject: Add new Ignore Origin rules tab, update ConfigController Signed-off-by: Kevin Decherf --- src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml') diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml index 770477c9..fbf64f30 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml @@ -59,6 +59,7 @@ config: user_info: 'Informacje o użytkowniku' password: 'Hasło' rules: 'Zasady tagowania' + # ignore_origin: 'Ignore origin rules' new_user: 'Dodaj użytkownika' reset: 'Reset' form: @@ -617,6 +618,8 @@ flashes: # otp_disabled: Two-factor authentication disabled # tagging_rules_imported: Tagging rules imported # tagging_rules_not_imported: Error while importing tagging rules + # ignore_origin_rules_deleted: 'Ignore origin rule deleted' + # ignore_origin_rules_updated: 'Ignore origin rule updated' entry: notice: entry_already_saved: 'Wpis już został dodany %date%' -- cgit v1.2.3 From 7408a6cb687959eac6bc7a2ed370695bbf88b6d6 Mon Sep 17 00:00:00 2001 From: Kevin Decherf Date: Tue, 27 Aug 2019 00:03:30 +0200 Subject: Add controller, views and translations for ignore origin instance rules Signed-off-by: Kevin Decherf --- src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml') diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml index fbf64f30..41977ede 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml @@ -33,6 +33,7 @@ menu: back_to_unread: 'Powrót do nieprzeczytanych artykułów' users_management: 'Zarządzanie użytkownikami' site_credentials: 'Poświadczenia strony' + # ignore_origin_instance_rules: 'Global ignore origin rules' quickstart: "Szybki start" top: add_new_entry: 'Dodaj nowy wpis' @@ -661,3 +662,8 @@ flashes: added: 'Poświadczenie dla "%host%" dodane' updated: 'Poświadczenie dla "%host%" zaktualizowane' deleted: 'Poświadczenie dla "%host%" usuniętę' + ignore_origin_instance_rule: + notice: + # added: 'Global ignore origin rule added' + # updated: 'Global ignore origin rule updated' + # deleted: 'Global ignore origin rule deleted' -- cgit v1.2.3 From 25c754f62f2230b76d357d6201432fa141f865f2 Mon Sep 17 00:00:00 2001 From: Kevin Decherf Date: Thu, 19 Sep 2019 23:14:10 +0200 Subject: views: Add doc and translations on ignore origin rules forms Signed-off-by: Kevin Decherf --- .../CoreBundle/Resources/translations/messages.pl.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml') diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml index 41977ede..c09ef47a 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml @@ -179,6 +179,24 @@ config: and: 'Jedna reguła I inna' matches: 'Sprawdź czy temat pasuje szukaj (duże lub małe litery).
Przykład: tytuł zawiera "piłka nożna"' notmatches: 'Sprawdź czy temat nie zawiera szukaj (duże lub małe litery).
Przykład: tytuł nie zawiera "piłka nożna"' + form_ignore_origin_rules: + # faq: + # title: 'FAQ' + # ignore_origin_rules_definition_title: 'What does « ignore origin rules » mean?' + # ignore_origin_rules_definition_description: 'They are used by wallabag to automatically ignore an origin address after a redirect.
If a redirect occurs while fetching a new entry, all the ignore origin rules (user defined and instance defined) will be used to ignore the origin address.' + # how_to_use_them_title: 'How do I use them?' + # how_to_use_them_description: 'Let us assume you want to ignore the origin of an entry coming from « rss.example.com » (knowing that after a redirect, the actual address is example.com).
In that case, you should put « host = "rss.example.com" » in the Rule field.' + # variables_available_title: 'Which variables and operators can I use to write rules?' + # variables_available_description: 'The following variables and operators can be used to create ignore origin rules:' + # meaning: 'Meaning' + # variable_description: + # label: 'Variable' + # host: 'Host of the address' + # _all: 'Full address, mainly for pattern matching' + # operator_description: + # label: 'Operator' + # equal_to: 'Equal to…' + # matches: 'Tests that a subject matches a search (case-insensitive).
Example: _all ~ "https?://rss.example.com/foobar/.*"' otp: # page_title: Two-factor authentication # app: -- cgit v1.2.3