From c675bd11c66e60a1976dfd66484448dcc9d80f0f Mon Sep 17 00:00:00 2001 From: Kevin Decherf Date: Sun, 23 Jun 2019 22:13:06 +0200 Subject: Add IgnoreOriginRule-related entities, db migration, update config Add IgnoreOriginUserRule for user-defined rules and IgnoreOriginInstanceRule for system-wide rules. Add an interface for these two new entities. Signed-off-by: Kevin Decherf --- src/Wallabag/CoreBundle/Resources/config/services.yml | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/Wallabag/CoreBundle/Resources') diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml index 3f3d4de7..4ece046a 100644 --- a/src/Wallabag/CoreBundle/Resources/config/services.yml +++ b/src/Wallabag/CoreBundle/Resources/config/services.yml @@ -131,6 +131,12 @@ services: calls: - [ setCrypto, [ "@wallabag_core.helper.crypto_proxy" ] ] + wallabag_core.ignore_origin_instance_rule_repository: + class: Wallabag\CoreBundle\Repository\IgnoreOriginInstanceRuleRepository + factory: [ "@doctrine.orm.default_entity_manager", getRepository ] + arguments: + - WallabagCoreBundle:IgnoreOriginInstanceRule + wallabag_core.helper.entries_export: class: Wallabag\CoreBundle\Helper\EntriesExport arguments: -- cgit v1.2.3 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 --- .../Resources/translations/messages.da.yml | 3 ++ .../Resources/translations/messages.de.yml | 3 ++ .../Resources/translations/messages.en.yml | 3 ++ .../Resources/translations/messages.es.yml | 3 ++ .../Resources/translations/messages.fa.yml | 3 ++ .../Resources/translations/messages.fr.yml | 6 +++ .../Resources/translations/messages.it.yml | 3 ++ .../Resources/translations/messages.oc.yml | 3 ++ .../Resources/translations/messages.pl.yml | 3 ++ .../Resources/translations/messages.pt.yml | 1 + .../Resources/translations/messages.ro.yml | 3 ++ .../Resources/translations/messages.ru.yml | 3 ++ .../Resources/translations/messages.th.yml | 3 ++ .../Resources/translations/messages.tr.yml | 3 ++ .../views/themes/baggy/Config/index.html.twig | 27 ++++++++++++ .../views/themes/material/Config/index.html.twig | 49 +++++++++++++++++++--- 16 files changed, 114 insertions(+), 5 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources') diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml index 4d525979..92440c92 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml @@ -59,6 +59,7 @@ config: user_info: 'Brugeroplysninger' password: 'Adgangskode' # rules: 'Tagging rules' + # ignore_origin: 'Ignore origin rules' new_user: 'Tilføj bruger' # 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%' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml index cd70c99f..7a9382cb 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml @@ -59,6 +59,7 @@ config: user_info: 'Benutzerinformation' password: 'Kennwort' rules: 'Tagging-Regeln' + # ignore_origin: 'Ignore origin rules' new_user: 'Benutzer hinzufügen' reset: 'Zurücksetzen' 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: 'Eintrag bereits am %date% gespeichert' 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%' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml index bced72e9..3e77afd6 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml @@ -59,6 +59,7 @@ config: user_info: 'Información de usuario' password: 'Contraseña' rules: 'Reglas de etiquetado automáticas' + # ignore_origin: 'Ignore origin rules' new_user: 'Añadir un usuario' reset: 'Reiniciar mi cuenta' form: @@ -617,6 +618,8 @@ flashes: # otp_disabled: Two-factor authentication disabled tagging_rules_imported: Reglas de etiquetado importadas tagging_rules_not_imported: Un error se ha producico en la importación de las reglas de etiquetado + # ignore_origin_rules_deleted: 'Ignore origin rule deleted' + # ignore_origin_rules_updated: 'Ignore origin rule updated' entry: notice: entry_already_saved: 'Artículo ya guardado el %fecha%' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml index 0704204a..38c252f7 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml @@ -59,6 +59,7 @@ config: user_info: 'اطلاعات کاربر' password: 'رمز' rules: 'برچسب‌گذاری خودکار' + # ignore_origin: 'Ignore origin rules' new_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: 'این مقاله در تاریخ %date% ذخیره شده بود' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml index 5d5878eb..b12dd9ca 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml @@ -59,6 +59,7 @@ config: user_info: "Mon compte" password: "Mot de passe" rules: "Règles de tag automatiques" + ignore_origin: "Règles d'omission d'origine" new_user: "Créer un compte" reset: "Réinitialisation" form: @@ -618,6 +619,11 @@ flashes: otp_disabled: "Authentification à double-facteur désactivée" tagging_rules_imported: Règles bien importées tagging_rules_not_imported: Impossible d'importer les règles +<<<<<<< HEAD +======= + ignore_origin_rules_deleted: "Règle d'omission d'origine supprimée" + ignore_origin_rules_updated: "Règle d'omission d'origine mise à jour" +>>>>>>> 4c595340... fixup! Add new Ignore Origin rules tab, update ConfigController entry: notice: entry_already_saved: "Article déjà sauvegardé le %date%" diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml index 23e72f20..eb44318b 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml @@ -59,6 +59,7 @@ config: user_info: 'Informazioni utente' password: 'Password' rules: 'Regole di etichettatura' + # ignore_origin: 'Ignore origin rules' new_user: 'Aggiungi utente' reset: 'Area di 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: 'Contenuto già salvato in data %date%' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml index 6ddff6ea..165186b1 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml @@ -59,6 +59,7 @@ config: user_info: 'Mon compte' password: 'Senhal' rules: "Règlas d'etiquetas automaticas" + # ignore_origin: 'Ignore origin rules' new_user: 'Crear un compte' reset: 'Zòna de reïnicializacion' form: @@ -617,6 +618,8 @@ flashes: # otp_disabled: Two-factor authentication disabled tagging_rules_imported: Règlas d’etiquetatge importadas tagging_rules_not_imported: Error en important las règlas d’etiquetatge + # ignore_origin_rules_deleted: 'Ignore origin rule deleted' + # ignore_origin_rules_updated: 'Ignore origin rule updated' entry: notice: entry_already_saved: 'Article ja salvagardat lo %date%' 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%' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml index d993cb05..93910d4b 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml @@ -59,6 +59,7 @@ config: user_info: 'Informação do Usuário' password: 'Senha' rules: 'Regras de tags' + # ignore_origin: 'Ignore origin rules' new_user: 'Adicionar um usuário' reset: 'Reiniciar minha conta' form: diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml index bc8b72e0..5984d229 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml @@ -59,6 +59,7 @@ config: user_info: 'Informații despre utilizator' password: 'Parolă' # rules: 'Tagging rules' + # ignore_origin: 'Ignore origin rules' new_user: 'Crează un utilizator' # reset: 'Reset area' form: @@ -616,6 +617,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%' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml index 2f7f55e5..a138ee5d 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml @@ -59,6 +59,7 @@ config: user_info: 'Информация о пользователе' password: 'Пароль' rules: 'Правила настройки простановки тегов' + # ignore_origin: 'Ignore origin rules' new_user: 'Добавить пользователя' reset: 'Сброс данных' form: @@ -616,6 +617,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: 'Запись была сохранена ранее %date%' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml index 48e1c34a..b786a73d 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml @@ -59,6 +59,7 @@ config: user_info: 'ข้อมูลผู้ใช้' password: 'รหัสผ่าน' rules: 'การแท็กข้อบังคับ' + # ignore_origin: 'Ignore origin rules' new_user: 'เพิ่มผู้ใช้' reset: 'รีเซ็ตพื้นที่ ' form: @@ -616,6 +617,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: 'รายการพร้อมบันทึกที่ %date%' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml index 19029c0b..a317c2f5 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml @@ -59,6 +59,7 @@ config: user_info: 'Kullanıcı bilgileri' password: 'Şifre' rules: 'Etiketleme kuralları' + # ignore_origin: 'Ignore origin rules' new_user: 'Bir kullanıcı ekle' # reset: 'Reset area' form: @@ -616,6 +617,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%' diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig index eb395eac..f182fda4 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig @@ -404,6 +404,33 @@ +

