diff options
author | Kevin Decherf <kevin@kdecherf.com> | 2019-09-19 23:14:10 +0200 |
---|---|---|
committer | Kevin Decherf <kevin@kdecherf.com> | 2020-04-25 15:59:23 +0200 |
commit | 25c754f62f2230b76d357d6201432fa141f865f2 (patch) | |
tree | ca56f5e0168b42fac726384e1fd945a148074ad7 /src | |
parent | 7408a6cb687959eac6bc7a2ed370695bbf88b6d6 (diff) | |
download | wallabag-25c754f62f2230b76d357d6201432fa141f865f2.tar.gz wallabag-25c754f62f2230b76d357d6201432fa141f865f2.tar.zst wallabag-25c754f62f2230b76d357d6201432fa141f865f2.zip |
views: Add doc and translations on ignore origin rules forms
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
Diffstat (limited to 'src')
20 files changed, 512 insertions, 0 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml index 05ee0b10..54df2e64 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml | |||
@@ -179,6 +179,24 @@ config: | |||
179 | # and: 'One rule AND another' | 179 | # and: 'One rule AND another' |
180 | # 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>' |
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>' | 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>' | ||
182 | otp: | 200 | otp: |
183 | # page_title: Two-factor authentication | 201 | # page_title: Two-factor authentication |
184 | # app: | 202 | # app: |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml index 908be26e..549704d0 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml | |||
@@ -179,6 +179,24 @@ config: | |||
179 | and: 'Eine Regel UND eine andere' | 179 | and: 'Eine Regel UND eine andere' |
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>' | 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>' |
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>' | 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>' | ||
182 | otp: | 200 | otp: |
183 | # page_title: Two-factor authentication | 201 | # page_title: Two-factor authentication |
184 | # app: | 202 | # app: |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml index d831a2aa..a68a7d7d 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml | |||
@@ -179,6 +179,24 @@ config: | |||
179 | and: 'One rule AND another' | 179 | and: 'One rule AND another' |
180 | 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>' |
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>' | 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>' | ||
182 | otp: | 200 | otp: |
183 | page_title: Two-factor authentication | 201 | page_title: Two-factor authentication |
184 | app: | 202 | app: |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml index 4de4dcb5..c3e3ba81 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml | |||
@@ -179,6 +179,24 @@ config: | |||
179 | and: 'Una regla Y la otra' | 179 | and: 'Una regla Y la otra' |
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>' | 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>' |
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>' | 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>' | ||
182 | otp: | 200 | otp: |
183 | page_title: Autenticación de dos pasos | 201 | page_title: Autenticación de dos pasos |
184 | app: | 202 | app: |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml index 32dcdb3c..4a52a208 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml | |||
@@ -179,6 +179,24 @@ config: | |||
179 | # and: 'One rule AND another' | 179 | # and: 'One rule AND another' |
180 | # 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>' |
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>' | 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>' | ||
182 | otp: | 200 | otp: |
183 | # page_title: Two-factor authentication | 201 | # page_title: Two-factor authentication |
184 | # app: | 202 | # app: |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml index dfdf2083..2cfab8cf 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml | |||
@@ -179,6 +179,24 @@ config: | |||
179 | and: "Une règle ET l’autre" | 179 | and: "Une règle ET l’autre" |
180 | 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>" |
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>" | 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>" | ||
182 | otp: | 200 | otp: |
183 | page_title: Authentification double-facteur | 201 | page_title: Authentification double-facteur |
184 | app: | 202 | app: |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml index 42a50ca5..af1c1fe7 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml | |||
@@ -179,6 +179,24 @@ config: | |||
179 | and: "Una regola E un'altra" | 179 | and: "Una regola E un'altra" |
180 | 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>' |
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>' | 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>' | ||
182 | otp: | 200 | otp: |
183 | # page_title: Two-factor authentication | 201 | # page_title: Two-factor authentication |
184 | # app: | 202 | # app: |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml index df3553c8..59dd9b22 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml | |||
@@ -179,6 +179,24 @@ config: | |||
179 | and: "Una règla E l'autra" | 179 | and: "Una règla E l'autra" |
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>' | 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>' |
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>' | 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>' | ||
182 | otp: | 200 | otp: |
183 | page_title: Autentificacion en dos temps | 201 | page_title: Autentificacion en dos temps |
184 | app: | 202 | app: |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml index 41977ede..c09ef47a 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml | |||
@@ -179,6 +179,24 @@ config: | |||
179 | and: 'Jedna reguła I inna' | 179 | and: 'Jedna reguła I inna' |
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>' | 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>' |
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>' | 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>' | ||
182 | otp: | 200 | otp: |
183 | # page_title: Two-factor authentication | 201 | # page_title: Two-factor authentication |
184 | # app: | 202 | # app: |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml index 78918e15..293a4e44 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml | |||
@@ -179,6 +179,24 @@ config: | |||
179 | and: 'Uma regra E outra' | 179 | and: 'Uma regra E outra' |
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>' | 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>' |
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>' | 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>' | ||
182 | otp: | 200 | otp: |
183 | page_title: Autenticação de dois fatores | 201 | page_title: Autenticação de dois fatores |
184 | app: | 202 | app: |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml index 5400187a..3c605709 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml | |||
@@ -179,6 +179,24 @@ config: | |||
179 | # and: 'One rule AND another' | 179 | # and: 'One rule AND another' |
180 | # 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>' |
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>' | 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>' | ||
182 | otp: | 200 | otp: |
183 | # page_title: Two-factor authentication | 201 | # page_title: Two-factor authentication |
184 | # app: | 202 | # app: |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml index ce803ecd..eead4ec6 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml | |||
@@ -179,6 +179,24 @@ config: | |||
179 | and: 'Одно правило И другое' | 179 | and: 'Одно правило И другое' |
180 | matches: 'Тесты, в которых <i> тема </i> соответствует <i> поиску </i> (без учета регистра). Пример: <code> title matches "футбол" </code>' | 180 | matches: 'Тесты, в которых <i> тема </i> соответствует <i> поиску </i> (без учета регистра). Пример: <code> title matches "футбол" </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>' | 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>' | ||
182 | otp: | 200 | otp: |
183 | # page_title: Two-factor authentication | 201 | # page_title: Two-factor authentication |
184 | # app: | 202 | # app: |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml index 7c887781..8d2b05f3 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml | |||
@@ -179,6 +179,24 @@ config: | |||
179 | and: 'หนึ่งข้อบังคับและอื่นๆ' | 179 | and: 'หนึ่งข้อบังคับและอื่นๆ' |
180 | matches: 'ทดสอบว่า <i>เรื่อง</i> นี้ตรงกับ <i>การต้นหา</i> (กรณีไม่ทราบ).<br />ตัวอย่าง: <code>หัวข้อที่ตรงกับ "football"</code>' | 180 | matches: 'ทดสอบว่า <i>เรื่อง</i> นี้ตรงกับ <i>การต้นหา</i> (กรณีไม่ทราบ).<br />ตัวอย่าง: <code>หัวข้อที่ตรงกับ "football"</code>' |
181 | 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>' | ||
182 | otp: | 200 | otp: |
183 | # page_title: Two-factor authentication | 201 | # page_title: Two-factor authentication |
184 | # app: | 202 | # app: |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml index f2ce40d9..dfbc3010 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml | |||
@@ -179,6 +179,24 @@ config: | |||
179 | and: 'Bir kural ve diğeri' | 179 | and: 'Bir kural ve diğeri' |
180 | # 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>' |
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>' | 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>' | ||
182 | otp: | 200 | otp: |
183 | # page_title: Two-factor authentication | 201 | # page_title: Two-factor authentication |
184 | # app: | 202 | # app: |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig index f182fda4..b6edce39 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig | |||
@@ -431,6 +431,49 @@ | |||
431 | {{ form_rest(form.new_ignore_origin_user_rule) }} | 431 | {{ form_rest(form.new_ignore_origin_user_rule) }} |
432 | </form> | 432 | </form> |
433 | 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 | |||
434 | <h2>{{ 'config.reset.title'|trans }}</h2> | 477 | <h2>{{ 'config.reset.title'|trans }}</h2> |
435 | <fieldset class="w500p inline"> | 478 | <fieldset class="w500p inline"> |
436 | <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 index ebb07d07..30c2a520 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/IgnoreOriginInstanceRule/edit.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/IgnoreOriginInstanceRule/edit.html.twig | |||
@@ -37,6 +37,49 @@ | |||
37 | </div> | 37 | </div> |
38 | </div> | 38 | </div> |
39 | </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> | ||
40 | </div> | 83 | </div> |
41 | </div> | 84 | </div> |
42 | </div> | 85 | </div> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/IgnoreOriginInstanceRule/new.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/IgnoreOriginInstanceRule/new.html.twig index fbe1f795..cb052ff0 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/IgnoreOriginInstanceRule/new.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/IgnoreOriginInstanceRule/new.html.twig | |||
@@ -30,6 +30,49 @@ | |||
30 | </div> | 30 | </div> |
31 | </div> | 31 | </div> |
32 | </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> | ||
33 | </div> | 76 | </div> |
34 | </div> | 77 | </div> |
35 | </div> | 78 | </div> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig index faf9a424..22b38a1b 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig | |||
@@ -502,6 +502,51 @@ | |||
502 | {{ form_widget(form.new_ignore_origin_user_rule.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} | 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) }} | 503 | {{ form_rest(form.new_ignore_origin_user_rule) }} |
504 | </form> | 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> | ||
505 | </div> | 550 | </div> |
506 | 551 | ||
507 | <div id="set7" class="col s12"> | 552 | <div id="set7" class="col s12"> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/IgnoreOriginInstanceRule/edit.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/IgnoreOriginInstanceRule/edit.html.twig index ebb07d07..30c2a520 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/IgnoreOriginInstanceRule/edit.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/IgnoreOriginInstanceRule/edit.html.twig | |||
@@ -37,6 +37,49 @@ | |||
37 | </div> | 37 | </div> |
38 | </div> | 38 | </div> |
39 | </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> | ||
40 | </div> | 83 | </div> |
41 | </div> | 84 | </div> |
42 | </div> | 85 | </div> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/IgnoreOriginInstanceRule/new.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/IgnoreOriginInstanceRule/new.html.twig index fbe1f795..cb052ff0 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/IgnoreOriginInstanceRule/new.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/IgnoreOriginInstanceRule/new.html.twig | |||
@@ -30,6 +30,49 @@ | |||
30 | </div> | 30 | </div> |
31 | </div> | 31 | </div> |
32 | </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> | ||
33 | </div> | 76 | </div> |
34 | </div> | 77 | </div> |
35 | </div> | 78 | </div> |