diff options
author | Kevin Decherf <kevin@kdecherf.com> | 2020-04-26 15:39:57 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-26 15:39:57 +0200 |
commit | 0e8a0f77d0b643a884e6687bd9c463267852a970 (patch) | |
tree | 88c6761b4215637bba34b263015e87750c92a187 /src/Wallabag/CoreBundle/Resources | |
parent | 8a8a78a64c116caf81aaa4339906298bdc0e32e0 (diff) | |
parent | 71f7e58fbd84e1d15c7a405a3c5872adb937dc37 (diff) | |
download | wallabag-0e8a0f77d0b643a884e6687bd9c463267852a970.tar.gz wallabag-0e8a0f77d0b643a884e6687bd9c463267852a970.tar.zst wallabag-0e8a0f77d0b643a884e6687bd9c463267852a970.zip |
Merge pull request #4026 from wallabag/3760-ignorelist-db
Move Ignore Origin rules to database
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources')
25 files changed, 991 insertions, 6 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml index 3f3d4de7..8417ac35 100644 --- a/src/Wallabag/CoreBundle/Resources/config/services.yml +++ b/src/Wallabag/CoreBundle/Resources/config/services.yml | |||
@@ -92,6 +92,7 @@ services: | |||
92 | arguments: | 92 | arguments: |
93 | - "@wallabag_core.graby" | 93 | - "@wallabag_core.graby" |
94 | - "@wallabag_core.rule_based_tagger" | 94 | - "@wallabag_core.rule_based_tagger" |
95 | - "@wallabag_core.rule_based_ignore_origin_processor" | ||
95 | - "@validator" | 96 | - "@validator" |
96 | - "@logger" | 97 | - "@logger" |
97 | - '%wallabag_core.fetching_error_message%' | 98 | - '%wallabag_core.fetching_error_message%' |
@@ -110,6 +111,13 @@ services: | |||
110 | - "@wallabag_core.entry_repository" | 111 | - "@wallabag_core.entry_repository" |
111 | - "@logger" | 112 | - "@logger" |
112 | 113 | ||
114 | wallabag_core.rule_based_ignore_origin_processor: | ||
115 | class: Wallabag\CoreBundle\Helper\RuleBasedIgnoreOriginProcessor | ||
116 | arguments: | ||
117 | - "@rulerz" | ||
118 | - "@logger" | ||
119 | - "@wallabag_core.ignore_origin_instance_rule_repository" | ||
120 | |||
113 | # repository as a service | 121 | # repository as a service |
114 | wallabag_core.entry_repository: | 122 | wallabag_core.entry_repository: |
115 | class: Wallabag\CoreBundle\Repository\EntryRepository | 123 | class: Wallabag\CoreBundle\Repository\EntryRepository |
@@ -131,6 +139,12 @@ services: | |||
131 | calls: | 139 | calls: |
132 | - [ setCrypto, [ "@wallabag_core.helper.crypto_proxy" ] ] | 140 | - [ setCrypto, [ "@wallabag_core.helper.crypto_proxy" ] ] |
133 | 141 | ||
142 | wallabag_core.ignore_origin_instance_rule_repository: | ||
143 | class: Wallabag\CoreBundle\Repository\IgnoreOriginInstanceRuleRepository | ||
144 | factory: [ "@doctrine.orm.default_entity_manager", getRepository ] | ||
145 | arguments: | ||
146 | - WallabagCoreBundle:IgnoreOriginInstanceRule | ||
147 | |||
134 | wallabag_core.helper.entries_export: | 148 | wallabag_core.helper.entries_export: |
135 | class: Wallabag\CoreBundle\Helper\EntriesExport | 149 | class: Wallabag\CoreBundle\Helper\EntriesExport |
136 | arguments: | 150 | arguments: |
@@ -158,6 +172,11 @@ services: | |||
158 | tags: | 172 | tags: |
159 | - { name: rulerz.operator, target: doctrine, operator: notmatches, inline: true } | 173 | - { name: rulerz.operator, target: doctrine, operator: notmatches, inline: true } |
160 | 174 | ||
175 | wallabag.operator.array.pattern_matches: | ||
176 | class: Wallabag\CoreBundle\Operator\PHP\PatternMatches | ||
177 | tags: | ||
178 | - { name: rulerz.operator, target: native, operator: "~" } | ||
179 | |||
161 | wallabag_core.helper.redirect: | 180 | wallabag_core.helper.redirect: |
162 | class: Wallabag\CoreBundle\Helper\Redirect | 181 | class: Wallabag\CoreBundle\Helper\Redirect |
163 | arguments: | 182 | arguments: |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml index 4d525979..54df2e64 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml | |||
@@ -33,6 +33,7 @@ menu: | |||
33 | back_to_unread: 'Tilbage til de ulæste artikler' | 33 | back_to_unread: 'Tilbage til de ulæste artikler' |
34 | # users_management: 'Users management' | 34 | # users_management: 'Users management' |
35 | # site_credentials: 'Site credentials' | 35 | # site_credentials: 'Site credentials' |
36 | # ignore_origin_instance_rules: 'Global ignore origin rules' | ||
36 | # quickstart: "Quickstart" | 37 | # quickstart: "Quickstart" |
37 | top: | 38 | top: |
38 | add_new_entry: 'Tilføj ny artikel' | 39 | add_new_entry: 'Tilføj ny artikel' |
@@ -59,6 +60,7 @@ config: | |||
59 | user_info: 'Brugeroplysninger' | 60 | user_info: 'Brugeroplysninger' |
60 | password: 'Adgangskode' | 61 | password: 'Adgangskode' |
61 | # rules: 'Tagging rules' | 62 | # rules: 'Tagging rules' |
63 | # ignore_origin: 'Ignore origin rules' | ||
62 | new_user: 'Tilføj bruger' | 64 | new_user: 'Tilføj bruger' |
63 | # reset: 'Reset area' | 65 | # reset: 'Reset area' |
64 | form: | 66 | form: |
@@ -177,6 +179,24 @@ config: | |||
177 | # and: 'One rule AND another' | 179 | # and: 'One rule AND another' |
178 | # matches: 'Tests that a <i>subject</i> matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches "football"</code>' | 180 | # matches: 'Tests that a <i>subject</i> matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches "football"</code>' |
179 | # notmatches: 'Tests that a <i>subject</i> doesn''t match match a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>' | 181 | # notmatches: 'Tests that a <i>subject</i> doesn''t match match a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>' |
182 | form_ignore_origin_rules: | ||
183 | # faq: | ||
184 | # title: 'FAQ' | ||
185 | # ignore_origin_rules_definition_title: 'What does « ignore origin rules » mean?' | ||
186 | # ignore_origin_rules_definition_description: 'They are used by wallabag to automatically ignore an origin address after a redirect.<br />If a redirect occurs while fetching a new entry, all the ignore origin rules (<i>user defined and instance defined</i>) will be used to ignore the origin address.' | ||
187 | # how_to_use_them_title: 'How do I use them?' | ||
188 | # how_to_use_them_description: 'Let us assume you want to ignore the origin of an entry coming from « <i>rss.example.com</i> » (<i>knowing that after a redirect, the actual address is example.com</i>).<br />In that case, you should put « host = "rss.example.com" » in the <i>Rule</i> field.' | ||
189 | # variables_available_title: 'Which variables and operators can I use to write rules?' | ||
190 | # variables_available_description: 'The following variables and operators can be used to create ignore origin rules:' | ||
191 | # meaning: 'Meaning' | ||
192 | # variable_description: | ||
193 | # label: 'Variable' | ||
194 | # host: 'Host of the address' | ||
195 | # _all: 'Full address, mainly for pattern matching' | ||
196 | # operator_description: | ||
197 | # label: 'Operator' | ||
198 | # equal_to: 'Equal to…' | ||
199 | # matches: 'Tests that a <i>subject</i> matches a <i>search</i> (case-insensitive).<br />Example: <code>_all ~ "https?://rss.example.com/foobar/.*"</code>' | ||
180 | otp: | 200 | otp: |
181 | # page_title: Two-factor authentication | 201 | # page_title: Two-factor authentication |
182 | # app: | 202 | # app: |
@@ -617,6 +637,8 @@ flashes: | |||
617 | # otp_disabled: Two-factor authentication disabled | 637 | # otp_disabled: Two-factor authentication disabled |
618 | # tagging_rules_imported: Tagging rules imported | 638 | # tagging_rules_imported: Tagging rules imported |
619 | # tagging_rules_not_imported: Error while importing tagging rules | 639 | # tagging_rules_not_imported: Error while importing tagging rules |
640 | # ignore_origin_rules_deleted: 'Ignore origin rule deleted' | ||
641 | # ignore_origin_rules_updated: 'Ignore origin rule updated' | ||
620 | entry: | 642 | entry: |
621 | notice: | 643 | notice: |
622 | # entry_already_saved: 'Entry already saved on %date%' | 644 | # entry_already_saved: 'Entry already saved on %date%' |
@@ -658,3 +680,8 @@ flashes: | |||
658 | # added: 'Site credential for "%host%" added' | 680 | # added: 'Site credential for "%host%" added' |
659 | # updated: 'Site credential for "%host%" updated' | 681 | # updated: 'Site credential for "%host%" updated' |
660 | # deleted: 'Site credential for "%host%" deleted' | 682 | # deleted: 'Site credential for "%host%" deleted' |
683 | ignore_origin_instance_rule: | ||
684 | notice: | ||
685 | # added: 'Global ignore origin rule added' | ||
686 | # updated: 'Global ignore origin rule updated' | ||
687 | # 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 cd70c99f..549704d0 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml | |||
@@ -33,6 +33,7 @@ menu: | |||
33 | back_to_unread: 'Zurück zu ungelesenen Artikeln' | 33 | back_to_unread: 'Zurück zu ungelesenen Artikeln' |
34 | users_management: 'Benutzerverwaltung' | 34 | users_management: 'Benutzerverwaltung' |
35 | site_credentials: 'Zugangsdaten' | 35 | site_credentials: 'Zugangsdaten' |
36 | # ignore_origin_instance_rules: 'Global ignore origin rules' | ||
36 | quickstart: "Schnelleinstieg" | 37 | quickstart: "Schnelleinstieg" |
37 | top: | 38 | top: |
38 | add_new_entry: 'Neuen Artikel hinzufügen' | 39 | add_new_entry: 'Neuen Artikel hinzufügen' |
@@ -59,6 +60,7 @@ config: | |||
59 | user_info: 'Benutzerinformation' | 60 | user_info: 'Benutzerinformation' |
60 | password: 'Kennwort' | 61 | password: 'Kennwort' |
61 | rules: 'Tagging-Regeln' | 62 | rules: 'Tagging-Regeln' |
63 | # ignore_origin: 'Ignore origin rules' | ||
62 | new_user: 'Benutzer hinzufügen' | 64 | new_user: 'Benutzer hinzufügen' |
63 | reset: 'Zurücksetzen' | 65 | reset: 'Zurücksetzen' |
64 | form: | 66 | form: |
@@ -177,6 +179,24 @@ config: | |||
177 | and: 'Eine Regel UND eine andere' | 179 | and: 'Eine Regel UND eine andere' |
178 | matches: 'Testet, ob eine <i>Variable</i> auf eine <i>Suche</i> zutrifft (Groß- und Kleinschreibung wird nicht berücksichtigt).<br />Beispiel: <code>title matches "Fußball"</code>' | 180 | matches: 'Testet, ob eine <i>Variable</i> auf eine <i>Suche</i> zutrifft (Groß- und Kleinschreibung wird nicht berücksichtigt).<br />Beispiel: <code>title matches "Fußball"</code>' |
179 | notmatches: 'Testet, ob ein <i>Titel</i> nicht auf eine <i>Suche</i> zutrifft (Groß- und Kleinschreibung wird nicht berücksichtigt).<br />Beispiel: <code>title notmatches "Fußball"</code>' | 181 | notmatches: 'Testet, ob ein <i>Titel</i> nicht auf eine <i>Suche</i> zutrifft (Groß- und Kleinschreibung wird nicht berücksichtigt).<br />Beispiel: <code>title notmatches "Fußball"</code>' |
182 | form_ignore_origin_rules: | ||
183 | # faq: | ||
184 | # title: 'FAQ' | ||
185 | # ignore_origin_rules_definition_title: 'What does « ignore origin rules » mean?' | ||
186 | # ignore_origin_rules_definition_description: 'They are used by wallabag to automatically ignore an origin address after a redirect.<br />If a redirect occurs while fetching a new entry, all the ignore origin rules (<i>user defined and instance defined</i>) will be used to ignore the origin address.' | ||
187 | # how_to_use_them_title: 'How do I use them?' | ||
188 | # how_to_use_them_description: 'Let us assume you want to ignore the origin of an entry coming from « <i>rss.example.com</i> » (<i>knowing that after a redirect, the actual address is example.com</i>).<br />In that case, you should put « host = "rss.example.com" » in the <i>Rule</i> field.' | ||
189 | # variables_available_title: 'Which variables and operators can I use to write rules?' | ||
190 | # variables_available_description: 'The following variables and operators can be used to create ignore origin rules:' | ||
191 | # meaning: 'Meaning' | ||
192 | # variable_description: | ||
193 | # label: 'Variable' | ||
194 | # host: 'Host of the address' | ||
195 | # _all: 'Full address, mainly for pattern matching' | ||
196 | # operator_description: | ||
197 | # label: 'Operator' | ||
198 | # equal_to: 'Equal to…' | ||
199 | # matches: 'Tests that a <i>subject</i> matches a <i>search</i> (case-insensitive).<br />Example: <code>_all ~ "https?://rss.example.com/foobar/.*"</code>' | ||
180 | otp: | 200 | otp: |
181 | # page_title: Two-factor authentication | 201 | # page_title: Two-factor authentication |
182 | # app: | 202 | # app: |
@@ -617,6 +637,8 @@ flashes: | |||
617 | # otp_disabled: Two-factor authentication disabled | 637 | # otp_disabled: Two-factor authentication disabled |
618 | # tagging_rules_imported: Tagging rules imported | 638 | # tagging_rules_imported: Tagging rules imported |
619 | # tagging_rules_not_imported: Error while importing tagging rules | 639 | # tagging_rules_not_imported: Error while importing tagging rules |
640 | # ignore_origin_rules_deleted: 'Ignore origin rule deleted' | ||
641 | # ignore_origin_rules_updated: 'Ignore origin rule updated' | ||
620 | entry: | 642 | entry: |
621 | notice: | 643 | notice: |
622 | entry_already_saved: 'Eintrag bereits am %date% gespeichert' | 644 | entry_already_saved: 'Eintrag bereits am %date% gespeichert' |
@@ -658,3 +680,8 @@ flashes: | |||
658 | added: 'Zugangsdaten für "%host%" hinzugefügt' | 680 | added: 'Zugangsdaten für "%host%" hinzugefügt' |
659 | updated: 'Zugangsdaten für "%host%" aktualisiert' | 681 | updated: 'Zugangsdaten für "%host%" aktualisiert' |
660 | deleted: 'Zugangsdaten für "%host%" gelöscht' | 682 | deleted: 'Zugangsdaten für "%host%" gelöscht' |
683 | ignore_origin_instance_rule: | ||
684 | notice: | ||
685 | # added: 'Global ignore origin rule added' | ||
686 | # updated: 'Global ignore origin rule updated' | ||
687 | # 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 1bc32423..a68a7d7d 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml | |||
@@ -33,6 +33,7 @@ menu: | |||
33 | back_to_unread: 'Back to unread articles' | 33 | back_to_unread: 'Back to unread articles' |
34 | users_management: 'Users management' | 34 | users_management: 'Users management' |
35 | site_credentials: 'Site credentials' | 35 | site_credentials: 'Site credentials' |
36 | ignore_origin_instance_rules: 'Global ignore origin rules' | ||
36 | quickstart: "Quickstart" | 37 | quickstart: "Quickstart" |
37 | top: | 38 | top: |
38 | add_new_entry: 'Add a new entry' | 39 | add_new_entry: 'Add a new entry' |
@@ -59,6 +60,7 @@ config: | |||
59 | user_info: 'User information' | 60 | user_info: 'User information' |
60 | password: 'Password' | 61 | password: 'Password' |
61 | rules: 'Tagging rules' | 62 | rules: 'Tagging rules' |
63 | ignore_origin: 'Ignore origin rules' | ||
62 | new_user: 'Add a user' | 64 | new_user: 'Add a user' |
63 | reset: 'Reset area' | 65 | reset: 'Reset area' |
64 | form: | 66 | form: |
@@ -177,6 +179,24 @@ config: | |||
177 | and: 'One rule AND another' | 179 | and: 'One rule AND another' |
178 | matches: 'Tests that a <i>subject</i> matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches "football"</code>' | 180 | matches: 'Tests that a <i>subject</i> matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches "football"</code>' |
179 | notmatches: 'Tests that a <i>subject</i> doesn''t match match a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>' | 181 | notmatches: 'Tests that a <i>subject</i> doesn''t match match a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>' |
182 | form_ignore_origin_rules: | ||
183 | faq: | ||
184 | title: 'FAQ' | ||
185 | ignore_origin_rules_definition_title: 'What does « ignore origin rules » mean?' | ||
186 | ignore_origin_rules_definition_description: 'They are used by wallabag to automatically ignore an origin address after a redirect.<br />If a redirect occurs while fetching a new entry, all the ignore origin rules (<i>user defined and instance defined</i>) will be used to ignore the origin address.' | ||
187 | how_to_use_them_title: 'How do I use them?' | ||
188 | how_to_use_them_description: 'Let us assume you want to ignore the origin of an entry coming from « <i>rss.example.com</i> » (<i>knowing that after a redirect, the actual address is example.com</i>).<br />In that case, you should put « host = "rss.example.com" » in the <i>Rule</i> field.' | ||
189 | variables_available_title: 'Which variables and operators can I use to write rules?' | ||
190 | variables_available_description: 'The following variables and operators can be used to create ignore origin rules:' | ||
191 | meaning: 'Meaning' | ||
192 | variable_description: | ||
193 | label: 'Variable' | ||
194 | host: 'Host of the address' | ||
195 | _all: 'Full address, mainly for pattern matching' | ||
196 | operator_description: | ||
197 | label: 'Operator' | ||
198 | equal_to: 'Equal to…' | ||
199 | matches: 'Tests that a <i>subject</i> matches a <i>search</i> (case-insensitive).<br />Example: <code>_all ~ "https?://rss.example.com/foobar/.*"</code>' | ||
180 | otp: | 200 | otp: |
181 | page_title: Two-factor authentication | 201 | page_title: Two-factor authentication |
182 | app: | 202 | app: |
@@ -594,6 +614,24 @@ site_credential: | |||
594 | delete_confirm: Are you sure? | 614 | delete_confirm: Are you sure? |
595 | back_to_list: Back to list | 615 | back_to_list: Back to list |
596 | 616 | ||
617 | ignore_origin_instance_rule: | ||
618 | page_title: Global ignore origin rules | ||
619 | new_ignore_origin_instance_rule: Create a global ignore origin rule | ||
620 | edit_ignore_origin_instance_rule: Edit an existing ignore origin rule | ||
621 | description: "Here you can manage the global ignore origin rules used to ignore some patterns of origin url." | ||
622 | list: | ||
623 | actions: Actions | ||
624 | edit_action: Edit | ||
625 | yes: Yes | ||
626 | no: No | ||
627 | create_new_one: Create a new global ignore origin rule | ||
628 | form: | ||
629 | rule_label: Rule | ||
630 | save: Save | ||
631 | delete: Delete | ||
632 | delete_confirm: Are you sure? | ||
633 | back_to_list: Back to list | ||
634 | |||
597 | error: | 635 | error: |
598 | page_title: An error occurred | 636 | page_title: An error occurred |
599 | 637 | ||
@@ -617,6 +655,8 @@ flashes: | |||
617 | otp_disabled: Two-factor authentication disabled | 655 | otp_disabled: Two-factor authentication disabled |
618 | tagging_rules_imported: Tagging rules imported | 656 | tagging_rules_imported: Tagging rules imported |
619 | tagging_rules_not_imported: Error while importing tagging rules | 657 | tagging_rules_not_imported: Error while importing tagging rules |
658 | ignore_origin_rules_deleted: 'Ignore origin rule deleted' | ||
659 | ignore_origin_rules_updated: 'Ignore origin rule updated' | ||
620 | entry: | 660 | entry: |
621 | notice: | 661 | notice: |
622 | entry_already_saved: 'Entry already saved on %date%' | 662 | entry_already_saved: 'Entry already saved on %date%' |
@@ -658,3 +698,8 @@ flashes: | |||
658 | added: 'Site credential for "%host%" added' | 698 | added: 'Site credential for "%host%" added' |
659 | updated: 'Site credential for "%host%" updated' | 699 | updated: 'Site credential for "%host%" updated' |
660 | deleted: 'Site credential for "%host%" deleted' | 700 | deleted: 'Site credential for "%host%" deleted' |
701 | ignore_origin_instance_rule: | ||
702 | notice: | ||
703 | added: 'Global ignore origin rule added' | ||
704 | updated: 'Global ignore origin rule updated' | ||
705 | 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 bced72e9..c3e3ba81 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml | |||
@@ -33,6 +33,7 @@ menu: | |||
33 | back_to_unread: 'Volver a los artículos sin leer' | 33 | back_to_unread: 'Volver a los artículos sin leer' |
34 | users_management: 'Configuración de usuarios' | 34 | users_management: 'Configuración de usuarios' |
35 | site_credentials: 'Credenciales del sitio' | 35 | site_credentials: 'Credenciales del sitio' |
36 | # ignore_origin_instance_rules: 'Global ignore origin rules' | ||
36 | quickstart: "Inicio rápido" | 37 | quickstart: "Inicio rápido" |
37 | top: | 38 | top: |
38 | add_new_entry: 'Añadir un nuevo artículo' | 39 | add_new_entry: 'Añadir un nuevo artículo' |
@@ -59,6 +60,7 @@ config: | |||
59 | user_info: 'Información de usuario' | 60 | user_info: 'Información de usuario' |
60 | password: 'Contraseña' | 61 | password: 'Contraseña' |
61 | rules: 'Reglas de etiquetado automáticas' | 62 | rules: 'Reglas de etiquetado automáticas' |
63 | # ignore_origin: 'Ignore origin rules' | ||
62 | new_user: 'Añadir un usuario' | 64 | new_user: 'Añadir un usuario' |
63 | reset: 'Reiniciar mi cuenta' | 65 | reset: 'Reiniciar mi cuenta' |
64 | form: | 66 | form: |
@@ -177,6 +179,24 @@ config: | |||
177 | and: 'Una regla Y la otra' | 179 | and: 'Una regla Y la otra' |
178 | matches: 'Prueba si un <i>sujeto</i> corresponde a una <i>búsqueda</i> (insensible a mayúsculas).<br />Ejemplo : <code>title matches "fútbol"</code>' | 180 | matches: 'Prueba si un <i>sujeto</i> corresponde a una <i>búsqueda</i> (insensible a mayúsculas).<br />Ejemplo : <code>title matches "fútbol"</code>' |
179 | notmatches: 'Prueba si <i>subject</i> no corresponde a una <i>búsqueda</i> (insensible a mayúsculas).<br />Example: <code>title notmatches "fútbol"</code>' | 181 | notmatches: 'Prueba si <i>subject</i> no corresponde a una <i>búsqueda</i> (insensible a mayúsculas).<br />Example: <code>title notmatches "fútbol"</code>' |
182 | form_ignore_origin_rules: | ||
183 | # faq: | ||
184 | # title: 'FAQ' | ||
185 | # ignore_origin_rules_definition_title: 'What does « ignore origin rules » mean?' | ||
186 | # ignore_origin_rules_definition_description: 'They are used by wallabag to automatically ignore an origin address after a redirect.<br />If a redirect occurs while fetching a new entry, all the ignore origin rules (<i>user defined and instance defined</i>) will be used to ignore the origin address.' | ||
187 | # how_to_use_them_title: 'How do I use them?' | ||
188 | # how_to_use_them_description: 'Let us assume you want to ignore the origin of an entry coming from « <i>rss.example.com</i> » (<i>knowing that after a redirect, the actual address is example.com</i>).<br />In that case, you should put « host = "rss.example.com" » in the <i>Rule</i> field.' | ||
189 | # variables_available_title: 'Which variables and operators can I use to write rules?' | ||
190 | # variables_available_description: 'The following variables and operators can be used to create ignore origin rules:' | ||
191 | # meaning: 'Meaning' | ||
192 | # variable_description: | ||
193 | # label: 'Variable' | ||
194 | # host: 'Host of the address' | ||
195 | # _all: 'Full address, mainly for pattern matching' | ||
196 | # operator_description: | ||
197 | # label: 'Operator' | ||
198 | # equal_to: 'Equal to…' | ||
199 | # matches: 'Tests that a <i>subject</i> matches a <i>search</i> (case-insensitive).<br />Example: <code>_all ~ "https?://rss.example.com/foobar/.*"</code>' | ||
180 | otp: | 200 | otp: |
181 | page_title: Autenticación de dos pasos | 201 | page_title: Autenticación de dos pasos |
182 | app: | 202 | app: |
@@ -617,6 +637,8 @@ flashes: | |||
617 | # otp_disabled: Two-factor authentication disabled | 637 | # otp_disabled: Two-factor authentication disabled |
618 | tagging_rules_imported: Reglas de etiquetado importadas | 638 | tagging_rules_imported: Reglas de etiquetado importadas |
619 | tagging_rules_not_imported: Un error se ha producico en la importación de las reglas de etiquetado | 639 | tagging_rules_not_imported: Un error se ha producico en la importación de las reglas de etiquetado |
640 | # ignore_origin_rules_deleted: 'Ignore origin rule deleted' | ||
641 | # ignore_origin_rules_updated: 'Ignore origin rule updated' | ||
620 | entry: | 642 | entry: |
621 | notice: | 643 | notice: |
622 | entry_already_saved: 'Artículo ya guardado el %fecha%' | 644 | entry_already_saved: 'Artículo ya guardado el %fecha%' |
@@ -658,3 +680,8 @@ flashes: | |||
658 | added: 'Credenciales del sitio añadidas para "%host%"' | 680 | added: 'Credenciales del sitio añadidas para "%host%"' |
659 | updated: 'Credenciales del sitio actualizadas para "%host%"' | 681 | updated: 'Credenciales del sitio actualizadas para "%host%"' |
660 | deleted: 'Credenciales del sitio eliminadas para "%host%"' | 682 | deleted: 'Credenciales del sitio eliminadas para "%host%"' |
683 | ignore_origin_instance_rule: | ||
684 | notice: | ||
685 | # added: 'Global ignore origin rule added' | ||
686 | # updated: 'Global ignore origin rule updated' | ||
687 | # 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 0704204a..4a52a208 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml | |||
@@ -33,6 +33,7 @@ menu: | |||
33 | back_to_unread: 'بازگشت به خواندهنشدهها' | 33 | back_to_unread: 'بازگشت به خواندهنشدهها' |
34 | # users_management: 'Users management' | 34 | # users_management: 'Users management' |
35 | # site_credentials: 'Site credentials' | 35 | # site_credentials: 'Site credentials' |
36 | # ignore_origin_instance_rules: 'Global ignore origin rules' | ||
36 | quickstart: "Quickstart" | 37 | quickstart: "Quickstart" |
37 | top: | 38 | top: |
38 | add_new_entry: 'افزودن مقالهٔ تازه' | 39 | add_new_entry: 'افزودن مقالهٔ تازه' |
@@ -59,6 +60,7 @@ config: | |||
59 | user_info: 'اطلاعات کاربر' | 60 | user_info: 'اطلاعات کاربر' |
60 | password: 'رمز' | 61 | password: 'رمز' |
61 | rules: 'برچسبگذاری خودکار' | 62 | rules: 'برچسبگذاری خودکار' |
63 | # ignore_origin: 'Ignore origin rules' | ||
62 | new_user: 'افزودن کاربر' | 64 | new_user: 'افزودن کاربر' |
63 | # reset: 'Reset area' | 65 | # reset: 'Reset area' |
64 | form: | 66 | form: |
@@ -177,6 +179,24 @@ config: | |||
177 | # and: 'One rule AND another' | 179 | # and: 'One rule AND another' |
178 | # matches: 'Tests that a <i>subject</i> matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches "football"</code>' | 180 | # matches: 'Tests that a <i>subject</i> matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches "football"</code>' |
179 | # notmatches: 'Tests that a <i>subject</i> doesn''t match match a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>' | 181 | # notmatches: 'Tests that a <i>subject</i> doesn''t match match a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>' |
182 | form_ignore_origin_rules: | ||
183 | # faq: | ||
184 | # title: 'FAQ' | ||
185 | # ignore_origin_rules_definition_title: 'What does « ignore origin rules » mean?' | ||
186 | # ignore_origin_rules_definition_description: 'They are used by wallabag to automatically ignore an origin address after a redirect.<br />If a redirect occurs while fetching a new entry, all the ignore origin rules (<i>user defined and instance defined</i>) will be used to ignore the origin address.' | ||
187 | # how_to_use_them_title: 'How do I use them?' | ||
188 | # how_to_use_them_description: 'Let us assume you want to ignore the origin of an entry coming from « <i>rss.example.com</i> » (<i>knowing that after a redirect, the actual address is example.com</i>).<br />In that case, you should put « host = "rss.example.com" » in the <i>Rule</i> field.' | ||
189 | # variables_available_title: 'Which variables and operators can I use to write rules?' | ||
190 | # variables_available_description: 'The following variables and operators can be used to create ignore origin rules:' | ||
191 | # meaning: 'Meaning' | ||
192 | # variable_description: | ||
193 | # label: 'Variable' | ||
194 | # host: 'Host of the address' | ||
195 | # _all: 'Full address, mainly for pattern matching' | ||
196 | # operator_description: | ||
197 | # label: 'Operator' | ||
198 | # equal_to: 'Equal to…' | ||
199 | # matches: 'Tests that a <i>subject</i> matches a <i>search</i> (case-insensitive).<br />Example: <code>_all ~ "https?://rss.example.com/foobar/.*"</code>' | ||
180 | otp: | 200 | otp: |
181 | # page_title: Two-factor authentication | 201 | # page_title: Two-factor authentication |
182 | # app: | 202 | # app: |
@@ -617,6 +637,8 @@ flashes: | |||
617 | # otp_disabled: Two-factor authentication disabled | 637 | # otp_disabled: Two-factor authentication disabled |
618 | # tagging_rules_imported: Tagging rules imported | 638 | # tagging_rules_imported: Tagging rules imported |
619 | # tagging_rules_not_imported: Error while importing tagging rules | 639 | # tagging_rules_not_imported: Error while importing tagging rules |
640 | # ignore_origin_rules_deleted: 'Ignore origin rule deleted' | ||
641 | # ignore_origin_rules_updated: 'Ignore origin rule updated' | ||
620 | entry: | 642 | entry: |
621 | notice: | 643 | notice: |
622 | entry_already_saved: 'این مقاله در تاریخ %date% ذخیره شده بود' | 644 | entry_already_saved: 'این مقاله در تاریخ %date% ذخیره شده بود' |
@@ -658,3 +680,8 @@ flashes: | |||
658 | # added: 'Site credential for "%host%" added' | 680 | # added: 'Site credential for "%host%" added' |
659 | # updated: 'Site credential for "%host%" updated' | 681 | # updated: 'Site credential for "%host%" updated' |
660 | # deleted: 'Site credential for "%host%" deleted' | 682 | # deleted: 'Site credential for "%host%" deleted' |
683 | ignore_origin_instance_rule: | ||
684 | notice: | ||
685 | # added: 'Global ignore origin rule added' | ||
686 | # updated: 'Global ignore origin rule updated' | ||
687 | # 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 5d5878eb..2cfab8cf 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml | |||
@@ -33,6 +33,7 @@ menu: | |||
33 | back_to_unread: "Retour aux articles non lus" | 33 | back_to_unread: "Retour aux articles non lus" |
34 | users_management: "Gestion des utilisateurs" | 34 | users_management: "Gestion des utilisateurs" |
35 | site_credentials: 'Accès aux sites' | 35 | site_credentials: 'Accès aux sites' |
36 | ignore_origin_instance_rules: "Règles globales d'omission d'origine" | ||
36 | quickstart: "Pour bien débuter" | 37 | quickstart: "Pour bien débuter" |
37 | top: | 38 | top: |
38 | add_new_entry: "Sauvegarder un nouvel article" | 39 | add_new_entry: "Sauvegarder un nouvel article" |
@@ -59,6 +60,7 @@ config: | |||
59 | user_info: "Mon compte" | 60 | user_info: "Mon compte" |
60 | password: "Mot de passe" | 61 | password: "Mot de passe" |
61 | rules: "Règles de tag automatiques" | 62 | rules: "Règles de tag automatiques" |
63 | ignore_origin: "Règles d'omission d'origine" | ||
62 | new_user: "Créer un compte" | 64 | new_user: "Créer un compte" |
63 | reset: "Réinitialisation" | 65 | reset: "Réinitialisation" |
64 | form: | 66 | form: |
@@ -177,6 +179,24 @@ config: | |||
177 | and: "Une règle ET l’autre" | 179 | and: "Une règle ET l’autre" |
178 | matches: "Teste si un <i>sujet</i> correspond à une <i>recherche</i> (non sensible à la casse).<br />Exemple : <code>title matches \"football\"</code>" | 180 | matches: "Teste si un <i>sujet</i> correspond à une <i>recherche</i> (non sensible à la casse).<br />Exemple : <code>title matches \"football\"</code>" |
179 | notmatches: "Teste si un <i>sujet</i> ne correspond pas à une <i>recherche</i> (non sensible à la casse).<br />Exemple : <code>title notmatches \"football\"</code>" | 181 | notmatches: "Teste si un <i>sujet</i> ne correspond pas à une <i>recherche</i> (non sensible à la casse).<br />Exemple : <code>title notmatches \"football\"</code>" |
182 | form_ignore_origin_rules: | ||
183 | faq: | ||
184 | title: "FAQ" | ||
185 | ignore_origin_rules_definition_title: "Que signifient les règles d'omission d'origine ?" | ||
186 | 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.<br />Si une redirection intervient pendant la récupération d'un nouvel article, toutes les règles d'omission (<i>règles utilisateur et instance</i>) seront utilisées afin d'ignorer ou non l'adresse d'origine." | ||
187 | how_to_use_them_title: "Comment les utiliser ?" | ||
188 | how_to_use_them_description: "Imaginons que vous vouliez omettre l'origine d'un article provenant de « <i>rss.example.com</i> » (<i>sachant qu'après la redirection, l'adresse réelle est example.com</i>).<br />Dans ce cas, vous devriez mettre « host = \"rss.example.com\" » dans le champ <i>Règle</i>." | ||
189 | variables_available_title: "Quelles variables et opérateurs puis-je utiliser pour écrire des règles ?" | ||
190 | variables_available_description: "Les variables et opérateurs suivants peuvent être utilisés pour écrire des règles d'omission d'origine :" | ||
191 | meaning: "Signification" | ||
192 | variable_description: | ||
193 | label: "Variable" | ||
194 | host: "Hôte" | ||
195 | _all: "Adresse complète, utile pour les expressions régulières" | ||
196 | operator_description: | ||
197 | label: "Opérateur" | ||
198 | equal_to: "Égal à…" | ||
199 | matches: "Teste si un <i>sujet</i> correspond à une <i>recherche</i> (non sensible à la casse).<br />Exemple : <code>_all ~ \"https?://rss.example.com/foobar/.*\"</code>" | ||
180 | otp: | 200 | otp: |
181 | page_title: Authentification double-facteur | 201 | page_title: Authentification double-facteur |
182 | app: | 202 | app: |
@@ -618,6 +638,8 @@ flashes: | |||
618 | otp_disabled: "Authentification à double-facteur désactivée" | 638 | otp_disabled: "Authentification à double-facteur désactivée" |
619 | tagging_rules_imported: Règles bien importées | 639 | tagging_rules_imported: Règles bien importées |
620 | tagging_rules_not_imported: Impossible d'importer les règles | 640 | tagging_rules_not_imported: Impossible d'importer les règles |
641 | ignore_origin_rules_deleted: "Règle d'omission d'origine supprimée" | ||
642 | ignore_origin_rules_updated: "Règle d'omission d'origine mise à jour" | ||
621 | entry: | 643 | entry: |
622 | notice: | 644 | notice: |
623 | entry_already_saved: "Article déjà sauvegardé le %date%" | 645 | 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..af1c1fe7 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml | |||
@@ -33,6 +33,7 @@ menu: | |||
33 | back_to_unread: 'Torna ai contenuti non letti' | 33 | back_to_unread: 'Torna ai contenuti non letti' |
34 | users_management: 'Gestione utenti' | 34 | users_management: 'Gestione utenti' |
35 | site_credentials: 'Credenziali sito' | 35 | site_credentials: 'Credenziali sito' |
36 | # ignore_origin_instance_rules: 'Global ignore origin rules' | ||
36 | quickstart: "Introduzione" | 37 | quickstart: "Introduzione" |
37 | top: | 38 | top: |
38 | add_new_entry: 'Aggiungi un nuovo contenuto' | 39 | add_new_entry: 'Aggiungi un nuovo contenuto' |
@@ -59,6 +60,7 @@ config: | |||
59 | user_info: 'Informazioni utente' | 60 | user_info: 'Informazioni utente' |
60 | password: 'Password' | 61 | password: 'Password' |
61 | rules: 'Regole di etichettatura' | 62 | rules: 'Regole di etichettatura' |
63 | # ignore_origin: 'Ignore origin rules' | ||
62 | new_user: 'Aggiungi utente' | 64 | new_user: 'Aggiungi utente' |
63 | reset: 'Area di reset' | 65 | reset: 'Area di reset' |
64 | form: | 66 | form: |
@@ -177,6 +179,24 @@ config: | |||
177 | and: "Una regola E un'altra" | 179 | and: "Una regola E un'altra" |
178 | matches: 'Verifica che un <i>oggetto</i> risulti in una <i>ricerca</i> (case-insensitive).<br />Esempio: <code>titolo contiene "football"</code>' | 180 | matches: 'Verifica che un <i>oggetto</i> risulti in una <i>ricerca</i> (case-insensitive).<br />Esempio: <code>titolo contiene "football"</code>' |
179 | # notmatches: 'Tests that a <i>subject</i> doesn''t match match a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>' | 181 | # notmatches: 'Tests that a <i>subject</i> doesn''t match match a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>' |
182 | form_ignore_origin_rules: | ||
183 | # faq: | ||
184 | # title: 'FAQ' | ||
185 | # ignore_origin_rules_definition_title: 'What does « ignore origin rules » mean?' | ||
186 | # ignore_origin_rules_definition_description: 'They are used by wallabag to automatically ignore an origin address after a redirect.<br />If a redirect occurs while fetching a new entry, all the ignore origin rules (<i>user defined and instance defined</i>) will be used to ignore the origin address.' | ||
187 | # how_to_use_them_title: 'How do I use them?' | ||
188 | # how_to_use_them_description: 'Let us assume you want to ignore the origin of an entry coming from « <i>rss.example.com</i> » (<i>knowing that after a redirect, the actual address is example.com</i>).<br />In that case, you should put « host = "rss.example.com" » in the <i>Rule</i> field.' | ||
189 | # variables_available_title: 'Which variables and operators can I use to write rules?' | ||
190 | # variables_available_description: 'The following variables and operators can be used to create ignore origin rules:' | ||
191 | # meaning: 'Meaning' | ||
192 | # variable_description: | ||
193 | # label: 'Variable' | ||
194 | # host: 'Host of the address' | ||
195 | # _all: 'Full address, mainly for pattern matching' | ||
196 | # operator_description: | ||
197 | # label: 'Operator' | ||
198 | # equal_to: 'Equal to…' | ||
199 | # matches: 'Tests that a <i>subject</i> matches a <i>search</i> (case-insensitive).<br />Example: <code>_all ~ "https?://rss.example.com/foobar/.*"</code>' | ||
180 | otp: | 200 | otp: |
181 | # page_title: Two-factor authentication | 201 | # page_title: Two-factor authentication |
182 | # app: | 202 | # app: |
@@ -617,6 +637,8 @@ flashes: | |||
617 | # otp_disabled: Two-factor authentication disabled | 637 | # otp_disabled: Two-factor authentication disabled |
618 | # tagging_rules_imported: Tagging rules imported | 638 | # tagging_rules_imported: Tagging rules imported |
619 | # tagging_rules_not_imported: Error while importing tagging rules | 639 | # tagging_rules_not_imported: Error while importing tagging rules |
640 | # ignore_origin_rules_deleted: 'Ignore origin rule deleted' | ||
641 | # ignore_origin_rules_updated: 'Ignore origin rule updated' | ||
620 | entry: | 642 | entry: |
621 | notice: | 643 | notice: |
622 | entry_already_saved: 'Contenuto già salvato in data %date%' | 644 | entry_already_saved: 'Contenuto già salvato in data %date%' |
@@ -658,3 +680,8 @@ flashes: | |||
658 | # added: 'Site credential for "%host%" added' | 680 | # added: 'Site credential for "%host%" added' |
659 | # updated: 'Site credential for "%host%" updated' | 681 | # updated: 'Site credential for "%host%" updated' |
660 | # deleted: 'Site credential for "%host%" deleted' | 682 | # deleted: 'Site credential for "%host%" deleted' |
683 | ignore_origin_instance_rule: | ||
684 | notice: | ||
685 | # added: 'Global ignore origin rule added' | ||
686 | # updated: 'Global ignore origin rule updated' | ||
687 | # 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 6ddff6ea..59dd9b22 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml | |||
@@ -33,6 +33,7 @@ menu: | |||
33 | back_to_unread: 'Tornar als articles pas legits' | 33 | back_to_unread: 'Tornar als articles pas legits' |
34 | users_management: 'Gestion dels utilizaires' | 34 | users_management: 'Gestion dels utilizaires' |
35 | site_credentials: 'Identificants del site' | 35 | site_credentials: 'Identificants del site' |
36 | # ignore_origin_instance_rules: 'Global ignore origin rules' | ||
36 | quickstart: "Per ben començar" | 37 | quickstart: "Per ben començar" |
37 | top: | 38 | top: |
38 | add_new_entry: 'Enregistrar un novèl article' | 39 | add_new_entry: 'Enregistrar un novèl article' |
@@ -59,6 +60,7 @@ config: | |||
59 | user_info: 'Mon compte' | 60 | user_info: 'Mon compte' |
60 | password: 'Senhal' | 61 | password: 'Senhal' |
61 | rules: "Règlas d'etiquetas automaticas" | 62 | rules: "Règlas d'etiquetas automaticas" |
63 | # ignore_origin: 'Ignore origin rules' | ||
62 | new_user: 'Crear un compte' | 64 | new_user: 'Crear un compte' |
63 | reset: 'Zòna de reïnicializacion' | 65 | reset: 'Zòna de reïnicializacion' |
64 | form: | 66 | form: |
@@ -177,6 +179,24 @@ config: | |||
177 | and: "Una règla E l'autra" | 179 | and: "Una règla E l'autra" |
178 | matches: 'Teste se un <i>subjècte</i> correspond a una <i>recèrca</i> (non sensibla a la cassa).<br />Exemple : <code>title matches \"football\"</code>' | 180 | matches: 'Teste se un <i>subjècte</i> correspond a una <i>recèrca</i> (non sensibla a la cassa).<br />Exemple : <code>title matches \"football\"</code>' |
179 | notmatches: 'Teste se <i>subjècte</i> correspond pas a una <i>recèrca</i> (sensibla a la cassa).<br />Example : <code>title notmatches "football"</code>' | 181 | notmatches: 'Teste se <i>subjècte</i> correspond pas a una <i>recèrca</i> (sensibla a la cassa).<br />Example : <code>title notmatches "football"</code>' |
182 | form_ignore_origin_rules: | ||
183 | # faq: | ||
184 | # title: 'FAQ' | ||
185 | # ignore_origin_rules_definition_title: 'What does « ignore origin rules » mean?' | ||
186 | # ignore_origin_rules_definition_description: 'They are used by wallabag to automatically ignore an origin address after a redirect.<br />If a redirect occurs while fetching a new entry, all the ignore origin rules (<i>user defined and instance defined</i>) will be used to ignore the origin address.' | ||
187 | # how_to_use_them_title: 'How do I use them?' | ||
188 | # how_to_use_them_description: 'Let us assume you want to ignore the origin of an entry coming from « <i>rss.example.com</i> » (<i>knowing that after a redirect, the actual address is example.com</i>).<br />In that case, you should put « host = "rss.example.com" » in the <i>Rule</i> field.' | ||
189 | # variables_available_title: 'Which variables and operators can I use to write rules?' | ||
190 | # variables_available_description: 'The following variables and operators can be used to create ignore origin rules:' | ||
191 | # meaning: 'Meaning' | ||
192 | # variable_description: | ||
193 | # label: 'Variable' | ||
194 | # host: 'Host of the address' | ||
195 | # _all: 'Full address, mainly for pattern matching' | ||
196 | # operator_description: | ||
197 | # label: 'Operator' | ||
198 | # equal_to: 'Equal to…' | ||
199 | # matches: 'Tests that a <i>subject</i> matches a <i>search</i> (case-insensitive).<br />Example: <code>_all ~ "https?://rss.example.com/foobar/.*"</code>' | ||
180 | otp: | 200 | otp: |
181 | page_title: Autentificacion en dos temps | 201 | page_title: Autentificacion en dos temps |
182 | app: | 202 | app: |
@@ -617,6 +637,8 @@ flashes: | |||
617 | # otp_disabled: Two-factor authentication disabled | 637 | # otp_disabled: Two-factor authentication disabled |
618 | tagging_rules_imported: Règlas d’etiquetatge importadas | 638 | tagging_rules_imported: Règlas d’etiquetatge importadas |
619 | tagging_rules_not_imported: Error en important las règlas d’etiquetatge | 639 | tagging_rules_not_imported: Error en important las règlas d’etiquetatge |
640 | # ignore_origin_rules_deleted: 'Ignore origin rule deleted' | ||
641 | # ignore_origin_rules_updated: 'Ignore origin rule updated' | ||
620 | entry: | 642 | entry: |
621 | notice: | 643 | notice: |
622 | entry_already_saved: 'Article ja salvagardat lo %date%' | 644 | entry_already_saved: 'Article ja salvagardat lo %date%' |
@@ -658,3 +680,8 @@ flashes: | |||
658 | added: 'Identificant per "%host%" ajustat' | 680 | added: 'Identificant per "%host%" ajustat' |
659 | updated: 'Identificant per "%host%" mes a jorn' | 681 | updated: 'Identificant per "%host%" mes a jorn' |
660 | deleted: 'Identificant per "%host%" suprimit' | 682 | deleted: 'Identificant per "%host%" suprimit' |
683 | ignore_origin_instance_rule: | ||
684 | notice: | ||
685 | # added: 'Global ignore origin rule added' | ||
686 | # updated: 'Global ignore origin rule updated' | ||
687 | # 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 770477c9..c09ef47a 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml | |||
@@ -33,6 +33,7 @@ menu: | |||
33 | back_to_unread: 'Powrót do nieprzeczytanych artykułów' | 33 | back_to_unread: 'Powrót do nieprzeczytanych artykułów' |
34 | users_management: 'Zarządzanie użytkownikami' | 34 | users_management: 'Zarządzanie użytkownikami' |
35 | site_credentials: 'Poświadczenia strony' | 35 | site_credentials: 'Poświadczenia strony' |
36 | # ignore_origin_instance_rules: 'Global ignore origin rules' | ||
36 | quickstart: "Szybki start" | 37 | quickstart: "Szybki start" |
37 | top: | 38 | top: |
38 | add_new_entry: 'Dodaj nowy wpis' | 39 | add_new_entry: 'Dodaj nowy wpis' |
@@ -59,6 +60,7 @@ config: | |||
59 | user_info: 'Informacje o użytkowniku' | 60 | user_info: 'Informacje o użytkowniku' |
60 | password: 'Hasło' | 61 | password: 'Hasło' |
61 | rules: 'Zasady tagowania' | 62 | rules: 'Zasady tagowania' |
63 | # ignore_origin: 'Ignore origin rules' | ||
62 | new_user: 'Dodaj użytkownika' | 64 | new_user: 'Dodaj użytkownika' |
63 | reset: 'Reset' | 65 | reset: 'Reset' |
64 | form: | 66 | form: |
@@ -177,6 +179,24 @@ config: | |||
177 | and: 'Jedna reguła I inna' | 179 | and: 'Jedna reguła I inna' |
178 | matches: 'Sprawdź czy <i>temat</i> pasuje <i>szukaj</i> (duże lub małe litery).<br />Przykład: <code>tytuł zawiera "piłka nożna"</code>' | 180 | matches: 'Sprawdź czy <i>temat</i> pasuje <i>szukaj</i> (duże lub małe litery).<br />Przykład: <code>tytuł zawiera "piłka nożna"</code>' |
179 | notmatches: 'Sprawdź czy <i>temat</i> nie zawiera <i>szukaj</i> (duże lub małe litery).<br />Przykład: <code>tytuł nie zawiera "piłka nożna"</code>' | 181 | notmatches: 'Sprawdź czy <i>temat</i> nie zawiera <i>szukaj</i> (duże lub małe litery).<br />Przykład: <code>tytuł nie zawiera "piłka nożna"</code>' |
182 | form_ignore_origin_rules: | ||
183 | # faq: | ||
184 | # title: 'FAQ' | ||
185 | # ignore_origin_rules_definition_title: 'What does « ignore origin rules » mean?' | ||
186 | # ignore_origin_rules_definition_description: 'They are used by wallabag to automatically ignore an origin address after a redirect.<br />If a redirect occurs while fetching a new entry, all the ignore origin rules (<i>user defined and instance defined</i>) will be used to ignore the origin address.' | ||
187 | # how_to_use_them_title: 'How do I use them?' | ||
188 | # how_to_use_them_description: 'Let us assume you want to ignore the origin of an entry coming from « <i>rss.example.com</i> » (<i>knowing that after a redirect, the actual address is example.com</i>).<br />In that case, you should put « host = "rss.example.com" » in the <i>Rule</i> field.' | ||
189 | # variables_available_title: 'Which variables and operators can I use to write rules?' | ||
190 | # variables_available_description: 'The following variables and operators can be used to create ignore origin rules:' | ||
191 | # meaning: 'Meaning' | ||
192 | # variable_description: | ||
193 | # label: 'Variable' | ||
194 | # host: 'Host of the address' | ||
195 | # _all: 'Full address, mainly for pattern matching' | ||
196 | # operator_description: | ||
197 | # label: 'Operator' | ||
198 | # equal_to: 'Equal to…' | ||
199 | # matches: 'Tests that a <i>subject</i> matches a <i>search</i> (case-insensitive).<br />Example: <code>_all ~ "https?://rss.example.com/foobar/.*"</code>' | ||
180 | otp: | 200 | otp: |
181 | # page_title: Two-factor authentication | 201 | # page_title: Two-factor authentication |
182 | # app: | 202 | # app: |
@@ -617,6 +637,8 @@ flashes: | |||
617 | # otp_disabled: Two-factor authentication disabled | 637 | # otp_disabled: Two-factor authentication disabled |
618 | # tagging_rules_imported: Tagging rules imported | 638 | # tagging_rules_imported: Tagging rules imported |
619 | # tagging_rules_not_imported: Error while importing tagging rules | 639 | # tagging_rules_not_imported: Error while importing tagging rules |
640 | # ignore_origin_rules_deleted: 'Ignore origin rule deleted' | ||
641 | # ignore_origin_rules_updated: 'Ignore origin rule updated' | ||
620 | entry: | 642 | entry: |
621 | notice: | 643 | notice: |
622 | entry_already_saved: 'Wpis już został dodany %date%' | 644 | entry_already_saved: 'Wpis już został dodany %date%' |
@@ -658,3 +680,8 @@ flashes: | |||
658 | added: 'Poświadczenie dla "%host%" dodane' | 680 | added: 'Poświadczenie dla "%host%" dodane' |
659 | updated: 'Poświadczenie dla "%host%" zaktualizowane' | 681 | updated: 'Poświadczenie dla "%host%" zaktualizowane' |
660 | deleted: 'Poświadczenie dla "%host%" usuniętę' | 682 | deleted: 'Poświadczenie dla "%host%" usuniętę' |
683 | ignore_origin_instance_rule: | ||
684 | notice: | ||
685 | # added: 'Global ignore origin rule added' | ||
686 | # updated: 'Global ignore origin rule updated' | ||
687 | # 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 d993cb05..293a4e44 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml | |||
@@ -33,6 +33,7 @@ menu: | |||
33 | back_to_unread: 'Voltar para os artigos não lidos' | 33 | back_to_unread: 'Voltar para os artigos não lidos' |
34 | users_management: 'Gestão de Usuários' | 34 | users_management: 'Gestão de Usuários' |
35 | site_credentials: 'Credenciais do site' | 35 | site_credentials: 'Credenciais do site' |
36 | # ignore_origin_instance_rules: 'Global ignore origin rules' | ||
36 | quickstart: "Começo Rápido" | 37 | quickstart: "Começo Rápido" |
37 | top: | 38 | top: |
38 | add_new_entry: 'Adicionar um novo artigo' | 39 | add_new_entry: 'Adicionar um novo artigo' |
@@ -59,6 +60,7 @@ config: | |||
59 | user_info: 'Informação do Usuário' | 60 | user_info: 'Informação do Usuário' |
60 | password: 'Senha' | 61 | password: 'Senha' |
61 | rules: 'Regras de tags' | 62 | rules: 'Regras de tags' |
63 | # ignore_origin: 'Ignore origin rules' | ||
62 | new_user: 'Adicionar um usuário' | 64 | new_user: 'Adicionar um usuário' |
63 | reset: 'Reiniciar minha conta' | 65 | reset: 'Reiniciar minha conta' |
64 | form: | 66 | form: |
@@ -177,6 +179,24 @@ config: | |||
177 | and: 'Uma regra E outra' | 179 | and: 'Uma regra E outra' |
178 | matches: 'Testa que um <i>assunto</i> corresponde a uma <i>pesquisa</i> (maiúscula ou minúscula).<br />Exemplo: <code>title matches "futebol"</code>' | 180 | matches: 'Testa que um <i>assunto</i> corresponde a uma <i>pesquisa</i> (maiúscula ou minúscula).<br />Exemplo: <code>title matches "futebol"</code>' |
179 | notmatches: 'Testa que um <i>assunto</i> não corresponde a uma <i>search</i> (maiúscula ou minúscula).<br />Exemplo: <code>title notmatches "futebol"</code>' | 181 | notmatches: 'Testa que um <i>assunto</i> não corresponde a uma <i>search</i> (maiúscula ou minúscula).<br />Exemplo: <code>title notmatches "futebol"</code>' |
182 | form_ignore_origin_rules: | ||
183 | # faq: | ||
184 | # title: 'FAQ' | ||
185 | # ignore_origin_rules_definition_title: 'What does « ignore origin rules » mean?' | ||
186 | # ignore_origin_rules_definition_description: 'They are used by wallabag to automatically ignore an origin address after a redirect.<br />If a redirect occurs while fetching a new entry, all the ignore origin rules (<i>user defined and instance defined</i>) will be used to ignore the origin address.' | ||
187 | # how_to_use_them_title: 'How do I use them?' | ||
188 | # how_to_use_them_description: 'Let us assume you want to ignore the origin of an entry coming from « <i>rss.example.com</i> » (<i>knowing that after a redirect, the actual address is example.com</i>).<br />In that case, you should put « host = "rss.example.com" » in the <i>Rule</i> field.' | ||
189 | # variables_available_title: 'Which variables and operators can I use to write rules?' | ||
190 | # variables_available_description: 'The following variables and operators can be used to create ignore origin rules:' | ||
191 | # meaning: 'Meaning' | ||
192 | # variable_description: | ||
193 | # label: 'Variable' | ||
194 | # host: 'Host of the address' | ||
195 | # _all: 'Full address, mainly for pattern matching' | ||
196 | # operator_description: | ||
197 | # label: 'Operator' | ||
198 | # equal_to: 'Equal to…' | ||
199 | # matches: 'Tests that a <i>subject</i> matches a <i>search</i> (case-insensitive).<br />Example: <code>_all ~ "https?://rss.example.com/foobar/.*"</code>' | ||
180 | otp: | 200 | otp: |
181 | page_title: Autenticação de dois fatores | 201 | page_title: Autenticação de dois fatores |
182 | app: | 202 | app: |
@@ -657,3 +677,8 @@ flashes: | |||
657 | added: 'Credencial do site para "%host%" foi adicionada' | 677 | added: 'Credencial do site para "%host%" foi adicionada' |
658 | updated: 'Credencial do site pa "%host%" atualizada' | 678 | updated: 'Credencial do site pa "%host%" atualizada' |
659 | deleted: 'Credencial do site pa "%host%" removida' | 679 | deleted: 'Credencial do site pa "%host%" removida' |
680 | ignore_origin_instance_rule: | ||
681 | notice: | ||
682 | # added: 'Global ignore origin rule added' | ||
683 | # updated: 'Global ignore origin rule updated' | ||
684 | # 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 bc8b72e0..3c605709 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml | |||
@@ -33,6 +33,7 @@ menu: | |||
33 | back_to_unread: 'Înapoi la articolele necitite' | 33 | back_to_unread: 'Înapoi la articolele necitite' |
34 | # users_management: 'Users management' | 34 | # users_management: 'Users management' |
35 | # site_credentials: 'Site credentials' | 35 | # site_credentials: 'Site credentials' |
36 | # ignore_origin_instance_rules: 'Global ignore origin rules' | ||
36 | # quickstart: "Quickstart" | 37 | # quickstart: "Quickstart" |
37 | top: | 38 | top: |
38 | add_new_entry: 'Introdu un nou articol' | 39 | add_new_entry: 'Introdu un nou articol' |
@@ -59,6 +60,7 @@ config: | |||
59 | user_info: 'Informații despre utilizator' | 60 | user_info: 'Informații despre utilizator' |
60 | password: 'Parolă' | 61 | password: 'Parolă' |
61 | # rules: 'Tagging rules' | 62 | # rules: 'Tagging rules' |
63 | # ignore_origin: 'Ignore origin rules' | ||
62 | new_user: 'Crează un utilizator' | 64 | new_user: 'Crează un utilizator' |
63 | # reset: 'Reset area' | 65 | # reset: 'Reset area' |
64 | form: | 66 | form: |
@@ -177,6 +179,24 @@ config: | |||
177 | # and: 'One rule AND another' | 179 | # and: 'One rule AND another' |
178 | # matches: 'Tests that a <i>subject</i> matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches "football"</code>' | 180 | # matches: 'Tests that a <i>subject</i> matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches "football"</code>' |
179 | # notmatches: 'Tests that a <i>subject</i> doesn''t match match a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>' | 181 | # notmatches: 'Tests that a <i>subject</i> doesn''t match match a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>' |
182 | form_ignore_origin_rules: | ||
183 | # faq: | ||
184 | # title: 'FAQ' | ||
185 | # ignore_origin_rules_definition_title: 'What does « ignore origin rules » mean?' | ||
186 | # ignore_origin_rules_definition_description: 'They are used by wallabag to automatically ignore an origin address after a redirect.<br />If a redirect occurs while fetching a new entry, all the ignore origin rules (<i>user defined and instance defined</i>) will be used to ignore the origin address.' | ||
187 | # how_to_use_them_title: 'How do I use them?' | ||
188 | # how_to_use_them_description: 'Let us assume you want to ignore the origin of an entry coming from « <i>rss.example.com</i> » (<i>knowing that after a redirect, the actual address is example.com</i>).<br />In that case, you should put « host = "rss.example.com" » in the <i>Rule</i> field.' | ||
189 | # variables_available_title: 'Which variables and operators can I use to write rules?' | ||
190 | # variables_available_description: 'The following variables and operators can be used to create ignore origin rules:' | ||
191 | # meaning: 'Meaning' | ||
192 | # variable_description: | ||
193 | # label: 'Variable' | ||
194 | # host: 'Host of the address' | ||
195 | # _all: 'Full address, mainly for pattern matching' | ||
196 | # operator_description: | ||
197 | # label: 'Operator' | ||
198 | # equal_to: 'Equal to…' | ||
199 | # matches: 'Tests that a <i>subject</i> matches a <i>search</i> (case-insensitive).<br />Example: <code>_all ~ "https?://rss.example.com/foobar/.*"</code>' | ||
180 | otp: | 200 | otp: |
181 | # page_title: Two-factor authentication | 201 | # page_title: Two-factor authentication |
182 | # app: | 202 | # app: |
@@ -616,6 +636,8 @@ flashes: | |||
616 | # otp_disabled: Two-factor authentication disabled | 636 | # otp_disabled: Two-factor authentication disabled |
617 | # tagging_rules_imported: Tagging rules imported | 637 | # tagging_rules_imported: Tagging rules imported |
618 | # tagging_rules_not_imported: Error while importing tagging rules | 638 | # tagging_rules_not_imported: Error while importing tagging rules |
639 | # ignore_origin_rules_deleted: 'Ignore origin rule deleted' | ||
640 | # ignore_origin_rules_updated: 'Ignore origin rule updated' | ||
619 | entry: | 641 | entry: |
620 | notice: | 642 | notice: |
621 | # entry_already_saved: 'Entry already saved on %date%' | 643 | # entry_already_saved: 'Entry already saved on %date%' |
@@ -657,3 +679,8 @@ flashes: | |||
657 | # added: 'Site credential for "%host%" added' | 679 | # added: 'Site credential for "%host%" added' |
658 | # updated: 'Site credential for "%host%" updated' | 680 | # updated: 'Site credential for "%host%" updated' |
659 | # deleted: 'Site credential for "%host%" deleted' | 681 | # deleted: 'Site credential for "%host%" deleted' |
682 | ignore_origin_instance_rule: | ||
683 | notice: | ||
684 | # added: 'Global ignore origin rule added' | ||
685 | # updated: 'Global ignore origin rule updated' | ||
686 | # 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 2f7f55e5..eead4ec6 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml | |||
@@ -33,6 +33,7 @@ menu: | |||
33 | back_to_unread: 'Назад к непрочитанным записям' | 33 | back_to_unread: 'Назад к непрочитанным записям' |
34 | users_management: 'Управление пользователями' | 34 | users_management: 'Управление пользователями' |
35 | site_credentials: 'Site credentials' | 35 | site_credentials: 'Site credentials' |
36 | # ignore_origin_instance_rules: 'Global ignore origin rules' | ||
36 | quickstart: "Быстрый старт" | 37 | quickstart: "Быстрый старт" |
37 | top: | 38 | top: |
38 | add_new_entry: 'Добавить новую запись' | 39 | add_new_entry: 'Добавить новую запись' |
@@ -59,6 +60,7 @@ config: | |||
59 | user_info: 'Информация о пользователе' | 60 | user_info: 'Информация о пользователе' |
60 | password: 'Пароль' | 61 | password: 'Пароль' |
61 | rules: 'Правила настройки простановки тегов' | 62 | rules: 'Правила настройки простановки тегов' |
63 | # ignore_origin: 'Ignore origin rules' | ||
62 | new_user: 'Добавить пользователя' | 64 | new_user: 'Добавить пользователя' |
63 | reset: 'Сброс данных' | 65 | reset: 'Сброс данных' |
64 | form: | 66 | form: |
@@ -177,6 +179,24 @@ config: | |||
177 | and: 'Одно правило И другое' | 179 | and: 'Одно правило И другое' |
178 | matches: 'Тесты, в которых <i> тема </i> соответствует <i> поиску </i> (без учета регистра). Пример: <code> title matches "футбол" </code>' | 180 | matches: 'Тесты, в которых <i> тема </i> соответствует <i> поиску </i> (без учета регистра). Пример: <code> title matches "футбол" </code>' |
179 | # notmatches: 'Tests that a <i>subject</i> doesn''t match match a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>' | 181 | # notmatches: 'Tests that a <i>subject</i> doesn''t match match a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>' |
182 | form_ignore_origin_rules: | ||
183 | # faq: | ||
184 | # title: 'FAQ' | ||
185 | # ignore_origin_rules_definition_title: 'What does « ignore origin rules » mean?' | ||
186 | # ignore_origin_rules_definition_description: 'They are used by wallabag to automatically ignore an origin address after a redirect.<br />If a redirect occurs while fetching a new entry, all the ignore origin rules (<i>user defined and instance defined</i>) will be used to ignore the origin address.' | ||
187 | # how_to_use_them_title: 'How do I use them?' | ||
188 | # how_to_use_them_description: 'Let us assume you want to ignore the origin of an entry coming from « <i>rss.example.com</i> » (<i>knowing that after a redirect, the actual address is example.com</i>).<br />In that case, you should put « host = "rss.example.com" » in the <i>Rule</i> field.' | ||
189 | # variables_available_title: 'Which variables and operators can I use to write rules?' | ||
190 | # variables_available_description: 'The following variables and operators can be used to create ignore origin rules:' | ||
191 | # meaning: 'Meaning' | ||
192 | # variable_description: | ||
193 | # label: 'Variable' | ||
194 | # host: 'Host of the address' | ||
195 | # _all: 'Full address, mainly for pattern matching' | ||
196 | # operator_description: | ||
197 | # label: 'Operator' | ||
198 | # equal_to: 'Equal to…' | ||
199 | # matches: 'Tests that a <i>subject</i> matches a <i>search</i> (case-insensitive).<br />Example: <code>_all ~ "https?://rss.example.com/foobar/.*"</code>' | ||
180 | otp: | 200 | otp: |
181 | # page_title: Two-factor authentication | 201 | # page_title: Two-factor authentication |
182 | # app: | 202 | # app: |
@@ -616,6 +636,8 @@ flashes: | |||
616 | # otp_disabled: Two-factor authentication disabled | 636 | # otp_disabled: Two-factor authentication disabled |
617 | # tagging_rules_imported: Tagging rules imported | 637 | # tagging_rules_imported: Tagging rules imported |
618 | # tagging_rules_not_imported: Error while importing tagging rules | 638 | # tagging_rules_not_imported: Error while importing tagging rules |
639 | # ignore_origin_rules_deleted: 'Ignore origin rule deleted' | ||
640 | # ignore_origin_rules_updated: 'Ignore origin rule updated' | ||
619 | entry: | 641 | entry: |
620 | notice: | 642 | notice: |
621 | entry_already_saved: 'Запись была сохранена ранее %date%' | 643 | entry_already_saved: 'Запись была сохранена ранее %date%' |
@@ -657,3 +679,8 @@ flashes: | |||
657 | # added: 'Site credential for "%host%" added' | 679 | # added: 'Site credential for "%host%" added' |
658 | # updated: 'Site credential for "%host%" updated' | 680 | # updated: 'Site credential for "%host%" updated' |
659 | # deleted: 'Site credential for "%host%" deleted' | 681 | # deleted: 'Site credential for "%host%" deleted' |
682 | ignore_origin_instance_rule: | ||
683 | notice: | ||
684 | # added: 'Global ignore origin rule added' | ||
685 | # updated: 'Global ignore origin rule updated' | ||
686 | # 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 48e1c34a..8d2b05f3 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml | |||
@@ -33,6 +33,7 @@ menu: | |||
33 | back_to_unread: 'กลับไปยังรายการที่ไม่ได้อ่าน' | 33 | back_to_unread: 'กลับไปยังรายการที่ไม่ได้อ่าน' |
34 | users_management: 'การจัดการผู้ใช้' | 34 | users_management: 'การจัดการผู้ใช้' |
35 | site_credentials: 'การรับรองไซต์' | 35 | site_credentials: 'การรับรองไซต์' |
36 | # ignore_origin_instance_rules: 'Global ignore origin rules' | ||
36 | quickstart: "เริ่มแบบด่วน" | 37 | quickstart: "เริ่มแบบด่วน" |
37 | top: | 38 | top: |
38 | add_new_entry: 'เพิ่มรายการใหม่' | 39 | add_new_entry: 'เพิ่มรายการใหม่' |
@@ -59,6 +60,7 @@ config: | |||
59 | user_info: 'ข้อมูลผู้ใช้' | 60 | user_info: 'ข้อมูลผู้ใช้' |
60 | password: 'รหัสผ่าน' | 61 | password: 'รหัสผ่าน' |
61 | rules: 'การแท็กข้อบังคับ' | 62 | rules: 'การแท็กข้อบังคับ' |
63 | # ignore_origin: 'Ignore origin rules' | ||
62 | new_user: 'เพิ่มผู้ใช้' | 64 | new_user: 'เพิ่มผู้ใช้' |
63 | reset: 'รีเซ็ตพื้นที่ ' | 65 | reset: 'รีเซ็ตพื้นที่ ' |
64 | form: | 66 | form: |
@@ -177,6 +179,24 @@ config: | |||
177 | and: 'หนึ่งข้อบังคับและอื่นๆ' | 179 | and: 'หนึ่งข้อบังคับและอื่นๆ' |
178 | matches: 'ทดสอบว่า <i>เรื่อง</i> นี้ตรงกับ <i>การต้นหา</i> (กรณีไม่ทราบ).<br />ตัวอย่าง: <code>หัวข้อที่ตรงกับ "football"</code>' | 180 | matches: 'ทดสอบว่า <i>เรื่อง</i> นี้ตรงกับ <i>การต้นหา</i> (กรณีไม่ทราบ).<br />ตัวอย่าง: <code>หัวข้อที่ตรงกับ "football"</code>' |
179 | notmatches: 'ทดสอบว่า <i>เรื่อง</i> นี้ไม่ตรงกับ <i>การต้นหา</i> (กรณีไม่ทราบ).<br />ตัวอย่าง: <code>หัวข้อทีไม่ตรงกับ "football"</code>' | 181 | notmatches: 'ทดสอบว่า <i>เรื่อง</i> นี้ไม่ตรงกับ <i>การต้นหา</i> (กรณีไม่ทราบ).<br />ตัวอย่าง: <code>หัวข้อทีไม่ตรงกับ "football"</code>' |
182 | form_ignore_origin_rules: | ||
183 | # faq: | ||
184 | # title: 'FAQ' | ||
185 | # ignore_origin_rules_definition_title: 'What does « ignore origin rules » mean?' | ||
186 | # ignore_origin_rules_definition_description: 'They are used by wallabag to automatically ignore an origin address after a redirect.<br />If a redirect occurs while fetching a new entry, all the ignore origin rules (<i>user defined and instance defined</i>) will be used to ignore the origin address.' | ||
187 | # how_to_use_them_title: 'How do I use them?' | ||
188 | # how_to_use_them_description: 'Let us assume you want to ignore the origin of an entry coming from « <i>rss.example.com</i> » (<i>knowing that after a redirect, the actual address is example.com</i>).<br />In that case, you should put « host = "rss.example.com" » in the <i>Rule</i> field.' | ||
189 | # variables_available_title: 'Which variables and operators can I use to write rules?' | ||
190 | # variables_available_description: 'The following variables and operators can be used to create ignore origin rules:' | ||
191 | # meaning: 'Meaning' | ||
192 | # variable_description: | ||
193 | # label: 'Variable' | ||
194 | # host: 'Host of the address' | ||
195 | # _all: 'Full address, mainly for pattern matching' | ||
196 | # operator_description: | ||
197 | # label: 'Operator' | ||
198 | # equal_to: 'Equal to…' | ||
199 | # matches: 'Tests that a <i>subject</i> matches a <i>search</i> (case-insensitive).<br />Example: <code>_all ~ "https?://rss.example.com/foobar/.*"</code>' | ||
180 | otp: | 200 | otp: |
181 | # page_title: Two-factor authentication | 201 | # page_title: Two-factor authentication |
182 | # app: | 202 | # app: |
@@ -616,6 +636,8 @@ flashes: | |||
616 | # otp_disabled: Two-factor authentication disabled | 636 | # otp_disabled: Two-factor authentication disabled |
617 | # tagging_rules_imported: Tagging rules imported | 637 | # tagging_rules_imported: Tagging rules imported |
618 | # tagging_rules_not_imported: Error while importing tagging rules | 638 | # tagging_rules_not_imported: Error while importing tagging rules |
639 | # ignore_origin_rules_deleted: 'Ignore origin rule deleted' | ||
640 | # ignore_origin_rules_updated: 'Ignore origin rule updated' | ||
619 | entry: | 641 | entry: |
620 | notice: | 642 | notice: |
621 | entry_already_saved: 'รายการพร้อมบันทึกที่ %date%' | 643 | entry_already_saved: 'รายการพร้อมบันทึกที่ %date%' |
@@ -657,3 +679,8 @@ flashes: | |||
657 | added: 'ไซต์ข้อมูลประจำตัวสำหรับ "%host%" ที่ทำการเพิ่ม' | 679 | added: 'ไซต์ข้อมูลประจำตัวสำหรับ "%host%" ที่ทำการเพิ่ม' |
658 | updated: 'ไซต์ข้อมูลประจำตัวสำหรับ "%host%" ที่ทำการอัปเดต' | 680 | updated: 'ไซต์ข้อมูลประจำตัวสำหรับ "%host%" ที่ทำการอัปเดต' |
659 | deleted: 'ไซต์ข้อมูลประจำตัวสำหรับ "%host%" ที่ทำการลบ' | 681 | deleted: 'ไซต์ข้อมูลประจำตัวสำหรับ "%host%" ที่ทำการลบ' |
682 | ignore_origin_instance_rule: | ||
683 | notice: | ||
684 | # added: 'Global ignore origin rule added' | ||
685 | # updated: 'Global ignore origin rule updated' | ||
686 | # 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 19029c0b..dfbc3010 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml | |||
@@ -33,6 +33,7 @@ menu: | |||
33 | back_to_unread: 'Okunmayan makalelere geri dön' | 33 | back_to_unread: 'Okunmayan makalelere geri dön' |
34 | # users_management: 'Users management' | 34 | # users_management: 'Users management' |
35 | # site_credentials: 'Site credentials' | 35 | # site_credentials: 'Site credentials' |
36 | # ignore_origin_instance_rules: 'Global ignore origin rules' | ||
36 | quickstart: "Hızlı başlangıç" | 37 | quickstart: "Hızlı başlangıç" |
37 | top: | 38 | top: |
38 | add_new_entry: 'Yeni bir makale ekle' | 39 | add_new_entry: 'Yeni bir makale ekle' |
@@ -59,6 +60,7 @@ config: | |||
59 | user_info: 'Kullanıcı bilgileri' | 60 | user_info: 'Kullanıcı bilgileri' |
60 | password: 'Şifre' | 61 | password: 'Şifre' |
61 | rules: 'Etiketleme kuralları' | 62 | rules: 'Etiketleme kuralları' |
63 | # ignore_origin: 'Ignore origin rules' | ||
62 | new_user: 'Bir kullanıcı ekle' | 64 | new_user: 'Bir kullanıcı ekle' |
63 | # reset: 'Reset area' | 65 | # reset: 'Reset area' |
64 | form: | 66 | form: |
@@ -177,6 +179,24 @@ config: | |||
177 | and: 'Bir kural ve diğeri' | 179 | and: 'Bir kural ve diğeri' |
178 | # matches: 'Tests that a <i>subject</i> matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches "football"</code>' | 180 | # matches: 'Tests that a <i>subject</i> matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches "football"</code>' |
179 | # notmatches: 'Tests that a <i>subject</i> doesn''t match match a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>' | 181 | # notmatches: 'Tests that a <i>subject</i> doesn''t match match a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>' |
182 | form_ignore_origin_rules: | ||
183 | # faq: | ||
184 | # title: 'FAQ' | ||
185 | # ignore_origin_rules_definition_title: 'What does « ignore origin rules » mean?' | ||
186 | # ignore_origin_rules_definition_description: 'They are used by wallabag to automatically ignore an origin address after a redirect.<br />If a redirect occurs while fetching a new entry, all the ignore origin rules (<i>user defined and instance defined</i>) will be used to ignore the origin address.' | ||
187 | # how_to_use_them_title: 'How do I use them?' | ||
188 | # how_to_use_them_description: 'Let us assume you want to ignore the origin of an entry coming from « <i>rss.example.com</i> » (<i>knowing that after a redirect, the actual address is example.com</i>).<br />In that case, you should put « host = "rss.example.com" » in the <i>Rule</i> field.' | ||
189 | # variables_available_title: 'Which variables and operators can I use to write rules?' | ||
190 | # variables_available_description: 'The following variables and operators can be used to create ignore origin rules:' | ||
191 | # meaning: 'Meaning' | ||
192 | # variable_description: | ||
193 | # label: 'Variable' | ||
194 | # host: 'Host of the address' | ||
195 | # _all: 'Full address, mainly for pattern matching' | ||
196 | # operator_description: | ||
197 | # label: 'Operator' | ||
198 | # equal_to: 'Equal to…' | ||
199 | # matches: 'Tests that a <i>subject</i> matches a <i>search</i> (case-insensitive).<br />Example: <code>_all ~ "https?://rss.example.com/foobar/.*"</code>' | ||
180 | otp: | 200 | otp: |
181 | # page_title: Two-factor authentication | 201 | # page_title: Two-factor authentication |
182 | # app: | 202 | # app: |
@@ -616,6 +636,8 @@ flashes: | |||
616 | # otp_disabled: Two-factor authentication disabled | 636 | # otp_disabled: Two-factor authentication disabled |
617 | # tagging_rules_imported: Tagging rules imported | 637 | # tagging_rules_imported: Tagging rules imported |
618 | # tagging_rules_not_imported: Error while importing tagging rules | 638 | # tagging_rules_not_imported: Error while importing tagging rules |
639 | # ignore_origin_rules_deleted: 'Ignore origin rule deleted' | ||
640 | # ignore_origin_rules_updated: 'Ignore origin rule updated' | ||
619 | entry: | 641 | entry: |
620 | notice: | 642 | notice: |
621 | entry_already_saved: 'Entry already saved on %date%' | 643 | entry_already_saved: 'Entry already saved on %date%' |
@@ -657,3 +679,8 @@ flashes: | |||
657 | # added: 'Site credential for "%host%" added' | 679 | # added: 'Site credential for "%host%" added' |
658 | # updated: 'Site credential for "%host%" updated' | 680 | # updated: 'Site credential for "%host%" updated' |
659 | # deleted: 'Site credential for "%host%" deleted' | 681 | # deleted: 'Site credential for "%host%" deleted' |
682 | ignore_origin_instance_rule: | ||
683 | notice: | ||
684 | # added: 'Global ignore origin rule added' | ||
685 | # updated: 'Global ignore origin rule updated' | ||
686 | # deleted: 'Global ignore origin rule deleted' | ||
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..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 | |||
@@ -404,6 +404,76 @@ | |||
404 | </div> | 404 | </div> |
405 | </div> | 405 | </div> |
406 | 406 | ||
407 | <h2>{{ 'config.tab_menu.ignore_origin'|trans }}</h2> | ||
408 | |||
409 | <ul> | ||
410 | {% for ignore_origin_rule in app.user.config.ignoreOriginRules %} | ||
411 | <li> | ||
412 | {{ 'config.form_rules.if_label'|trans }} | ||
413 | « {{ ignore_origin_rule.rule }} » | ||
414 | <a href="{{ path('edit_ignore_origin_rule', {id: ignore_origin_rule.id}) }}" title="{{ 'config.form_rules.edit_rule_label'|trans }}" class="tool mode_edit">✎</a> | ||
415 | <a href="{{ path('delete_ignore_origin_rule', {id: ignore_origin_rule.id}) }}" title="{{ 'config.form_rules.delete_rule_label'|trans }}" class="tool delete icon-trash icon"></a> | ||
416 | </li> | ||
417 | {% endfor %} | ||
418 | </ul> | ||
419 | |||
420 | {{ form_start(form.new_ignore_origin_user_rule) }} | ||
421 | {{ form_errors(form.new_ignore_origin_user_rule) }} | ||
422 | |||
423 | <fieldset class="w500p inline"> | ||
424 | <div class="row"> | ||
425 | {{ form_label(form.new_ignore_origin_user_rule.rule) }} | ||
426 | {{ form_errors(form.new_ignore_origin_user_rule.rule) }} | ||
427 | {{ form_widget(form.new_ignore_origin_user_rule.rule) }} | ||
428 | </div> | ||
429 | </fieldset> | ||
430 | |||
431 | {{ form_rest(form.new_ignore_origin_user_rule) }} | ||
432 | </form> | ||
433 | |||
434 | <div class="row"> | ||
435 | <div class="input-field col s12"> | ||
436 | <h4>{{ 'config.form_ignore_origin_rules.faq.title'|trans }}</h4> | ||
437 | |||
438 | <h5>{{ 'config.form_ignore_origin_rules.faq.ignore_origin_rules_definition_title'|trans }}</h5> | ||
439 | <p class="help">{{ 'config.form_ignore_origin_rules.faq.ignore_origin_rules_definition_description'|trans|raw }}</p> | ||
440 | |||
441 | <h5>{{ 'config.form_ignore_origin_rules.faq.how_to_use_them_title'|trans }}</h5> | ||
442 | <p class="help">{{ 'config.form_ignore_origin_rules.faq.how_to_use_them_description'|trans|raw }}</p> | ||
443 | |||
444 | <h5>{{ 'config.form_ignore_origin_rules.faq.variables_available_title'|trans }}</h5> | ||
445 | <p class="help"> | ||
446 | {{ 'config.form_ignore_origin_rules.faq.variables_available_description'|trans }} | ||
447 | </p> | ||
448 | |||
449 | <table class="bordered"> | ||
450 | <thead> | ||
451 | <tr> | ||
452 | <th>{{ 'config.form_ignore_origin_rules.faq.variable_description.label'|trans }}</th> | ||
453 | <th>{{ 'config.form_ignore_origin_rules.faq.meaning'|trans }}</th> | ||
454 | <th>{{ 'config.form_ignore_origin_rules.faq.operator_description.label'|trans }}</th> | ||
455 | <th>{{ 'config.form_ignore_origin_rules.faq.meaning'|trans }}</th> | ||
456 | </tr> | ||
457 | </thead> | ||
458 | |||
459 | <tbody> | ||
460 | <tr> | ||
461 | <td>host</td> | ||
462 | <td>{{ 'config.form_ignore_origin_rules.faq.variable_description.host'|trans }}</td> | ||
463 | <td>=</td> | ||
464 | <td>{{ 'config.form_ignore_origin_rules.faq.operator_description.equal_to'|trans }}</td> | ||
465 | </tr> | ||
466 | <tr> | ||
467 | <td>_all</td> | ||
468 | <td>{{ 'config.form_ignore_origin_rules.faq.variable_description._all'|trans }}</td> | ||
469 | <td>~</td> | ||
470 | <td>{{ 'config.form_ignore_origin_rules.faq.operator_description.matches'|trans|raw }}</td> | ||
471 | </tr> | ||
472 | </tbody> | ||
473 | </table> | ||
474 | </div> | ||
475 | </div> | ||
476 | |||
407 | <h2>{{ 'config.reset.title'|trans }}</h2> | 477 | <h2>{{ 'config.reset.title'|trans }}</h2> |
408 | <fieldset class="w500p inline"> | 478 | <fieldset class="w500p inline"> |
409 | <p>{{ 'config.reset.description'|trans }}</p> | 479 | <p>{{ 'config.reset.description'|trans }}</p> |
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..30c2a520 --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/IgnoreOriginInstanceRule/edit.html.twig | |||
@@ -0,0 +1,87 @@ | |||
1 | {% extends "WallabagCoreBundle::layout.html.twig" %} | ||
2 | |||
3 | {% block title %}{{ 'ignore_origin_instance_rule.page_title'|trans }}{% endblock %} | ||
4 | |||
5 | {% block content %} | ||
6 | |||
7 | <div class="row"> | ||
8 | <div class="col s12"> | ||
9 | <div class="card-panel"> | ||
10 | <div class="row"> | ||
11 | <div class="input-field col s12"> | ||
12 | <h4>{{ 'ignore_origin_instance_rule.edit_ignore_origin_instance_rule'|trans }}</h4> | ||
13 | |||
14 | <div id="set6" class="col s12"> | ||
15 | {{ form_start(edit_form) }} | ||
16 | {{ form_errors(edit_form) }} | ||
17 | |||
18 | <div class="row"> | ||
19 | <div class="input-field col s12"> | ||
20 | {{ form_label(edit_form.rule) }} | ||
21 | {{ form_errors(edit_form.rule) }} | ||
22 | {{ form_widget(edit_form.rule) }} | ||
23 | </div> | ||
24 | </div> | ||
25 | |||
26 | <br/> | ||
27 | |||
28 | {{ form_widget(edit_form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} | ||
29 | {{ form_widget(edit_form._token) }} | ||
30 | </form> | ||
31 | <p> | ||
32 | {{ form_start(delete_form) }} | ||
33 | <button onclick="return confirm('{{ 'ignore_origin_instance_rule.form.delete_confirm'|trans|escape('js') }}')" type="submit" class="btn waves-effect waves-light red">{{ 'ignore_origin_instance_rule.form.delete'|trans }}</button> | ||
34 | {{ form_end(delete_form) }} | ||
35 | </p> | ||
36 | <p><a class="waves-effect waves-light btn blue-grey" href="{{ path('ignore_origin_instance_rules_index') }}">{{ 'ignore_origin_instance_rule.form.back_to_list'|trans }}</a></p> | ||
37 | </div> | ||
38 | </div> | ||
39 | </div> | ||
40 | |||
41 | <div class="row"> | ||
42 | <div class="input-field col s12"> | ||
43 | <h4>{{ 'config.form_ignore_origin_rules.faq.title'|trans }}</h4> | ||
44 | |||
45 | <h5>{{ 'config.form_ignore_origin_rules.faq.ignore_origin_rules_definition_title'|trans }}</h5> | ||
46 | <p class="help">{{ 'config.form_ignore_origin_rules.faq.ignore_origin_rules_definition_description'|trans|raw }}</p> | ||
47 | |||
48 | <h5>{{ 'config.form_ignore_origin_rules.faq.how_to_use_them_title'|trans }}</h5> | ||
49 | <p class="help">{{ 'config.form_ignore_origin_rules.faq.how_to_use_them_description'|trans|raw }}</p> | ||
50 | |||
51 | <h5>{{ 'config.form_ignore_origin_rules.faq.variables_available_title'|trans }}</h5> | ||
52 | <p class="help"> | ||
53 | {{ 'config.form_ignore_origin_rules.faq.variables_available_description'|trans }} | ||
54 | </p> | ||
55 | |||
56 | <table class="bordered"> | ||
57 | <thead> | ||
58 | <tr> | ||
59 | <th>{{ 'config.form_ignore_origin_rules.faq.variable_description.label'|trans }}</th> | ||
60 | <th>{{ 'config.form_ignore_origin_rules.faq.meaning'|trans }}</th> | ||
61 | <th>{{ 'config.form_ignore_origin_rules.faq.operator_description.label'|trans }}</th> | ||
62 | <th>{{ 'config.form_ignore_origin_rules.faq.meaning'|trans }}</th> | ||
63 | </tr> | ||
64 | </thead> | ||
65 | |||
66 | <tbody> | ||
67 | <tr> | ||
68 | <td>host</td> | ||
69 | <td>{{ 'config.form_ignore_origin_rules.faq.variable_description.host'|trans }}</td> | ||
70 | <td>=</td> | ||
71 | <td>{{ 'config.form_ignore_origin_rules.faq.operator_description.equal_to'|trans }}</td> | ||
72 | </tr> | ||
73 | <tr> | ||
74 | <td>_all</td> | ||
75 | <td>{{ 'config.form_ignore_origin_rules.faq.variable_description._all'|trans }}</td> | ||
76 | <td>~</td> | ||
77 | <td>{{ 'config.form_ignore_origin_rules.faq.operator_description.matches'|trans|raw }}</td> | ||
78 | </tr> | ||
79 | </tbody> | ||
80 | </table> | ||
81 | </div> | ||
82 | </div> | ||
83 | </div> | ||
84 | </div> | ||
85 | </div> | ||
86 | |||
87 | {% 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 @@ | |||
1 | {% extends "WallabagCoreBundle::layout.html.twig" %} | ||
2 | |||
3 | {% block title %}{{ 'ignore_origin_instance_rule.page_title'|trans }}{% endblock %} | ||
4 | |||
5 | {% block content %} | ||
6 | |||
7 | <div class="row"> | ||
8 | <div class="col s12"> | ||
9 | <div class="card-panel"> | ||
10 | <div class="row"> | ||
11 | <div class="input-field col s12"> | ||
12 | <p class="help">{{ 'ignore_origin_instance_rule.description'|trans|raw }}</p> | ||
13 | |||
14 | <table class="bordered"> | ||
15 | <thead> | ||
16 | <tr> | ||
17 | <th>{{ 'ignore_origin_instance_rule.form.rule_label'|trans }}</th> | ||
18 | <th>{{ 'ignore_origin_instance_rule.list.actions'|trans }}</th> | ||
19 | </tr> | ||
20 | </thead> | ||
21 | <tbody> | ||
22 | {% for rule in rules %} | ||
23 | <tr> | ||
24 | <td>{{ rule.rule }}</td> | ||
25 | <td> | ||
26 | <a href="{{ path('ignore_origin_instance_rules_edit', { 'id': rule.id }) }}">{{ 'ignore_origin_instance_rule.list.edit_action'|trans }}</a> | ||
27 | </td> | ||
28 | </tr> | ||
29 | {% endfor %} | ||
30 | </tbody> | ||
31 | </table> | ||
32 | <br /> | ||
33 | <p> | ||
34 | <a href="{{ path('ignore_origin_instance_rules_new') }}" class="waves-effect waves-light btn">{{ 'ignore_origin_instance_rule.list.create_new_one'|trans }}</a> | ||
35 | </p> | ||
36 | </div> | ||
37 | </div> | ||
38 | </div> | ||
39 | </div> | ||
40 | </div> | ||
41 | |||
42 | {% 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..cb052ff0 --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/IgnoreOriginInstanceRule/new.html.twig | |||
@@ -0,0 +1,80 @@ | |||
1 | {% extends "WallabagCoreBundle::layout.html.twig" %} | ||
2 | |||
3 | {% block title %}{{ 'ignore_origin_instance_rule.page_title'|trans }}{% endblock %} | ||
4 | |||
5 | {% block content %} | ||
6 | |||
7 | <div class="row"> | ||
8 | <div class="col s12"> | ||
9 | <div class="card-panel"> | ||
10 | <div class="row"> | ||
11 | <div class="input-field col s12"> | ||
12 | <h4>{{ 'ignore_origin_instance_rule.new_ignore_origin_instance_rule'|trans }}</h4> | ||
13 | |||
14 | <div id="set6" class="col s12"> | ||
15 | {{ form_start(form) }} | ||
16 | {{ form_errors(form) }} | ||
17 | |||
18 | <div class="row"> | ||
19 | <div class="input-field col s12"> | ||
20 | {{ form_label(form.rule) }} | ||
21 | {{ form_errors(form.rule) }} | ||
22 | {{ form_widget(form.rule) }} | ||
23 | </div> | ||
24 | </div> | ||
25 | |||
26 | {{ form_widget(form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} | ||
27 | {{ form_rest(form) }} | ||
28 | </form> | ||
29 | <p><a class="waves-effect waves-light btn blue-grey" href="{{ path('ignore_origin_instance_rules_index') }}">{{ 'ignore_origin_instance_rule.form.back_to_list'|trans }}</a></p> | ||
30 | </div> | ||
31 | </div> | ||
32 | </div> | ||
33 | |||
34 | <div class="row"> | ||
35 | <div class="input-field col s12"> | ||
36 | <h4>{{ 'config.form_ignore_origin_rules.faq.title'|trans }}</h4> | ||
37 | |||
38 | <h5>{{ 'config.form_ignore_origin_rules.faq.ignore_origin_rules_definition_title'|trans }}</h5> | ||
39 | <p class="help">{{ 'config.form_ignore_origin_rules.faq.ignore_origin_rules_definition_description'|trans|raw }}</p> | ||
40 | |||
41 | <h5>{{ 'config.form_ignore_origin_rules.faq.how_to_use_them_title'|trans }}</h5> | ||
42 | <p class="help">{{ 'config.form_ignore_origin_rules.faq.how_to_use_them_description'|trans|raw }}</p> | ||
43 | |||
44 | <h5>{{ 'config.form_ignore_origin_rules.faq.variables_available_title'|trans }}</h5> | ||
45 | <p class="help"> | ||
46 | {{ 'config.form_ignore_origin_rules.faq.variables_available_description'|trans }} | ||
47 | </p> | ||
48 | |||
49 | <table class="bordered"> | ||
50 | <thead> | ||
51 | <tr> | ||
52 | <th>{{ 'config.form_ignore_origin_rules.faq.variable_description.label'|trans }}</th> | ||
53 | <th>{{ 'config.form_ignore_origin_rules.faq.meaning'|trans }}</th> | ||
54 | <th>{{ 'config.form_ignore_origin_rules.faq.operator_description.label'|trans }}</th> | ||
55 | <th>{{ 'config.form_ignore_origin_rules.faq.meaning'|trans }}</th> | ||
56 | </tr> | ||
57 | </thead> | ||
58 | |||
59 | <tbody> | ||
60 | <tr> | ||
61 | <td>host</td> | ||
62 | <td>{{ 'config.form_ignore_origin_rules.faq.variable_description.host'|trans }}</td> | ||
63 | <td>=</td> | ||
64 | <td>{{ 'config.form_ignore_origin_rules.faq.operator_description.equal_to'|trans }}</td> | ||
65 | </tr> | ||
66 | <tr> | ||
67 | <td>_all</td> | ||
68 | <td>{{ 'config.form_ignore_origin_rules.faq.variable_description._all'|trans }}</td> | ||
69 | <td>~</td> | ||
70 | <td>{{ 'config.form_ignore_origin_rules.faq.operator_description.matches'|trans|raw }}</td> | ||
71 | </tr> | ||
72 | </tbody> | ||
73 | </table> | ||
74 | </div> | ||
75 | </div> | ||
76 | </div> | ||
77 | </div> | ||
78 | </div> | ||
79 | |||
80 | {% 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 @@ | |||
45 | {% if is_granted('ROLE_SUPER_ADMIN') %} | 45 | {% if is_granted('ROLE_SUPER_ADMIN') %} |
46 | <li class="menu users"><a href="{{ path('user_index') }}">{{ 'menu.left.users_management'|trans }}</a></li> | 46 | <li class="menu users"><a href="{{ path('user_index') }}">{{ 'menu.left.users_management'|trans }}</a></li> |
47 | <li class="menu internal"><a href="{{ path('craue_config_settings_modify') }}">{{ 'menu.left.internal_settings'|trans }}</a></li> | 47 | <li class="menu internal"><a href="{{ path('craue_config_settings_modify') }}">{{ 'menu.left.internal_settings'|trans }}</a></li> |
48 | <li class="menu ignore"><a href="{{ path('ignore_origin_instance_rules_index') }}">{{ 'menu.left.ignore_origin_instance_rules'|trans }}</a></li> | ||
48 | {% endif %} | 49 | {% endif %} |
49 | <li class="menu import"><a href="{{ path('import') }}">{{ 'menu.left.import'|trans }}</a></li> | 50 | <li class="menu import"><a href="{{ path('import') }}">{{ 'menu.left.import'|trans }}</a></li> |
50 | <li class="menu howto"><a href="{{ path('howto') }}">{{ 'menu.left.howto'|trans }}</a></li> | 51 | <li class="menu howto"><a href="{{ path('howto') }}">{{ 'menu.left.howto'|trans }}</a></li> |
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..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 | |||
@@ -16,7 +16,8 @@ | |||
16 | <li class="tab col s12 m6 l3"><a href="#set3">{{ 'config.tab_menu.user_info'|trans }}</a></li> | 16 | <li class="tab col s12 m6 l3"><a href="#set3">{{ 'config.tab_menu.user_info'|trans }}</a></li> |
17 | <li class="tab col s12 m6 l3"><a href="#set4">{{ 'config.tab_menu.password'|trans }}</a></li> | 17 | <li class="tab col s12 m6 l3"><a href="#set4">{{ 'config.tab_menu.password'|trans }}</a></li> |
18 | <li class="tab col s12 m6 l3"><a href="#set5">{{ 'config.tab_menu.rules'|trans }}</a></li> | 18 | <li class="tab col s12 m6 l3"><a href="#set5">{{ 'config.tab_menu.rules'|trans }}</a></li> |
19 | <li class="tab col s12 m6 l3"><a href="#set6">{{ 'config.tab_menu.reset'|trans }}</a></li> | 19 | <li class="tab col s12 m6 l3"><a href="#set6">{{ 'config.tab_menu.ignore_origin'|trans }}</a></li> |
20 | <li class="tab col s12 m6 l3"><a href="#set7">{{ 'config.tab_menu.reset'|trans }}</a></li> | ||
20 | </ul> | 21 | </ul> |
21 | </div> | 22 | </div> |
22 | 23 | ||
@@ -294,11 +295,11 @@ | |||
294 | « {{ tagging_rule.rule }} » | 295 | « {{ tagging_rule.rule }} » |
295 | {{ 'config.form_rules.then_tag_as_label'|trans }} | 296 | {{ 'config.form_rules.then_tag_as_label'|trans }} |
296 | « {{ tagging_rule.tags|join(', ') }} » | 297 | « {{ tagging_rule.tags|join(', ') }} » |
297 | <a href="{{ path('edit_tagging_rule', {id: tagging_rule.id}) }}" title="{{ 'config.form_rules.edit_rule_label'|trans }}"> | 298 | <a href="{{ path('edit_tagging_rule', {id: tagging_rule.id}) }}" title="{{ 'config.form_rules.edit_rule_label'|trans }}" class="mode_edit"> |
298 | <i class="tool grey-text mode_edit material-icons">mode_edit</i> | 299 | <i class="tool grey-text material-icons">mode_edit</i> |
299 | </a> | 300 | </a> |
300 | <a href="{{ path('delete_tagging_rule', {id: tagging_rule.id}) }}" title="{{ 'config.form_rules.delete_rule_label'|trans }}"> | 301 | <a href="{{ path('delete_tagging_rule', {id: tagging_rule.id}) }}" title="{{ 'config.form_rules.delete_rule_label'|trans }}" class="delete"> |
301 | <i class="tool grey-text delete material-icons">delete</i> | 302 | <i class="tool grey-text material-icons">delete</i> |
302 | </a> | 303 | </a> |
303 | </li> | 304 | </li> |
304 | {% endfor %} | 305 | {% endfor %} |
@@ -466,6 +467,89 @@ | |||
466 | </div> | 467 | </div> |
467 | 468 | ||
468 | <div id="set6" class="col s12"> | 469 | <div id="set6" class="col s12"> |
470 | {% if app.user.config.ignoreOriginRules is not empty %} | ||
471 | <div class="row"> | ||
472 | <div class="input-field col s12"> | ||
473 | <ul> | ||
474 | {% for ignore_origin_rule in app.user.config.ignoreOriginRules %} | ||
475 | <li> | ||
476 | {{ 'config.form_rules.if_label'|trans }} | ||
477 | « {{ ignore_origin_rule.rule }} » | ||
478 | <a href="{{ path('edit_ignore_origin_rule', {id: ignore_origin_rule.id}) }}" title="{{ 'config.form_rules.edit_rule_label'|trans }}" class="mode_edit"> | ||
479 | <i class="tool grey-text material-icons">mode_edit</i> | ||
480 | </a> | ||
481 | <a href="{{ path('delete_ignore_origin_rule', {id: ignore_origin_rule.id}) }}" title="{{ 'config.form_rules.delete_rule_label'|trans }}" class="delete"> | ||
482 | <i class="tool grey-text material-icons">delete</i> | ||
483 | </a> | ||
484 | </li> | ||
485 | {% endfor %} | ||
486 | </ul> | ||
487 | </div> | ||
488 | </div> | ||
489 | {% endif %} | ||
490 | |||
491 | {{ form_start(form.new_ignore_origin_user_rule) }} | ||
492 | {{ form_errors(form.new_ignore_origin_user_rule) }} | ||
493 | |||
494 | <div class="row"> | ||
495 | <div class="input-field col s12"> | ||
496 | {{ form_label(form.new_ignore_origin_user_rule.rule) }} | ||
497 | {{ form_errors(form.new_ignore_origin_user_rule.rule) }} | ||
498 | {{ form_widget(form.new_ignore_origin_user_rule.rule) }} | ||
499 | </div> | ||
500 | </div> | ||
501 | |||
502 | {{ form_widget(form.new_ignore_origin_user_rule.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} | ||
503 | {{ form_rest(form.new_ignore_origin_user_rule) }} | ||
504 | </form> | ||
505 | |||
506 | |||
507 | |||
508 | <div class="row"> | ||
509 | <div class="input-field col s12"> | ||
510 | <h4>{{ 'config.form_ignore_origin_rules.faq.title'|trans }}</h4> | ||
511 | |||
512 | <h5>{{ 'config.form_ignore_origin_rules.faq.ignore_origin_rules_definition_title'|trans }}</h5> | ||
513 | <p class="help">{{ 'config.form_ignore_origin_rules.faq.ignore_origin_rules_definition_description'|trans|raw }}</p> | ||
514 | |||
515 | <h5>{{ 'config.form_ignore_origin_rules.faq.how_to_use_them_title'|trans }}</h5> | ||
516 | <p class="help">{{ 'config.form_ignore_origin_rules.faq.how_to_use_them_description'|trans|raw }}</p> | ||
517 | |||
518 | <h5>{{ 'config.form_ignore_origin_rules.faq.variables_available_title'|trans }}</h5> | ||
519 | <p class="help"> | ||
520 | {{ 'config.form_ignore_origin_rules.faq.variables_available_description'|trans }} | ||
521 | </p> | ||
522 | |||
523 | <table class="bordered"> | ||
524 | <thead> | ||
525 | <tr> | ||
526 | <th>{{ 'config.form_ignore_origin_rules.faq.variable_description.label'|trans }}</th> | ||
527 | <th>{{ 'config.form_ignore_origin_rules.faq.meaning'|trans }}</th> | ||
528 | <th>{{ 'config.form_ignore_origin_rules.faq.operator_description.label'|trans }}</th> | ||
529 | <th>{{ 'config.form_ignore_origin_rules.faq.meaning'|trans }}</th> | ||
530 | </tr> | ||
531 | </thead> | ||
532 | |||
533 | <tbody> | ||
534 | <tr> | ||
535 | <td>host</td> | ||
536 | <td>{{ 'config.form_ignore_origin_rules.faq.variable_description.host'|trans }}</td> | ||
537 | <td>=</td> | ||
538 | <td>{{ 'config.form_ignore_origin_rules.faq.operator_description.equal_to'|trans }}</td> | ||
539 | </tr> | ||
540 | <tr> | ||
541 | <td>_all</td> | ||
542 | <td>{{ 'config.form_ignore_origin_rules.faq.variable_description._all'|trans }}</td> | ||
543 | <td>~</td> | ||
544 | <td>{{ 'config.form_ignore_origin_rules.faq.operator_description.matches'|trans|raw }}</td> | ||
545 | </tr> | ||
546 | </tbody> | ||
547 | </table> | ||
548 | </div> | ||
549 | </div> | ||
550 | </div> | ||
551 | |||
552 | <div id="set7" class="col s12"> | ||
469 | <div class="row"> | 553 | <div class="row"> |
470 | <h5>{{ 'config.reset.title'|trans }}</h5> | 554 | <h5>{{ 'config.reset.title'|trans }}</h5> |
471 | <p>{{ 'config.reset.description'|trans }}</p> | 555 | <p>{{ 'config.reset.description'|trans }}</p> |
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..30c2a520 --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/IgnoreOriginInstanceRule/edit.html.twig | |||
@@ -0,0 +1,87 @@ | |||
1 | {% extends "WallabagCoreBundle::layout.html.twig" %} | ||
2 | |||
3 | {% block title %}{{ 'ignore_origin_instance_rule.page_title'|trans }}{% endblock %} | ||
4 | |||
5 | {% block content %} | ||
6 | |||
7 | <div class="row"> | ||
8 | <div class="col s12"> | ||
9 | <div class="card-panel"> | ||
10 | <div class="row"> | ||
11 | <div class="input-field col s12"> | ||
12 | <h4>{{ 'ignore_origin_instance_rule.edit_ignore_origin_instance_rule'|trans }}</h4> | ||
13 | |||
14 | <div id="set6" class="col s12"> | ||
15 | {{ form_start(edit_form) }} | ||
16 | {{ form_errors(edit_form) }} | ||
17 | |||
18 | <div class="row"> | ||
19 | <div class="input-field col s12"> | ||
20 | {{ form_label(edit_form.rule) }} | ||
21 | {{ form_errors(edit_form.rule) }} | ||
22 | {{ form_widget(edit_form.rule) }} | ||
23 | </div> | ||
24 | </div> | ||
25 | |||
26 | <br/> | ||
27 | |||
28 | {{ form_widget(edit_form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} | ||
29 | {{ form_widget(edit_form._token) }} | ||
30 | </form> | ||
31 | <p> | ||
32 | {{ form_start(delete_form) }} | ||
33 | <button onclick="return confirm('{{ 'ignore_origin_instance_rule.form.delete_confirm'|trans|escape('js') }}')" type="submit" class="btn waves-effect waves-light red">{{ 'ignore_origin_instance_rule.form.delete'|trans }}</button> | ||
34 | {{ form_end(delete_form) }} | ||
35 | </p> | ||
36 | <p><a class="waves-effect waves-light btn blue-grey" href="{{ path('ignore_origin_instance_rules_index') }}">{{ 'ignore_origin_instance_rule.form.back_to_list'|trans }}</a></p> | ||
37 | </div> | ||
38 | </div> | ||
39 | </div> | ||
40 | |||
41 | <div class="row"> | ||
42 | <div class="input-field col s12"> | ||
43 | <h4>{{ 'config.form_ignore_origin_rules.faq.title'|trans }}</h4> | ||
44 | |||
45 | <h5>{{ 'config.form_ignore_origin_rules.faq.ignore_origin_rules_definition_title'|trans }}</h5> | ||
46 | <p class="help">{{ 'config.form_ignore_origin_rules.faq.ignore_origin_rules_definition_description'|trans|raw }}</p> | ||
47 | |||
48 | <h5>{{ 'config.form_ignore_origin_rules.faq.how_to_use_them_title'|trans }}</h5> | ||
49 | <p class="help">{{ 'config.form_ignore_origin_rules.faq.how_to_use_them_description'|trans|raw }}</p> | ||
50 | |||
51 | <h5>{{ 'config.form_ignore_origin_rules.faq.variables_available_title'|trans }}</h5> | ||
52 | <p class="help"> | ||
53 | {{ 'config.form_ignore_origin_rules.faq.variables_available_description'|trans }} | ||
54 | </p> | ||
55 | |||
56 | <table class="bordered"> | ||
57 | <thead> | ||
58 | <tr> | ||
59 | <th>{{ 'config.form_ignore_origin_rules.faq.variable_description.label'|trans }}</th> | ||
60 | <th>{{ 'config.form_ignore_origin_rules.faq.meaning'|trans }}</th> | ||
61 | <th>{{ 'config.form_ignore_origin_rules.faq.operator_description.label'|trans }}</th> | ||
62 | <th>{{ 'config.form_ignore_origin_rules.faq.meaning'|trans }}</th> | ||
63 | </tr> | ||
64 | </thead> | ||
65 | |||
66 | <tbody> | ||
67 | <tr> | ||
68 | <td>host</td> | ||
69 | <td>{{ 'config.form_ignore_origin_rules.faq.variable_description.host'|trans }}</td> | ||
70 | <td>=</td> | ||
71 | <td>{{ 'config.form_ignore_origin_rules.faq.operator_description.equal_to'|trans }}</td> | ||
72 | </tr> | ||
73 | <tr> | ||
74 | <td>_all</td> | ||
75 | <td>{{ 'config.form_ignore_origin_rules.faq.variable_description._all'|trans }}</td> | ||
76 | <td>~</td> | ||
77 | <td>{{ 'config.form_ignore_origin_rules.faq.operator_description.matches'|trans|raw }}</td> | ||
78 | </tr> | ||
79 | </tbody> | ||
80 | </table> | ||
81 | </div> | ||
82 | </div> | ||
83 | </div> | ||
84 | </div> | ||
85 | </div> | ||
86 | |||
87 | {% 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 @@ | |||
1 | {% extends "WallabagCoreBundle::layout.html.twig" %} | ||
2 | |||
3 | {% block title %}{{ 'ignore_origin_instance_rule.page_title'|trans }}{% endblock %} | ||
4 | |||
5 | {% block content %} | ||
6 | |||
7 | <div class="row"> | ||
8 | <div class="col s12"> | ||
9 | <div class="card-panel"> | ||
10 | <div class="row"> | ||
11 | <div class="input-field col s12"> | ||
12 | <p class="help">{{ 'ignore_origin_instance_rule.description'|trans|raw }}</p> | ||
13 | |||
14 | <table class="bordered"> | ||
15 | <thead> | ||
16 | <tr> | ||
17 | <th>{{ 'ignore_origin_instance_rule.form.rule_label'|trans }}</th> | ||
18 | <th>{{ 'ignore_origin_instance_rule.list.actions'|trans }}</th> | ||
19 | </tr> | ||
20 | </thead> | ||
21 | <tbody> | ||
22 | {% for rule in rules %} | ||
23 | <tr> | ||
24 | <td>{{ rule.rule }}</td> | ||
25 | <td> | ||
26 | <a href="{{ path('ignore_origin_instance_rules_edit', { 'id': rule.id }) }}">{{ 'ignore_origin_instance_rule.list.edit_action'|trans }}</a> | ||
27 | </td> | ||
28 | </tr> | ||
29 | {% endfor %} | ||
30 | </tbody> | ||
31 | </table> | ||
32 | <br /> | ||
33 | <p> | ||
34 | <a href="{{ path('ignore_origin_instance_rules_new') }}" class="waves-effect waves-light btn">{{ 'ignore_origin_instance_rule.list.create_new_one'|trans }}</a> | ||
35 | </p> | ||
36 | </div> | ||
37 | </div> | ||
38 | </div> | ||
39 | </div> | ||
40 | </div> | ||
41 | |||
42 | {% 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..cb052ff0 --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/IgnoreOriginInstanceRule/new.html.twig | |||
@@ -0,0 +1,80 @@ | |||
1 | {% extends "WallabagCoreBundle::layout.html.twig" %} | ||
2 | |||
3 | {% block title %}{{ 'ignore_origin_instance_rule.page_title'|trans }}{% endblock %} | ||
4 | |||
5 | {% block content %} | ||
6 | |||
7 | <div class="row"> | ||
8 | <div class="col s12"> | ||
9 | <div class="card-panel"> | ||
10 | <div class="row"> | ||
11 | <div class="input-field col s12"> | ||
12 | <h4>{{ 'ignore_origin_instance_rule.new_ignore_origin_instance_rule'|trans }}</h4> | ||
13 | |||
14 | <div id="set6" class="col s12"> | ||
15 | {{ form_start(form) }} | ||
16 | {{ form_errors(form) }} | ||
17 | |||
18 | <div class="row"> | ||
19 | <div class="input-field col s12"> | ||
20 | {{ form_label(form.rule) }} | ||
21 | {{ form_errors(form.rule) }} | ||
22 | {{ form_widget(form.rule) }} | ||
23 | </div> | ||
24 | </div> | ||
25 | |||
26 | {{ form_widget(form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} | ||
27 | {{ form_rest(form) }} | ||
28 | </form> | ||
29 | <p><a class="waves-effect waves-light btn blue-grey" href="{{ path('ignore_origin_instance_rules_index') }}">{{ 'ignore_origin_instance_rule.form.back_to_list'|trans }}</a></p> | ||
30 | </div> | ||
31 | </div> | ||
32 | </div> | ||
33 | |||
34 | <div class="row"> | ||
35 | <div class="input-field col s12"> | ||
36 | <h4>{{ 'config.form_ignore_origin_rules.faq.title'|trans }}</h4> | ||
37 | |||
38 | <h5>{{ 'config.form_ignore_origin_rules.faq.ignore_origin_rules_definition_title'|trans }}</h5> | ||
39 | <p class="help">{{ 'config.form_ignore_origin_rules.faq.ignore_origin_rules_definition_description'|trans|raw }}</p> | ||
40 | |||
41 | <h5>{{ 'config.form_ignore_origin_rules.faq.how_to_use_them_title'|trans }}</h5> | ||
42 | <p class="help">{{ 'config.form_ignore_origin_rules.faq.how_to_use_them_description'|trans|raw }}</p> | ||
43 | |||
44 | <h5>{{ 'config.form_ignore_origin_rules.faq.variables_available_title'|trans }}</h5> | ||
45 | <p class="help"> | ||
46 | {{ 'config.form_ignore_origin_rules.faq.variables_available_description'|trans }} | ||
47 | </p> | ||
48 | |||
49 | <table class="bordered"> | ||
50 | <thead> | ||
51 | <tr> | ||
52 | <th>{{ 'config.form_ignore_origin_rules.faq.variable_description.label'|trans }}</th> | ||
53 | <th>{{ 'config.form_ignore_origin_rules.faq.meaning'|trans }}</th> | ||
54 | <th>{{ 'config.form_ignore_origin_rules.faq.operator_description.label'|trans }}</th> | ||
55 | <th>{{ 'config.form_ignore_origin_rules.faq.meaning'|trans }}</th> | ||
56 | </tr> | ||
57 | </thead> | ||
58 | |||
59 | <tbody> | ||
60 | <tr> | ||
61 | <td>host</td> | ||
62 | <td>{{ 'config.form_ignore_origin_rules.faq.variable_description.host'|trans }}</td> | ||
63 | <td>=</td> | ||
64 | <td>{{ 'config.form_ignore_origin_rules.faq.operator_description.equal_to'|trans }}</td> | ||
65 | </tr> | ||
66 | <tr> | ||
67 | <td>_all</td> | ||
68 | <td>{{ 'config.form_ignore_origin_rules.faq.variable_description._all'|trans }}</td> | ||
69 | <td>~</td> | ||
70 | <td>{{ 'config.form_ignore_origin_rules.faq.operator_description.matches'|trans|raw }}</td> | ||
71 | </tr> | ||
72 | </tbody> | ||
73 | </table> | ||
74 | </div> | ||
75 | </div> | ||
76 | </div> | ||
77 | </div> | ||
78 | </div> | ||
79 | |||
80 | {% 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 @@ | |||
78 | <a class="waves-effect" href="{{ path('user_index') }}">{{ 'menu.left.users_management'|trans }}</a> | 78 | <a class="waves-effect" href="{{ path('user_index') }}">{{ 'menu.left.users_management'|trans }}</a> |
79 | </li> | 79 | </li> |
80 | 80 | ||
81 | <li class="bold border-bottom {% if currentRoute == 'craue_config_settings_modify' %}active{% endif %}"> | 81 | <li class="bold {% if currentRoute == 'craue_config_settings_modify' %}active{% endif %}"> |
82 | <a class="waves-effect" href="{{ path('craue_config_settings_modify') }}">{{ 'menu.left.internal_settings'|trans }}</a> | 82 | <a class="waves-effect" href="{{ path('craue_config_settings_modify') }}">{{ 'menu.left.internal_settings'|trans }}</a> |
83 | </li> | 83 | </li> |
84 | |||
85 | <li class="bold border-bottom {% if currentRoute == 'ignore_origin_instance_rules_index' %}active{% endif %}"> | ||
86 | <a class="waves-effect" href="{{ path('ignore_origin_instance_rules_index') }}">{{ 'menu.left.ignore_origin_instance_rules'|trans }}</a> | ||
87 | </li> | ||
84 | {% endif %} | 88 | {% endif %} |
85 | <li class="bold {% if currentRoute == 'import' %}active{% endif %}"> | 89 | <li class="bold {% if currentRoute == 'import' %}active{% endif %}"> |
86 | <a class="waves-effect" href="{{ path('import') }}">{{ 'menu.left.import'|trans }}</a> | 90 | <a class="waves-effect" href="{{ path('import') }}">{{ 'menu.left.import'|trans }}</a> |