{{ 'config.tab_menu.ignore_origin'|trans }}

+ +
    + {% for ignore_origin_rule in app.user.config.ignoreOriginRules %} +
  • + {{ 'config.form_rules.if_label'|trans }} + « {{ ignore_origin_rule.rule }} » + ✎ + +
    • + {% endfor %} +
+ + {{ form_start(form.new_ignore_origin_user_rule) }} + {{ form_errors(form.new_ignore_origin_user_rule) }} + +
+
+ {{ form_label(form.new_ignore_origin_user_rule.rule) }} + {{ form_errors(form.new_ignore_origin_user_rule.rule) }} + {{ form_widget(form.new_ignore_origin_user_rule.rule) }} +
+
+ + {{ form_rest(form.new_ignore_origin_user_rule) }} + +

{{ 'config.reset.title'|trans }}

{{ 'config.reset.description'|trans }}

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig index c2e92ad1..faf9a424 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig @@ -16,7 +16,8 @@
  • {{ 'config.tab_menu.user_info'|trans }}
  • {{ 'config.tab_menu.password'|trans }}
  • {{ 'config.tab_menu.rules'|trans }}
    • -
  • {{ 'config.tab_menu.reset'|trans }}
    • +
  • {{ 'config.tab_menu.ignore_origin'|trans }}
    • +
  • {{ 'config.tab_menu.reset'|trans }}
    • @@ -294,11 +295,11 @@ « {{ tagging_rule.rule }} » {{ 'config.form_rules.then_tag_as_label'|trans }} « {{ tagging_rule.tags|join(', ') }} » - - mode_edit + + mode_edit - - delete + + delete {% endfor %} @@ -466,6 +467,44 @@
    + {% if app.user.config.ignoreOriginRules is not empty %} +
    +
    +
      + {% for ignore_origin_rule in app.user.config.ignoreOriginRules %} +
    • + {{ 'config.form_rules.if_label'|trans }} + « {{ ignore_origin_rule.rule }} » + + mode_edit + + + delete + +
      • + {% endfor %} +
    +
    +
    + {% endif %} + + {{ form_start(form.new_ignore_origin_user_rule) }} + {{ form_errors(form.new_ignore_origin_user_rule) }} + +
    +
    + {{ form_label(form.new_ignore_origin_user_rule.rule) }} + {{ form_errors(form.new_ignore_origin_user_rule.rule) }} + {{ form_widget(form.new_ignore_origin_user_rule.rule) }} +
    +
    + + {{ form_widget(form.new_ignore_origin_user_rule.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} + {{ form_rest(form.new_ignore_origin_user_rule) }} + +
    + +
    {{ 'config.reset.title'|trans }}

    {{ 'config.reset.description'|trans }}

    -- cgit v1.2.3 From f39c5a2a702036750b4d7c32d02e7f92955a4eed Mon Sep 17 00:00:00 2001 From: Kevin Decherf Date: Sun, 11 Aug 2019 23:51:55 +0200 Subject: Add new Helper to process Ignore Origin rules and RulerZ operator This commits adds a new helper like RuleBasedTagger for processing ignore origin rules. It also adds a new custom RulerZ operator for the '~' pattern matching rule. Renames 'pattern' with '_all' in IgnoreOriginRule entity. Signed-off-by: Kevin Decherf --- src/Wallabag/CoreBundle/Resources/config/services.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'src/Wallabag/CoreBundle/Resources') diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml index 4ece046a..8417ac35 100644 --- a/src/Wallabag/CoreBundle/Resources/config/services.yml +++ b/src/Wallabag/CoreBundle/Resources/config/services.yml @@ -92,6 +92,7 @@ services: arguments: - "@wallabag_core.graby" - "@wallabag_core.rule_based_tagger" + - "@wallabag_core.rule_based_ignore_origin_processor" - "@validator" - "@logger" - '%wallabag_core.fetching_error_message%' @@ -110,6 +111,13 @@ services: - "@wallabag_core.entry_repository" - "@logger" + wallabag_core.rule_based_ignore_origin_processor: + class: Wallabag\CoreBundle\Helper\RuleBasedIgnoreOriginProcessor + arguments: + - "@rulerz" + - "@logger" + - "@wallabag_core.ignore_origin_instance_rule_repository" + # repository as a service wallabag_core.entry_repository: class: Wallabag\CoreBundle\Repository\EntryRepository @@ -164,6 +172,11 @@ services: tags: - { name: rulerz.operator, target: doctrine, operator: notmatches, inline: true } + wallabag.operator.array.pattern_matches: + class: Wallabag\CoreBundle\Operator\PHP\PatternMatches + tags: + - { name: rulerz.operator, target: native, operator: "~" } + wallabag_core.helper.redirect: class: Wallabag\CoreBundle\Helper\Redirect arguments: -- 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.da.yml | 6 +++ .../Resources/translations/messages.de.yml | 6 +++ .../Resources/translations/messages.en.yml | 24 ++++++++++++ .../Resources/translations/messages.es.yml | 6 +++ .../Resources/translations/messages.fa.yml | 6 +++ .../Resources/translations/messages.fr.yml | 4 +- .../Resources/translations/messages.it.yml | 6 +++ .../Resources/translations/messages.oc.yml | 6 +++ .../Resources/translations/messages.pl.yml | 6 +++ .../Resources/translations/messages.pt.yml | 6 +++ .../Resources/translations/messages.ro.yml | 6 +++ .../Resources/translations/messages.ru.yml | 6 +++ .../Resources/translations/messages.th.yml | 6 +++ .../Resources/translations/messages.tr.yml | 6 +++ .../baggy/IgnoreOriginInstanceRule/edit.html.twig | 44 ++++++++++++++++++++++ .../baggy/IgnoreOriginInstanceRule/index.html.twig | 42 +++++++++++++++++++++ .../baggy/IgnoreOriginInstanceRule/new.html.twig | 37 ++++++++++++++++++ .../Resources/views/themes/baggy/layout.html.twig | 1 + .../IgnoreOriginInstanceRule/edit.html.twig | 44 ++++++++++++++++++++++ .../IgnoreOriginInstanceRule/index.html.twig | 42 +++++++++++++++++++++ .../IgnoreOriginInstanceRule/new.html.twig | 37 ++++++++++++++++++ .../views/themes/material/layout.html.twig | 6 ++- 22 files changed, 349 insertions(+), 4 deletions(-) create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/IgnoreOriginInstanceRule/edit.html.twig create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/IgnoreOriginInstanceRule/index.html.twig create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/IgnoreOriginInstanceRule/new.html.twig create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/material/IgnoreOriginInstanceRule/edit.html.twig create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/material/IgnoreOriginInstanceRule/index.html.twig create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/material/IgnoreOriginInstanceRule/new.html.twig (limited to 'src/Wallabag/CoreBundle/Resources') diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml index 92440c92..05ee0b10 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml @@ -33,6 +33,7 @@ menu: back_to_unread: 'Tilbage til de ulæste artikler' # users_management: 'Users management' # site_credentials: 'Site credentials' + # ignore_origin_instance_rules: 'Global ignore origin rules' # quickstart: "Quickstart" top: add_new_entry: 'Tilføj ny artikel' @@ -661,3 +662,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' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml index 7a9382cb..908be26e 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml @@ -33,6 +33,7 @@ menu: back_to_unread: 'Zurück zu ungelesenen Artikeln' users_management: 'Benutzerverwaltung' site_credentials: 'Zugangsdaten' + # ignore_origin_instance_rules: 'Global ignore origin rules' quickstart: "Schnelleinstieg" top: add_new_entry: 'Neuen Artikel hinzufügen' @@ -661,3 +662,8 @@ flashes: added: 'Zugangsdaten für "%host%" hinzugefügt' updated: 'Zugangsdaten für "%host%" aktualisiert' deleted: 'Zugangsdaten für "%host%" gelöscht' + ignore_origin_instance_rule: + notice: + # added: 'Global ignore origin rule added' + # updated: 'Global ignore origin rule updated' + # deleted: 'Global ignore origin rule deleted' 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' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml index 3e77afd6..4de4dcb5 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml @@ -33,6 +33,7 @@ menu: back_to_unread: 'Volver a los artículos sin leer' users_management: 'Configuración de usuarios' site_credentials: 'Credenciales del sitio' + # ignore_origin_instance_rules: 'Global ignore origin rules' quickstart: "Inicio rápido" top: add_new_entry: 'Añadir un nuevo artículo' @@ -661,3 +662,8 @@ flashes: added: 'Credenciales del sitio añadidas para "%host%"' updated: 'Credenciales del sitio actualizadas para "%host%"' deleted: 'Credenciales del sitio eliminadas para "%host%"' + ignore_origin_instance_rule: + notice: + # added: 'Global ignore origin rule added' + # updated: 'Global ignore origin rule updated' + # deleted: 'Global ignore origin rule deleted' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml index 38c252f7..32dcdb3c 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml @@ -33,6 +33,7 @@ menu: back_to_unread: 'بازگشت به خوانده‌نشده‌ها' # users_management: 'Users management' # site_credentials: 'Site credentials' + # ignore_origin_instance_rules: 'Global ignore origin rules' quickstart: "Quickstart" top: add_new_entry: 'افزودن مقالهٔ تازه' @@ -661,3 +662,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' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml index b12dd9ca..dfdf2083 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml @@ -33,6 +33,7 @@ menu: back_to_unread: "Retour aux articles non lus" users_management: "Gestion des utilisateurs" site_credentials: 'Accès aux sites' + ignore_origin_instance_rules: "Règles globales d'omission d'origine" quickstart: "Pour bien débuter" top: add_new_entry: "Sauvegarder un nouvel article" @@ -619,11 +620,8 @@ flashes: otp_disabled: "Authentification à double-facteur désactivée" tagging_rules_imported: Règles bien importées tagging_rules_not_imported: Impossible d'importer les règles -<<<<<<< HEAD -======= ignore_origin_rules_deleted: "Règle d'omission d'origine supprimée" ignore_origin_rules_updated: "Règle d'omission d'origine mise à jour" ->>>>>>> 4c595340... fixup! Add new Ignore Origin rules tab, update ConfigController entry: notice: entry_already_saved: "Article déjà sauvegardé le %date%" diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml index eb44318b..42a50ca5 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml @@ -33,6 +33,7 @@ menu: back_to_unread: 'Torna ai contenuti non letti' users_management: 'Gestione utenti' site_credentials: 'Credenziali sito' + # ignore_origin_instance_rules: 'Global ignore origin rules' quickstart: "Introduzione" top: add_new_entry: 'Aggiungi un nuovo contenuto' @@ -661,3 +662,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' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml index 165186b1..df3553c8 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml @@ -33,6 +33,7 @@ menu: back_to_unread: 'Tornar als articles pas legits' users_management: 'Gestion dels utilizaires' site_credentials: 'Identificants del site' + # ignore_origin_instance_rules: 'Global ignore origin rules' quickstart: "Per ben començar" top: add_new_entry: 'Enregistrar un novèl article' @@ -661,3 +662,8 @@ flashes: added: 'Identificant per "%host%" ajustat' updated: 'Identificant per "%host%" mes a jorn' deleted: 'Identificant per "%host%" suprimit' + ignore_origin_instance_rule: + notice: + # added: 'Global ignore origin rule added' + # updated: 'Global ignore origin rule updated' + # deleted: 'Global ignore origin rule deleted' 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' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml index 93910d4b..78918e15 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml @@ -33,6 +33,7 @@ menu: back_to_unread: 'Voltar para os artigos não lidos' users_management: 'Gestão de Usuários' site_credentials: 'Credenciais do site' + # ignore_origin_instance_rules: 'Global ignore origin rules' quickstart: "Começo Rápido" top: add_new_entry: 'Adicionar um novo artigo' @@ -658,3 +659,8 @@ flashes: added: 'Credencial do site para "%host%" foi adicionada' updated: 'Credencial do site pa "%host%" atualizada' deleted: 'Credencial do site pa "%host%" removida' + ignore_origin_instance_rule: + notice: + # added: 'Global ignore origin rule added' + # updated: 'Global ignore origin rule updated' + # deleted: 'Global ignore origin rule deleted' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml index 5984d229..5400187a 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml @@ -33,6 +33,7 @@ menu: back_to_unread: 'Înapoi la articolele necitite' # users_management: 'Users management' # site_credentials: 'Site credentials' + # ignore_origin_instance_rules: 'Global ignore origin rules' # quickstart: "Quickstart" top: add_new_entry: 'Introdu un nou articol' @@ -660,3 +661,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' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml index a138ee5d..ce803ecd 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml @@ -33,6 +33,7 @@ menu: back_to_unread: 'Назад к непрочитанным записям' users_management: 'Управление пользователями' site_credentials: 'Site credentials' + # ignore_origin_instance_rules: 'Global ignore origin rules' quickstart: "Быстрый старт" top: add_new_entry: 'Добавить новую запись' @@ -660,3 +661,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' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml index b786a73d..7c887781 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml @@ -33,6 +33,7 @@ menu: back_to_unread: 'กลับไปยังรายการที่ไม่ได้อ่าน' users_management: 'การจัดการผู้ใช้' site_credentials: 'การรับรองไซต์' + # ignore_origin_instance_rules: 'Global ignore origin rules' quickstart: "เริ่มแบบด่วน" top: add_new_entry: 'เพิ่มรายการใหม่' @@ -660,3 +661,8 @@ flashes: added: 'ไซต์ข้อมูลประจำตัวสำหรับ "%host%" ที่ทำการเพิ่ม' updated: 'ไซต์ข้อมูลประจำตัวสำหรับ "%host%" ที่ทำการอัปเดต' deleted: 'ไซต์ข้อมูลประจำตัวสำหรับ "%host%" ที่ทำการลบ' + ignore_origin_instance_rule: + notice: + # added: 'Global ignore origin rule added' + # updated: 'Global ignore origin rule updated' + # deleted: 'Global ignore origin rule deleted' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml index a317c2f5..f2ce40d9 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml @@ -33,6 +33,7 @@ menu: back_to_unread: 'Okunmayan makalelere geri dön' # users_management: 'Users management' # site_credentials: 'Site credentials' + # ignore_origin_instance_rules: 'Global ignore origin rules' quickstart: "Hızlı başlangıç" top: add_new_entry: 'Yeni bir makale ekle' @@ -660,3 +661,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' diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/IgnoreOriginInstanceRule/edit.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/IgnoreOriginInstanceRule/edit.html.twig new file mode 100644 index 00000000..ebb07d07 --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/IgnoreOriginInstanceRule/edit.html.twig @@ -0,0 +1,44 @@ +{% extends "WallabagCoreBundle::layout.html.twig" %} + +{% block title %}{{ 'ignore_origin_instance_rule.page_title'|trans }}{% endblock %} + +{% block content %} + +
    +
    +
    +
    +
    +

    {{ 'ignore_origin_instance_rule.edit_ignore_origin_instance_rule'|trans }}

    + +
    + {{ form_start(edit_form) }} + {{ form_errors(edit_form) }} + +
    +
    + {{ form_label(edit_form.rule) }} + {{ form_errors(edit_form.rule) }} + {{ form_widget(edit_form.rule) }} +
    +
    + +
    + + {{ form_widget(edit_form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} + {{ form_widget(edit_form._token) }} + +

    + {{ form_start(delete_form) }} + + {{ form_end(delete_form) }} +

    +

    {{ 'ignore_origin_instance_rule.form.back_to_list'|trans }}

    +
    +
    +
    +
    +
    +
    + +{% endblock %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/IgnoreOriginInstanceRule/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/IgnoreOriginInstanceRule/index.html.twig new file mode 100644 index 00000000..2de7cf0a --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/IgnoreOriginInstanceRule/index.html.twig @@ -0,0 +1,42 @@ +{% extends "WallabagCoreBundle::layout.html.twig" %} + +{% block title %}{{ 'ignore_origin_instance_rule.page_title'|trans }}{% endblock %} + +{% block content %} + +
    +
    +
    +
    +
    +

    {{ 'ignore_origin_instance_rule.description'|trans|raw }}

    + + + + + + + + + + {% for rule in rules %} + + + + + {% endfor %} + +
    {{ 'ignore_origin_instance_rule.form.rule_label'|trans }}{{ 'ignore_origin_instance_rule.list.actions'|trans }}
    {{ rule.rule }} + {{ 'ignore_origin_instance_rule.list.edit_action'|trans }} +
    +
    +

    + {{ 'ignore_origin_instance_rule.list.create_new_one'|trans }} +

    +
    +
    +
    +
    +
    + +{% endblock %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/IgnoreOriginInstanceRule/new.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/IgnoreOriginInstanceRule/new.html.twig new file mode 100644 index 00000000..fbe1f795 --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/IgnoreOriginInstanceRule/new.html.twig @@ -0,0 +1,37 @@ +{% extends "WallabagCoreBundle::layout.html.twig" %} + +{% block title %}{{ 'ignore_origin_instance_rule.page_title'|trans }}{% endblock %} + +{% block content %} + +
    +
    +
    +
    +
    +

    {{ 'ignore_origin_instance_rule.new_ignore_origin_instance_rule'|trans }}

    + +
    + {{ form_start(form) }} + {{ form_errors(form) }} + +
    +
    + {{ form_label(form.rule) }} + {{ form_errors(form.rule) }} + {{ form_widget(form.rule) }} +
    +
    + + {{ form_widget(form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} + {{ form_rest(form) }} + +

    {{ 'ignore_origin_instance_rule.form.back_to_list'|trans }}

    +
    +
    +
    +
    +
    +
    + +{% endblock %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig index 6b1e2bd7..e1446ff7 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig @@ -45,6 +45,7 @@ {% if is_granted('ROLE_SUPER_ADMIN') %}
  • {{ 'menu.left.users_management'|trans }}
  • {{ 'menu.left.internal_settings'|trans }}
    • +
  • {{ 'menu.left.ignore_origin_instance_rules'|trans }}
    • {% endif %}
  • {{ 'menu.left.import'|trans }}
  • {{ 'menu.left.howto'|trans }}
    • diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/IgnoreOriginInstanceRule/edit.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/IgnoreOriginInstanceRule/edit.html.twig new file mode 100644 index 00000000..ebb07d07 --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/IgnoreOriginInstanceRule/edit.html.twig @@ -0,0 +1,44 @@ +{% extends "WallabagCoreBundle::layout.html.twig" %} + +{% block title %}{{ 'ignore_origin_instance_rule.page_title'|trans }}{% endblock %} + +{% block content %} + +
    +
    +
    +
    +
    +

    {{ 'ignore_origin_instance_rule.edit_ignore_origin_instance_rule'|trans }}

    + +
    + {{ form_start(edit_form) }} + {{ form_errors(edit_form) }} + +
    +
    + {{ form_label(edit_form.rule) }} + {{ form_errors(edit_form.rule) }} + {{ form_widget(edit_form.rule) }} +
    +
    + +
    + + {{ form_widget(edit_form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} + {{ form_widget(edit_form._token) }} + +

    + {{ form_start(delete_form) }} + + {{ form_end(delete_form) }} +

    +

    {{ 'ignore_origin_instance_rule.form.back_to_list'|trans }}

    +
    +
    +
    +
    +
    +
    + +{% endblock %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/IgnoreOriginInstanceRule/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/IgnoreOriginInstanceRule/index.html.twig new file mode 100644 index 00000000..2de7cf0a --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/IgnoreOriginInstanceRule/index.html.twig @@ -0,0 +1,42 @@ +{% extends "WallabagCoreBundle::layout.html.twig" %} + +{% block title %}{{ 'ignore_origin_instance_rule.page_title'|trans }}{% endblock %} + +{% block content %} + +
    +
    +
    +
    +
    +

    {{ 'ignore_origin_instance_rule.description'|trans|raw }}

    + + + + + + + + + + {% for rule in rules %} + + + + + {% endfor %} + +
    {{ 'ignore_origin_instance_rule.form.rule_label'|trans }}{{ 'ignore_origin_instance_rule.list.actions'|trans }}
    {{ rule.rule }} + {{ 'ignore_origin_instance_rule.list.edit_action'|trans }} +
    +
    +

    + {{ 'ignore_origin_instance_rule.list.create_new_one'|trans }} +

    +
    +
    +
    +
    +
    + +{% endblock %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/IgnoreOriginInstanceRule/new.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/IgnoreOriginInstanceRule/new.html.twig new file mode 100644 index 00000000..fbe1f795 --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/IgnoreOriginInstanceRule/new.html.twig @@ -0,0 +1,37 @@ +{% extends "WallabagCoreBundle::layout.html.twig" %} + +{% block title %}{{ 'ignore_origin_instance_rule.page_title'|trans }}{% endblock %} + +{% block content %} + +
    +
    +
    +
    +
    +

    {{ 'ignore_origin_instance_rule.new_ignore_origin_instance_rule'|trans }}

    + +
    + {{ form_start(form) }} + {{ form_errors(form) }} + +
    +
    + {{ form_label(form.rule) }} + {{ form_errors(form.rule) }} + {{ form_widget(form.rule) }} +
    +
    + + {{ form_widget(form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} + {{ form_rest(form) }} + +

    {{ 'ignore_origin_instance_rule.form.back_to_list'|trans }}

    +
    +
    +
    +
    +
    +
    + +{% endblock %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig index c51d07fc..d9b6d190 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig @@ -78,9 +78,13 @@ {{ 'menu.left.users_management'|trans }} -
  • +
  • {{ 'menu.left.internal_settings'|trans }}
    • + +
  • + {{ 'menu.left.ignore_origin_instance_rules'|trans }} +
    • {% endif %}
  • {{ 'menu.left.import'|trans }} -- 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 --- .../Resources/translations/messages.da.yml | 18 +++++++++ .../Resources/translations/messages.de.yml | 18 +++++++++ .../Resources/translations/messages.en.yml | 18 +++++++++ .../Resources/translations/messages.es.yml | 18 +++++++++ .../Resources/translations/messages.fa.yml | 18 +++++++++ .../Resources/translations/messages.fr.yml | 18 +++++++++ .../Resources/translations/messages.it.yml | 18 +++++++++ .../Resources/translations/messages.oc.yml | 18 +++++++++ .../Resources/translations/messages.pl.yml | 18 +++++++++ .../Resources/translations/messages.pt.yml | 18 +++++++++ .../Resources/translations/messages.ro.yml | 18 +++++++++ .../Resources/translations/messages.ru.yml | 18 +++++++++ .../Resources/translations/messages.th.yml | 18 +++++++++ .../Resources/translations/messages.tr.yml | 18 +++++++++ .../views/themes/baggy/Config/index.html.twig | 43 +++++++++++++++++++++ .../baggy/IgnoreOriginInstanceRule/edit.html.twig | 43 +++++++++++++++++++++ .../baggy/IgnoreOriginInstanceRule/new.html.twig | 43 +++++++++++++++++++++ .../views/themes/material/Config/index.html.twig | 45 ++++++++++++++++++++++ .../IgnoreOriginInstanceRule/edit.html.twig | 43 +++++++++++++++++++++ .../IgnoreOriginInstanceRule/new.html.twig | 43 +++++++++++++++++++++ 20 files changed, 512 insertions(+) (limited to 'src/Wallabag/CoreBundle/Resources') diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml index 05ee0b10..54df2e64 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.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: diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml index 908be26e..549704d0 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml @@ -179,6 +179,24 @@ config: and: 'Eine Regel UND eine andere' matches: 'Testet, ob eine Variable auf eine Suche zutrifft (Groß- und Kleinschreibung wird nicht berücksichtigt).
    Beispiel: title matches "Fußball"' notmatches: 'Testet, ob ein Titel nicht auf eine Suche zutrifft (Groß- und Kleinschreibung wird nicht berücksichtigt).
    Beispiel: title notmatches "Fußball"' + 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: 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: diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml index 4de4dcb5..c3e3ba81 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml @@ -179,6 +179,24 @@ config: and: 'Una regla Y la otra' matches: 'Prueba si un sujeto corresponde a una búsqueda (insensible a mayúsculas).
    Ejemplo : title matches "fútbol"' notmatches: 'Prueba si subject no corresponde a una búsqueda (insensible a mayúsculas).
    Example: title notmatches "fútbol"' + 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: Autenticación de dos pasos app: diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml index 32dcdb3c..4a52a208 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.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: diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml index dfdf2083..2cfab8cf 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml @@ -179,6 +179,24 @@ config: and: "Une règle ET l’autre" matches: "Teste si un sujet correspond à une recherche (non sensible à la casse).
    Exemple : title matches \"football\"" notmatches: "Teste si un sujet ne correspond pas à une recherche (non sensible à la casse).
    Exemple : title notmatches \"football\"" + form_ignore_origin_rules: + faq: + title: "FAQ" + ignore_origin_rules_definition_title: "Que signifient les règles d'omission d'origine ?" + ignore_origin_rules_definition_description: "Ce sont des règles utilisées par wallabag pour omettre automatiquement l'adresse d'origine après une redirection.
    Si une redirection intervient pendant la récupération d'un nouvel article, toutes les règles d'omission (règles utilisateur et instance) seront utilisées afin d'ignorer ou non l'adresse d'origine." + how_to_use_them_title: "Comment les utiliser ?" + how_to_use_them_description: "Imaginons que vous vouliez omettre l'origine d'un article provenant de « rss.example.com » (sachant qu'après la redirection, l'adresse réelle est example.com).
    Dans ce cas, vous devriez mettre « host = \"rss.example.com\" » dans le champ Règle." + variables_available_title: "Quelles variables et opérateurs puis-je utiliser pour écrire des règles ?" + variables_available_description: "Les variables et opérateurs suivants peuvent être utilisés pour écrire des règles d'omission d'origine :" + meaning: "Signification" + variable_description: + label: "Variable" + host: "Hôte" + _all: "Adresse complète, utile pour les expressions régulières" + operator_description: + label: "Opérateur" + equal_to: "Égal à…" + matches: "Teste si un sujet correspond à une recherche (non sensible à la casse).
    Exemple : _all ~ \"https?://rss.example.com/foobar/.*\"" otp: page_title: Authentification double-facteur app: diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml index 42a50ca5..af1c1fe7 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml @@ -179,6 +179,24 @@ config: and: "Una regola E un'altra" matches: 'Verifica che un oggetto risulti in una ricerca (case-insensitive).
    Esempio: titolo contiene "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: diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml index df3553c8..59dd9b22 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml @@ -179,6 +179,24 @@ config: and: "Una règla E l'autra" matches: 'Teste se un subjècte correspond a una recèrca (non sensibla a la cassa).
    Exemple : title matches \"football\"' notmatches: 'Teste se subjècte correspond pas a una recèrca (sensibla a la cassa).
    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: Autentificacion en dos temps app: 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: diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml index 78918e15..293a4e44 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml @@ -179,6 +179,24 @@ config: and: 'Uma regra E outra' matches: 'Testa que um assunto corresponde a uma pesquisa (maiúscula ou minúscula).
    Exemplo: title matches "futebol"' notmatches: 'Testa que um assunto não corresponde a uma search (maiúscula ou minúscula).
    Exemplo: title notmatches "futebol"' + 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: Autenticação de dois fatores app: diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml index 5400187a..3c605709 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.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: diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml index ce803ecd..eead4ec6 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml @@ -179,6 +179,24 @@ config: and: 'Одно правило И другое' matches: 'Тесты, в которых тема соответствует поиску (без учета регистра). Пример: title matches "футбол" ' # 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: diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml index 7c887781..8d2b05f3 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml @@ -179,6 +179,24 @@ config: and: 'หนึ่งข้อบังคับและอื่นๆ' matches: 'ทดสอบว่า เรื่อง นี้ตรงกับ การต้นหา (กรณีไม่ทราบ).
    ตัวอย่าง: หัวข้อที่ตรงกับ "football"' 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: diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml index f2ce40d9..dfbc3010 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml @@ -179,6 +179,24 @@ config: and: 'Bir kural ve diğeri' # 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: diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig index f182fda4..b6edce39 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig @@ -431,6 +431,49 @@ {{ form_rest(form.new_ignore_origin_user_rule) }} +
    +
    +

    {{ 'config.form_ignore_origin_rules.faq.title'|trans }}

    + +
    {{ 'config.form_ignore_origin_rules.faq.ignore_origin_rules_definition_title'|trans }}
    +

    {{ 'config.form_ignore_origin_rules.faq.ignore_origin_rules_definition_description'|trans|raw }}

    + +
    {{ 'config.form_ignore_origin_rules.faq.how_to_use_them_title'|trans }}
    +

    {{ 'config.form_ignore_origin_rules.faq.how_to_use_them_description'|trans|raw }}

    + +
    {{ 'config.form_ignore_origin_rules.faq.variables_available_title'|trans }}
    +

    + {{ 'config.form_ignore_origin_rules.faq.variables_available_description'|trans }} +

    + + + + + + + + + + + + + + + + + + + + + + + + + +
    {{ 'config.form_ignore_origin_rules.faq.variable_description.label'|trans }}{{ 'config.form_ignore_origin_rules.faq.meaning'|trans }}{{ 'config.form_ignore_origin_rules.faq.operator_description.label'|trans }}{{ 'config.form_ignore_origin_rules.faq.meaning'|trans }}
    host{{ 'config.form_ignore_origin_rules.faq.variable_description.host'|trans }}={{ 'config.form_ignore_origin_rules.faq.operator_description.equal_to'|trans }}
    _all{{ 'config.form_ignore_origin_rules.faq.variable_description._all'|trans }}~{{ 'config.form_ignore_origin_rules.faq.operator_description.matches'|trans|raw }}
    +
    +
    +

    {{ 'config.reset.title'|trans }}

    {{ 'config.reset.description'|trans }}

    diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/IgnoreOriginInstanceRule/edit.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/IgnoreOriginInstanceRule/edit.html.twig index ebb07d07..30c2a520 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/IgnoreOriginInstanceRule/edit.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/IgnoreOriginInstanceRule/edit.html.twig @@ -37,6 +37,49 @@
    • + +
    +
    +

    {{ 'config.form_ignore_origin_rules.faq.title'|trans }}

    + +
    {{ 'config.form_ignore_origin_rules.faq.ignore_origin_rules_definition_title'|trans }}
    +

    {{ 'config.form_ignore_origin_rules.faq.ignore_origin_rules_definition_description'|trans|raw }}

    + +
    {{ 'config.form_ignore_origin_rules.faq.how_to_use_them_title'|trans }}
    +

    {{ 'config.form_ignore_origin_rules.faq.how_to_use_them_description'|trans|raw }}

    + +
    {{ 'config.form_ignore_origin_rules.faq.variables_available_title'|trans }}
    +

    + {{ 'config.form_ignore_origin_rules.faq.variables_available_description'|trans }} +

    + + + + + + + + + + + + + + + + + + + + + + + + + +
    {{ 'config.form_ignore_origin_rules.faq.variable_description.label'|trans }}{{ 'config.form_ignore_origin_rules.faq.meaning'|trans }}{{ 'config.form_ignore_origin_rules.faq.operator_description.label'|trans }}{{ 'config.form_ignore_origin_rules.faq.meaning'|trans }}
    host{{ 'config.form_ignore_origin_rules.faq.variable_description.host'|trans }}={{ 'config.form_ignore_origin_rules.faq.operator_description.equal_to'|trans }}
    _all{{ 'config.form_ignore_origin_rules.faq.variable_description._all'|trans }}~{{ 'config.form_ignore_origin_rules.faq.operator_description.matches'|trans|raw }}
    +
    +
    diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/IgnoreOriginInstanceRule/new.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/IgnoreOriginInstanceRule/new.html.twig index fbe1f795..cb052ff0 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/IgnoreOriginInstanceRule/new.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/IgnoreOriginInstanceRule/new.html.twig @@ -30,6 +30,49 @@ + +
    +
    +

    {{ 'config.form_ignore_origin_rules.faq.title'|trans }}

    + +
    {{ 'config.form_ignore_origin_rules.faq.ignore_origin_rules_definition_title'|trans }}
    +

    {{ 'config.form_ignore_origin_rules.faq.ignore_origin_rules_definition_description'|trans|raw }}

    + +
    {{ 'config.form_ignore_origin_rules.faq.how_to_use_them_title'|trans }}
    +

    {{ 'config.form_ignore_origin_rules.faq.how_to_use_them_description'|trans|raw }}

    + +
    {{ 'config.form_ignore_origin_rules.faq.variables_available_title'|trans }}
    +

    + {{ 'config.form_ignore_origin_rules.faq.variables_available_description'|trans }} +

    + + + + + + + + + + + + + + + + + + + + + + + + + +
    {{ 'config.form_ignore_origin_rules.faq.variable_description.label'|trans }}{{ 'config.form_ignore_origin_rules.faq.meaning'|trans }}{{ 'config.form_ignore_origin_rules.faq.operator_description.label'|trans }}{{ 'config.form_ignore_origin_rules.faq.meaning'|trans }}
    host{{ 'config.form_ignore_origin_rules.faq.variable_description.host'|trans }}={{ 'config.form_ignore_origin_rules.faq.operator_description.equal_to'|trans }}
    _all{{ 'config.form_ignore_origin_rules.faq.variable_description._all'|trans }}~{{ 'config.form_ignore_origin_rules.faq.operator_description.matches'|trans|raw }}
    +
    +
    diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig index faf9a424..22b38a1b 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig @@ -502,6 +502,51 @@ {{ form_widget(form.new_ignore_origin_user_rule.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} {{ form_rest(form.new_ignore_origin_user_rule) }} + + + +
    +
    +

    {{ 'config.form_ignore_origin_rules.faq.title'|trans }}

    + +
    {{ 'config.form_ignore_origin_rules.faq.ignore_origin_rules_definition_title'|trans }}
    +

    {{ 'config.form_ignore_origin_rules.faq.ignore_origin_rules_definition_description'|trans|raw }}

    + +
    {{ 'config.form_ignore_origin_rules.faq.how_to_use_them_title'|trans }}
    +

    {{ 'config.form_ignore_origin_rules.faq.how_to_use_them_description'|trans|raw }}

    + +
    {{ 'config.form_ignore_origin_rules.faq.variables_available_title'|trans }}
    +

    + {{ 'config.form_ignore_origin_rules.faq.variables_available_description'|trans }} +

    + + + + + + + + + + + + + + + + + + + + + + + + + +
    {{ 'config.form_ignore_origin_rules.faq.variable_description.label'|trans }}{{ 'config.form_ignore_origin_rules.faq.meaning'|trans }}{{ 'config.form_ignore_origin_rules.faq.operator_description.label'|trans }}{{ 'config.form_ignore_origin_rules.faq.meaning'|trans }}
    host{{ 'config.form_ignore_origin_rules.faq.variable_description.host'|trans }}={{ 'config.form_ignore_origin_rules.faq.operator_description.equal_to'|trans }}
    _all{{ 'config.form_ignore_origin_rules.faq.variable_description._all'|trans }}~{{ 'config.form_ignore_origin_rules.faq.operator_description.matches'|trans|raw }}
    +
    +
    diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/IgnoreOriginInstanceRule/edit.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/IgnoreOriginInstanceRule/edit.html.twig index ebb07d07..30c2a520 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/IgnoreOriginInstanceRule/edit.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/IgnoreOriginInstanceRule/edit.html.twig @@ -37,6 +37,49 @@
    + +
    +
    +

    {{ 'config.form_ignore_origin_rules.faq.title'|trans }}

    + +
    {{ 'config.form_ignore_origin_rules.faq.ignore_origin_rules_definition_title'|trans }}
    +

    {{ 'config.form_ignore_origin_rules.faq.ignore_origin_rules_definition_description'|trans|raw }}

    + +
    {{ 'config.form_ignore_origin_rules.faq.how_to_use_them_title'|trans }}
    +

    {{ 'config.form_ignore_origin_rules.faq.how_to_use_them_description'|trans|raw }}

    + +
    {{ 'config.form_ignore_origin_rules.faq.variables_available_title'|trans }}
    +

    + {{ 'config.form_ignore_origin_rules.faq.variables_available_description'|trans }} +

    + + + + + + + + + + + + + + + + + + + + + + + + + +
    {{ 'config.form_ignore_origin_rules.faq.variable_description.label'|trans }}{{ 'config.form_ignore_origin_rules.faq.meaning'|trans }}{{ 'config.form_ignore_origin_rules.faq.operator_description.label'|trans }}{{ 'config.form_ignore_origin_rules.faq.meaning'|trans }}
    host{{ 'config.form_ignore_origin_rules.faq.variable_description.host'|trans }}={{ 'config.form_ignore_origin_rules.faq.operator_description.equal_to'|trans }}
    _all{{ 'config.form_ignore_origin_rules.faq.variable_description._all'|trans }}~{{ 'config.form_ignore_origin_rules.faq.operator_description.matches'|trans|raw }}
    +
    +
    diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/IgnoreOriginInstanceRule/new.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/IgnoreOriginInstanceRule/new.html.twig index fbe1f795..cb052ff0 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/IgnoreOriginInstanceRule/new.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/IgnoreOriginInstanceRule/new.html.twig @@ -30,6 +30,49 @@ + +
    +
    +

    {{ 'config.form_ignore_origin_rules.faq.title'|trans }}

    + +
    {{ 'config.form_ignore_origin_rules.faq.ignore_origin_rules_definition_title'|trans }}
    +

    {{ 'config.form_ignore_origin_rules.faq.ignore_origin_rules_definition_description'|trans|raw }}

    + +
    {{ 'config.form_ignore_origin_rules.faq.how_to_use_them_title'|trans }}
    +

    {{ 'config.form_ignore_origin_rules.faq.how_to_use_them_description'|trans|raw }}

    + +
    {{ 'config.form_ignore_origin_rules.faq.variables_available_title'|trans }}
    +

    + {{ 'config.form_ignore_origin_rules.faq.variables_available_description'|trans }} +

    + + + + + + + + + + + + + + + + + + + + + + + + + +
    {{ 'config.form_ignore_origin_rules.faq.variable_description.label'|trans }}{{ 'config.form_ignore_origin_rules.faq.meaning'|trans }}{{ 'config.form_ignore_origin_rules.faq.operator_description.label'|trans }}{{ 'config.form_ignore_origin_rules.faq.meaning'|trans }}
    host{{ 'config.form_ignore_origin_rules.faq.variable_description.host'|trans }}={{ 'config.form_ignore_origin_rules.faq.operator_description.equal_to'|trans }}
    _all{{ 'config.form_ignore_origin_rules.faq.variable_description._all'|trans }}~{{ 'config.form_ignore_origin_rules.faq.operator_description.matches'|trans|raw }}
    +
    +
    -- cgit v1.2.3