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.en.yml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/Wallabag/CoreBundle/Resources/translations/messages.en.yml') diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml index 1bc32423..b16662c3 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml @@ -59,6 +59,7 @@ config: user_info: 'User information' password: 'Password' rules: 'Tagging rules' + ignore_origin: 'Ignore origin rules' new_user: 'Add a user' reset: 'Reset area' 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: 'Entry already saved on %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 --- .../Resources/translations/messages.en.yml | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'src/Wallabag/CoreBundle/Resources/translations/messages.en.yml') diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml index b16662c3..d831a2aa 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml @@ -33,6 +33,7 @@ menu: back_to_unread: 'Back to unread articles' users_management: 'Users management' site_credentials: 'Site credentials' + ignore_origin_instance_rules: 'Global ignore origin rules' quickstart: "Quickstart" top: add_new_entry: 'Add a new entry' @@ -595,6 +596,24 @@ site_credential: delete_confirm: Are you sure? back_to_list: Back to list +ignore_origin_instance_rule: + page_title: Global ignore origin rules + new_ignore_origin_instance_rule: Create a global ignore origin rule + edit_ignore_origin_instance_rule: Edit an existing ignore origin rule + description: "Here you can manage the global ignore origin rules used to ignore some patterns of origin url." + list: + actions: Actions + edit_action: Edit + yes: Yes + no: No + create_new_one: Create a new global ignore origin rule + form: + rule_label: Rule + save: Save + delete: Delete + delete_confirm: Are you sure? + back_to_list: Back to list + error: page_title: An error occurred @@ -661,3 +680,8 @@ flashes: added: 'Site credential for "%host%" added' updated: 'Site credential for "%host%" updated' deleted: 'Site credential for "%host%" deleted' + 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.en.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'src/Wallabag/CoreBundle/Resources/translations/messages.en.yml') diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml index d831a2aa..a68a7d7d 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml @@ -179,6 +179,24 @@ config: and: 'One rule AND another' matches: 'Tests that a subject matches a search (case-insensitive).
Example: title matches "football"' notmatches: 'Tests that a subject doesn''t match match a search (case-insensitive).
Example: title notmatches "football"' + 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