From 25c754f62f2230b76d357d6201432fa141f865f2 Mon Sep 17 00:00:00 2001 From: Kevin Decherf Date: Thu, 19 Sep 2019 23:14:10 +0200 Subject: [PATCH] views: Add doc and translations on ignore origin rules forms Signed-off-by: Kevin Decherf --- .../Resources/translations/messages.da.yml | 18 ++++++++ .../Resources/translations/messages.de.yml | 18 ++++++++ .../Resources/translations/messages.en.yml | 18 ++++++++ .../Resources/translations/messages.es.yml | 18 ++++++++ .../Resources/translations/messages.fa.yml | 18 ++++++++ .../Resources/translations/messages.fr.yml | 18 ++++++++ .../Resources/translations/messages.it.yml | 18 ++++++++ .../Resources/translations/messages.oc.yml | 18 ++++++++ .../Resources/translations/messages.pl.yml | 18 ++++++++ .../Resources/translations/messages.pt.yml | 18 ++++++++ .../Resources/translations/messages.ro.yml | 18 ++++++++ .../Resources/translations/messages.ru.yml | 18 ++++++++ .../Resources/translations/messages.th.yml | 18 ++++++++ .../Resources/translations/messages.tr.yml | 18 ++++++++ .../views/themes/baggy/Config/index.html.twig | 43 ++++++++++++++++++ .../IgnoreOriginInstanceRule/edit.html.twig | 43 ++++++++++++++++++ .../IgnoreOriginInstanceRule/new.html.twig | 43 ++++++++++++++++++ .../themes/material/Config/index.html.twig | 45 +++++++++++++++++++ .../IgnoreOriginInstanceRule/edit.html.twig | 43 ++++++++++++++++++ .../IgnoreOriginInstanceRule/new.html.twig | 43 ++++++++++++++++++ 20 files changed, 512 insertions(+) diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml index 05ee0b10b..54df2e649 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml @@ -179,6 +179,24 @@ config: # and: 'One rule AND another' # matches: 'Tests that a subject matches a search (case-insensitive).
Example: title matches "football"' # notmatches: 'Tests that a subject doesn''t match match a search (case-insensitive).
Example: title notmatches "football"' + form_ignore_origin_rules: + # faq: + # title: 'FAQ' + # ignore_origin_rules_definition_title: 'What does « ignore origin rules » mean?' + # ignore_origin_rules_definition_description: 'They are used by wallabag to automatically ignore an origin address after a redirect.
If a redirect occurs while fetching a new entry, all the ignore origin rules (user defined and instance defined) will be used to ignore the origin address.' + # how_to_use_them_title: 'How do I use them?' + # how_to_use_them_description: 'Let us assume you want to ignore the origin of an entry coming from « rss.example.com » (knowing that after a redirect, the actual address is example.com).
In that case, you should put « host = "rss.example.com" » in the Rule field.' + # variables_available_title: 'Which variables and operators can I use to write rules?' + # variables_available_description: 'The following variables and operators can be used to create ignore origin rules:' + # meaning: 'Meaning' + # variable_description: + # label: 'Variable' + # host: 'Host of the address' + # _all: 'Full address, mainly for pattern matching' + # operator_description: + # label: 'Operator' + # equal_to: 'Equal to…' + # matches: 'Tests that a subject matches a search (case-insensitive).
Example: _all ~ "https?://rss.example.com/foobar/.*"' otp: # page_title: Two-factor authentication # app: diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml index 908be26e6..549704d0d 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml @@ -179,6 +179,24 @@ config: and: 'Eine Regel UND eine andere' matches: 'Testet, ob eine Variable auf eine Suche zutrifft (Groß- und Kleinschreibung wird nicht berücksichtigt).
Beispiel: title matches "Fußball"' notmatches: 'Testet, ob ein Titel nicht auf eine Suche zutrifft (Groß- und Kleinschreibung wird nicht berücksichtigt).
Beispiel: title notmatches "Fußball"' + form_ignore_origin_rules: + # faq: + # title: 'FAQ' + # ignore_origin_rules_definition_title: 'What does « ignore origin rules » mean?' + # ignore_origin_rules_definition_description: 'They are used by wallabag to automatically ignore an origin address after a redirect.
If a redirect occurs while fetching a new entry, all the ignore origin rules (user defined and instance defined) will be used to ignore the origin address.' + # how_to_use_them_title: 'How do I use them?' + # how_to_use_them_description: 'Let us assume you want to ignore the origin of an entry coming from « rss.example.com » (knowing that after a redirect, the actual address is example.com).
In that case, you should put « host = "rss.example.com" » in the Rule field.' + # variables_available_title: 'Which variables and operators can I use to write rules?' + # variables_available_description: 'The following variables and operators can be used to create ignore origin rules:' + # meaning: 'Meaning' + # variable_description: + # label: 'Variable' + # host: 'Host of the address' + # _all: 'Full address, mainly for pattern matching' + # operator_description: + # label: 'Operator' + # equal_to: 'Equal to…' + # matches: 'Tests that a subject matches a search (case-insensitive).
Example: _all ~ "https?://rss.example.com/foobar/.*"' otp: # page_title: Two-factor authentication # app: diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml index d831a2aae..a68a7d7de 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml @@ -179,6 +179,24 @@ config: and: 'One rule AND another' matches: 'Tests that a subject matches a search (case-insensitive).
Example: title matches "football"' notmatches: 'Tests that a subject doesn''t match match a search (case-insensitive).
Example: title notmatches "football"' + form_ignore_origin_rules: + faq: + title: 'FAQ' + ignore_origin_rules_definition_title: 'What does « ignore origin rules » mean?' + ignore_origin_rules_definition_description: 'They are used by wallabag to automatically ignore an origin address after a redirect.
If a redirect occurs while fetching a new entry, all the ignore origin rules (user defined and instance defined) will be used to ignore the origin address.' + how_to_use_them_title: 'How do I use them?' + how_to_use_them_description: 'Let us assume you want to ignore the origin of an entry coming from « rss.example.com » (knowing that after a redirect, the actual address is example.com).
In that case, you should put « host = "rss.example.com" » in the Rule field.' + variables_available_title: 'Which variables and operators can I use to write rules?' + variables_available_description: 'The following variables and operators can be used to create ignore origin rules:' + meaning: 'Meaning' + variable_description: + label: 'Variable' + host: 'Host of the address' + _all: 'Full address, mainly for pattern matching' + operator_description: + label: 'Operator' + equal_to: 'Equal to…' + matches: 'Tests that a subject matches a search (case-insensitive).
Example: _all ~ "https?://rss.example.com/foobar/.*"' otp: page_title: Two-factor authentication app: diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml index 4de4dcb59..c3e3ba816 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml @@ -179,6 +179,24 @@ config: and: 'Una regla Y la otra' matches: 'Prueba si un sujeto corresponde a una búsqueda (insensible a mayúsculas).
Ejemplo : title matches "fútbol"' notmatches: 'Prueba si subject no corresponde a una búsqueda (insensible a mayúsculas).
Example: title notmatches "fútbol"' + form_ignore_origin_rules: + # faq: + # title: 'FAQ' + # ignore_origin_rules_definition_title: 'What does « ignore origin rules » mean?' + # ignore_origin_rules_definition_description: 'They are used by wallabag to automatically ignore an origin address after a redirect.
If a redirect occurs while fetching a new entry, all the ignore origin rules (user defined and instance defined) will be used to ignore the origin address.' + # how_to_use_them_title: 'How do I use them?' + # how_to_use_them_description: 'Let us assume you want to ignore the origin of an entry coming from « rss.example.com » (knowing that after a redirect, the actual address is example.com).
In that case, you should put « host = "rss.example.com" » in the Rule field.' + # variables_available_title: 'Which variables and operators can I use to write rules?' + # variables_available_description: 'The following variables and operators can be used to create ignore origin rules:' + # meaning: 'Meaning' + # variable_description: + # label: 'Variable' + # host: 'Host of the address' + # _all: 'Full address, mainly for pattern matching' + # operator_description: + # label: 'Operator' + # equal_to: 'Equal to…' + # matches: 'Tests that a subject matches a search (case-insensitive).
Example: _all ~ "https?://rss.example.com/foobar/.*"' otp: page_title: Autenticación de dos pasos app: diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml index 32dcdb3c3..4a52a2081 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml @@ -179,6 +179,24 @@ config: # and: 'One rule AND another' # matches: 'Tests that a subject matches a search (case-insensitive).
Example: title matches "football"' # notmatches: 'Tests that a subject doesn''t match match a search (case-insensitive).
Example: title notmatches "football"' + form_ignore_origin_rules: + # faq: + # title: 'FAQ' + # ignore_origin_rules_definition_title: 'What does « ignore origin rules » mean?' + # ignore_origin_rules_definition_description: 'They are used by wallabag to automatically ignore an origin address after a redirect.
If a redirect occurs while fetching a new entry, all the ignore origin rules (user defined and instance defined) will be used to ignore the origin address.' + # how_to_use_them_title: 'How do I use them?' + # how_to_use_them_description: 'Let us assume you want to ignore the origin of an entry coming from « rss.example.com » (knowing that after a redirect, the actual address is example.com).
In that case, you should put « host = "rss.example.com" » in the Rule field.' + # variables_available_title: 'Which variables and operators can I use to write rules?' + # variables_available_description: 'The following variables and operators can be used to create ignore origin rules:' + # meaning: 'Meaning' + # variable_description: + # label: 'Variable' + # host: 'Host of the address' + # _all: 'Full address, mainly for pattern matching' + # operator_description: + # label: 'Operator' + # equal_to: 'Equal to…' + # matches: 'Tests that a subject matches a search (case-insensitive).
Example: _all ~ "https?://rss.example.com/foobar/.*"' otp: # page_title: Two-factor authentication # app: diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml index dfdf20836..2cfab8cf4 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml @@ -179,6 +179,24 @@ config: and: "Une règle ET l’autre" matches: "Teste si un sujet correspond à une recherche (non sensible à la casse).
Exemple : title matches \"football\"" notmatches: "Teste si un sujet ne correspond pas à une recherche (non sensible à la casse).
Exemple : title notmatches \"football\"" + form_ignore_origin_rules: + faq: + title: "FAQ" + ignore_origin_rules_definition_title: "Que signifient les règles d'omission d'origine ?" + ignore_origin_rules_definition_description: "Ce sont des règles utilisées par wallabag pour omettre automatiquement l'adresse d'origine après une redirection.
Si une redirection intervient pendant la récupération d'un nouvel article, toutes les règles d'omission (règles utilisateur et instance) seront utilisées afin d'ignorer ou non l'adresse d'origine." + how_to_use_them_title: "Comment les utiliser ?" + how_to_use_them_description: "Imaginons que vous vouliez omettre l'origine d'un article provenant de « rss.example.com » (sachant qu'après la redirection, l'adresse réelle est example.com).
Dans ce cas, vous devriez mettre « host = \"rss.example.com\" » dans le champ Règle." + variables_available_title: "Quelles variables et opérateurs puis-je utiliser pour écrire des règles ?" + variables_available_description: "Les variables et opérateurs suivants peuvent être utilisés pour écrire des règles d'omission d'origine :" + meaning: "Signification" + variable_description: + label: "Variable" + host: "Hôte" + _all: "Adresse complète, utile pour les expressions régulières" + operator_description: + label: "Opérateur" + equal_to: "Égal à…" + matches: "Teste si un sujet correspond à une recherche (non sensible à la casse).
Exemple : _all ~ \"https?://rss.example.com/foobar/.*\"" otp: page_title: Authentification double-facteur app: diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml index 42a50ca56..af1c1fe74 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml @@ -179,6 +179,24 @@ config: and: "Una regola E un'altra" matches: 'Verifica che un oggetto risulti in una ricerca (case-insensitive).
Esempio: titolo contiene "football"' # notmatches: 'Tests that a subject doesn''t match match a search (case-insensitive).
Example: title notmatches "football"' + form_ignore_origin_rules: + # faq: + # title: 'FAQ' + # ignore_origin_rules_definition_title: 'What does « ignore origin rules » mean?' + # ignore_origin_rules_definition_description: 'They are used by wallabag to automatically ignore an origin address after a redirect.
If a redirect occurs while fetching a new entry, all the ignore origin rules (user defined and instance defined) will be used to ignore the origin address.' + # how_to_use_them_title: 'How do I use them?' + # how_to_use_them_description: 'Let us assume you want to ignore the origin of an entry coming from « rss.example.com » (knowing that after a redirect, the actual address is example.com).
In that case, you should put « host = "rss.example.com" » in the Rule field.' + # variables_available_title: 'Which variables and operators can I use to write rules?' + # variables_available_description: 'The following variables and operators can be used to create ignore origin rules:' + # meaning: 'Meaning' + # variable_description: + # label: 'Variable' + # host: 'Host of the address' + # _all: 'Full address, mainly for pattern matching' + # operator_description: + # label: 'Operator' + # equal_to: 'Equal to…' + # matches: 'Tests that a subject matches a search (case-insensitive).
Example: _all ~ "https?://rss.example.com/foobar/.*"' otp: # page_title: Two-factor authentication # app: diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml index df3553c8e..59dd9b221 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml @@ -179,6 +179,24 @@ config: and: "Una règla E l'autra" matches: 'Teste se un subjècte correspond a una recèrca (non sensibla a la cassa).
Exemple : title matches \"football\"' notmatches: 'Teste se subjècte correspond pas a una recèrca (sensibla a la cassa).
Example : title notmatches "football"' + form_ignore_origin_rules: + # faq: + # title: 'FAQ' + # ignore_origin_rules_definition_title: 'What does « ignore origin rules » mean?' + # ignore_origin_rules_definition_description: 'They are used by wallabag to automatically ignore an origin address after a redirect.
If a redirect occurs while fetching a new entry, all the ignore origin rules (user defined and instance defined) will be used to ignore the origin address.' + # how_to_use_them_title: 'How do I use them?' + # how_to_use_them_description: 'Let us assume you want to ignore the origin of an entry coming from « rss.example.com » (knowing that after a redirect, the actual address is example.com).
In that case, you should put « host = "rss.example.com" » in the Rule field.' + # variables_available_title: 'Which variables and operators can I use to write rules?' + # variables_available_description: 'The following variables and operators can be used to create ignore origin rules:' + # meaning: 'Meaning' + # variable_description: + # label: 'Variable' + # host: 'Host of the address' + # _all: 'Full address, mainly for pattern matching' + # operator_description: + # label: 'Operator' + # equal_to: 'Equal to…' + # matches: 'Tests that a subject matches a search (case-insensitive).
Example: _all ~ "https?://rss.example.com/foobar/.*"' otp: page_title: Autentificacion en dos temps app: diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml index 41977edec..c09ef47ab 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml @@ -179,6 +179,24 @@ config: and: 'Jedna reguła I inna' matches: 'Sprawdź czy temat pasuje szukaj (duże lub małe litery).
Przykład: tytuł zawiera "piłka nożna"' notmatches: 'Sprawdź czy temat nie zawiera szukaj (duże lub małe litery).
Przykład: tytuł nie zawiera "piłka nożna"' + form_ignore_origin_rules: + # faq: + # title: 'FAQ' + # ignore_origin_rules_definition_title: 'What does « ignore origin rules » mean?' + # ignore_origin_rules_definition_description: 'They are used by wallabag to automatically ignore an origin address after a redirect.
If a redirect occurs while fetching a new entry, all the ignore origin rules (user defined and instance defined) will be used to ignore the origin address.' + # how_to_use_them_title: 'How do I use them?' + # how_to_use_them_description: 'Let us assume you want to ignore the origin of an entry coming from « rss.example.com » (knowing that after a redirect, the actual address is example.com).
In that case, you should put « host = "rss.example.com" » in the Rule field.' + # variables_available_title: 'Which variables and operators can I use to write rules?' + # variables_available_description: 'The following variables and operators can be used to create ignore origin rules:' + # meaning: 'Meaning' + # variable_description: + # label: 'Variable' + # host: 'Host of the address' + # _all: 'Full address, mainly for pattern matching' + # operator_description: + # label: 'Operator' + # equal_to: 'Equal to…' + # matches: 'Tests that a subject matches a search (case-insensitive).
Example: _all ~ "https?://rss.example.com/foobar/.*"' otp: # page_title: Two-factor authentication # app: diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml index 78918e15a..293a4e443 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml @@ -179,6 +179,24 @@ config: and: 'Uma regra E outra' matches: 'Testa que um assunto corresponde a uma pesquisa (maiúscula ou minúscula).
Exemplo: title matches "futebol"' notmatches: 'Testa que um assunto não corresponde a uma search (maiúscula ou minúscula).
Exemplo: title notmatches "futebol"' + form_ignore_origin_rules: + # faq: + # title: 'FAQ' + # ignore_origin_rules_definition_title: 'What does « ignore origin rules » mean?' + # ignore_origin_rules_definition_description: 'They are used by wallabag to automatically ignore an origin address after a redirect.
If a redirect occurs while fetching a new entry, all the ignore origin rules (user defined and instance defined) will be used to ignore the origin address.' + # how_to_use_them_title: 'How do I use them?' + # how_to_use_them_description: 'Let us assume you want to ignore the origin of an entry coming from « rss.example.com » (knowing that after a redirect, the actual address is example.com).
In that case, you should put « host = "rss.example.com" » in the Rule field.' + # variables_available_title: 'Which variables and operators can I use to write rules?' + # variables_available_description: 'The following variables and operators can be used to create ignore origin rules:' + # meaning: 'Meaning' + # variable_description: + # label: 'Variable' + # host: 'Host of the address' + # _all: 'Full address, mainly for pattern matching' + # operator_description: + # label: 'Operator' + # equal_to: 'Equal to…' + # matches: 'Tests that a subject matches a search (case-insensitive).
Example: _all ~ "https?://rss.example.com/foobar/.*"' otp: page_title: Autenticação de dois fatores app: diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml index 5400187ab..3c6057093 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml @@ -179,6 +179,24 @@ config: # and: 'One rule AND another' # matches: 'Tests that a subject matches a search (case-insensitive).
Example: title matches "football"' # notmatches: 'Tests that a subject doesn''t match match a search (case-insensitive).
Example: title notmatches "football"' + form_ignore_origin_rules: + # faq: + # title: 'FAQ' + # ignore_origin_rules_definition_title: 'What does « ignore origin rules » mean?' + # ignore_origin_rules_definition_description: 'They are used by wallabag to automatically ignore an origin address after a redirect.
If a redirect occurs while fetching a new entry, all the ignore origin rules (user defined and instance defined) will be used to ignore the origin address.' + # how_to_use_them_title: 'How do I use them?' + # how_to_use_them_description: 'Let us assume you want to ignore the origin of an entry coming from « rss.example.com » (knowing that after a redirect, the actual address is example.com).
In that case, you should put « host = "rss.example.com" » in the Rule field.' + # variables_available_title: 'Which variables and operators can I use to write rules?' + # variables_available_description: 'The following variables and operators can be used to create ignore origin rules:' + # meaning: 'Meaning' + # variable_description: + # label: 'Variable' + # host: 'Host of the address' + # _all: 'Full address, mainly for pattern matching' + # operator_description: + # label: 'Operator' + # equal_to: 'Equal to…' + # matches: 'Tests that a subject matches a search (case-insensitive).
Example: _all ~ "https?://rss.example.com/foobar/.*"' otp: # page_title: Two-factor authentication # app: diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml index ce803ecda..eead4ec68 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml @@ -179,6 +179,24 @@ config: and: 'Одно правило И другое' matches: 'Тесты, в которых тема соответствует поиску (без учета регистра). Пример: title matches "футбол" ' # notmatches: 'Tests that a subject doesn''t match match a search (case-insensitive).
Example: title notmatches "football"' + form_ignore_origin_rules: + # faq: + # title: 'FAQ' + # ignore_origin_rules_definition_title: 'What does « ignore origin rules » mean?' + # ignore_origin_rules_definition_description: 'They are used by wallabag to automatically ignore an origin address after a redirect.
If a redirect occurs while fetching a new entry, all the ignore origin rules (user defined and instance defined) will be used to ignore the origin address.' + # how_to_use_them_title: 'How do I use them?' + # how_to_use_them_description: 'Let us assume you want to ignore the origin of an entry coming from « rss.example.com » (knowing that after a redirect, the actual address is example.com).
In that case, you should put « host = "rss.example.com" » in the Rule field.' + # variables_available_title: 'Which variables and operators can I use to write rules?' + # variables_available_description: 'The following variables and operators can be used to create ignore origin rules:' + # meaning: 'Meaning' + # variable_description: + # label: 'Variable' + # host: 'Host of the address' + # _all: 'Full address, mainly for pattern matching' + # operator_description: + # label: 'Operator' + # equal_to: 'Equal to…' + # matches: 'Tests that a subject matches a search (case-insensitive).
Example: _all ~ "https?://rss.example.com/foobar/.*"' otp: # page_title: Two-factor authentication # app: diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml index 7c887781b..8d2b05f3f 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml @@ -179,6 +179,24 @@ config: and: 'หนึ่งข้อบังคับและอื่นๆ' matches: 'ทดสอบว่า เรื่อง นี้ตรงกับ การต้นหา (กรณีไม่ทราบ).
ตัวอย่าง: หัวข้อที่ตรงกับ "football"' notmatches: 'ทดสอบว่า เรื่อง นี้ไม่ตรงกับ การต้นหา (กรณีไม่ทราบ).
ตัวอย่าง: หัวข้อทีไม่ตรงกับ "football"' + form_ignore_origin_rules: + # faq: + # title: 'FAQ' + # ignore_origin_rules_definition_title: 'What does « ignore origin rules » mean?' + # ignore_origin_rules_definition_description: 'They are used by wallabag to automatically ignore an origin address after a redirect.
If a redirect occurs while fetching a new entry, all the ignore origin rules (user defined and instance defined) will be used to ignore the origin address.' + # how_to_use_them_title: 'How do I use them?' + # how_to_use_them_description: 'Let us assume you want to ignore the origin of an entry coming from « rss.example.com » (knowing that after a redirect, the actual address is example.com).
In that case, you should put « host = "rss.example.com" » in the Rule field.' + # variables_available_title: 'Which variables and operators can I use to write rules?' + # variables_available_description: 'The following variables and operators can be used to create ignore origin rules:' + # meaning: 'Meaning' + # variable_description: + # label: 'Variable' + # host: 'Host of the address' + # _all: 'Full address, mainly for pattern matching' + # operator_description: + # label: 'Operator' + # equal_to: 'Equal to…' + # matches: 'Tests that a subject matches a search (case-insensitive).
Example: _all ~ "https?://rss.example.com/foobar/.*"' otp: # page_title: Two-factor authentication # app: diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml index f2ce40d90..dfbc30108 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml @@ -179,6 +179,24 @@ config: and: 'Bir kural ve diğeri' # matches: 'Tests that a subject matches a search (case-insensitive).
Example: title matches "football"' # notmatches: 'Tests that a subject doesn''t match match a search (case-insensitive).
Example: title notmatches "football"' + form_ignore_origin_rules: + # faq: + # title: 'FAQ' + # ignore_origin_rules_definition_title: 'What does « ignore origin rules » mean?' + # ignore_origin_rules_definition_description: 'They are used by wallabag to automatically ignore an origin address after a redirect.
If a redirect occurs while fetching a new entry, all the ignore origin rules (user defined and instance defined) will be used to ignore the origin address.' + # how_to_use_them_title: 'How do I use them?' + # how_to_use_them_description: 'Let us assume you want to ignore the origin of an entry coming from « rss.example.com » (knowing that after a redirect, the actual address is example.com).
In that case, you should put « host = "rss.example.com" » in the Rule field.' + # variables_available_title: 'Which variables and operators can I use to write rules?' + # variables_available_description: 'The following variables and operators can be used to create ignore origin rules:' + # meaning: 'Meaning' + # variable_description: + # label: 'Variable' + # host: 'Host of the address' + # _all: 'Full address, mainly for pattern matching' + # operator_description: + # label: 'Operator' + # equal_to: 'Equal to…' + # matches: 'Tests that a subject matches a search (case-insensitive).
Example: _all ~ "https?://rss.example.com/foobar/.*"' otp: # page_title: Two-factor authentication # app: diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig index f182fda40..b6edce39e 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig @@ -431,6 +431,49 @@ {{ form_rest(form.new_ignore_origin_user_rule) }} +
+
+

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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