From 1e921a657f02748d1745f5d98cdb2b3c50dc9555 Mon Sep 17 00:00:00 2001 From: Sebastian Riehm Date: Sat, 25 Jan 2020 16:03:31 +0100 Subject: [PATCH 1/4] cosmetic changes: - http to https - replaced generic .com by specific TLD - updated some dead urls --- app/config/config_dev.yml | 2 +- app/config/wallabag.yml | 8 ++++---- docker-compose.yml | 2 +- .../CoreBundle/Resources/translations/messages.da.yml | 2 +- .../CoreBundle/Resources/translations/messages.en.yml | 2 +- .../CoreBundle/Resources/translations/messages.es.yml | 2 +- .../CoreBundle/Resources/translations/messages.fa.yml | 2 +- .../CoreBundle/Resources/translations/messages.fr.yml | 2 +- .../CoreBundle/Resources/translations/messages.it.yml | 2 +- .../CoreBundle/Resources/translations/messages.oc.yml | 2 +- .../CoreBundle/Resources/translations/messages.pl.yml | 2 +- .../CoreBundle/Resources/translations/messages.pt.yml | 2 +- .../CoreBundle/Resources/translations/messages.ro.yml | 2 +- .../CoreBundle/Resources/translations/messages.ru.yml | 2 +- .../CoreBundle/Resources/translations/messages.th.yml | 2 +- .../CoreBundle/Resources/translations/messages.tr.yml | 2 +- 16 files changed, 19 insertions(+), 19 deletions(-) diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml index 0c4905758..fa6e14e73 100644 --- a/app/config/config_dev.yml +++ b/app/config/config_dev.yml @@ -36,7 +36,7 @@ monolog: channels: [doctrine] swiftmailer: - # see http://mailcatcher.me/ + # see https://mailcatcher.me/ transport: smtp host: 'localhost' port: 1025 diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml index f1ef0924a..bc78053a0 100644 --- a/app/config/wallabag.yml +++ b/app/config/wallabag.yml @@ -26,7 +26,7 @@ wallabag_core: list_mode: 0 fetching_error_message_title: 'No title found' fetching_error_message: | - wallabag can't retrieve contents for this article. Please troubleshoot this issue. + wallabag can't retrieve contents for this article. Please troubleshoot this issue. api_limit_mass_actions: 10 encryption_key_path: "%kernel.project_dir%/data/site-credentials-secret-key.txt" default_internal_settings: @@ -44,7 +44,7 @@ wallabag_core: section: entry - name: diaspora_url - value: http://diasporapod.com + value: https://diasporafoundation.org/ section: entry - name: share_unmark @@ -64,11 +64,11 @@ wallabag_core: section: entry - name: shaarli_url - value: http://myshaarli.com + value: https://github.com/shaarli/Shaarli section: entry - name: scuttle_url - value: http://scuttle.org + value: https://github.com/scronide/scuttle section: entry - name: share_mail diff --git a/docker-compose.yml b/docker-compose.yml index 0f8f09705..34eb09560 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,7 +16,7 @@ services: build: context: docker/php args: - # Set here your timezone using one of this: http://php.net/manual/en/timezones.php + # Set here your timezone using one of this: https://php.net/manual/en/timezones.php timezone: 'Europe/Monaco' ports: - "9000:9000" diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml index 8573ba72e..47de066f9 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml @@ -264,7 +264,7 @@ entry: # provided_by: 'Provided by' new: page_title: 'Gem ny artikel' - placeholder: 'http://website.com' + placeholder: 'https://website.dk' form_new: url_label: Url search: diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml index 206d35627..27585f775 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml @@ -264,7 +264,7 @@ entry: provided_by: 'Provided by' new: page_title: 'Save new entry' - placeholder: 'http://website.com' + placeholder: 'https://website.com' form_new: url_label: Url search: diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml index 10f5e79a8..9d3ea5ebf 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml @@ -264,7 +264,7 @@ entry: provided_by: 'Proporcionado por' new: page_title: 'Guardar un nuevo artículo' - placeholder: 'http://sitioweb.com' + placeholder: 'https://sitioweb.com' form_new: url_label: URL search: diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml index 730b7e68f..c1fb74d37 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml @@ -264,7 +264,7 @@ entry: # provided_by: 'Provided by' new: page_title: 'ذخیرهٔ مقالهٔ تازه' - placeholder: 'http://website.com' + placeholder: 'https://website.ir' form_new: url_label: نشانی search: diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml index 1eecd111a..2b8bb0922 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml @@ -264,7 +264,7 @@ entry: provided_by: "Fourni par" new: page_title: "Sauvegarder un nouvel article" - placeholder: "http://website.com" + placeholder: "https://website.fr" form_new: url_label: "Adresse" search: diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml index f1a8e3b15..8cee3e522 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml @@ -264,7 +264,7 @@ entry: # provided_by: 'Provided by' new: page_title: 'Salva un nuovo contenuto' - placeholder: 'http://website.com' + placeholder: 'https://website.it' form_new: url_label: Url search: diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml index 89bf8b16c..052582ab8 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml @@ -264,7 +264,7 @@ entry: provided_by: 'Provesit per' new: page_title: 'Enregistrar un novèl article' - placeholder: 'http://website.com' + placeholder: 'https://website.cat' form_new: url_label: Url search: diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml index 0118ad218..93e8f8526 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml @@ -264,7 +264,7 @@ entry: provided_by: 'Dostarczony przez' new: page_title: 'Zapisz nowy wpis' - placeholder: 'http://website.com' + placeholder: 'https://website.pl' form_new: url_label: Url search: diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml index d0082cdac..7159569e6 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml @@ -264,7 +264,7 @@ entry: provided_by: 'Fornecido por' new: page_title: 'Salvar novo artigo' - placeholder: 'http://website.com' + placeholder: 'https://website.pt' form_new: url_label: Url search: diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml index c8e2dfb40..f671da8d3 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml @@ -264,7 +264,7 @@ entry: # provided_by: 'Provided by' new: page_title: 'Salvează un nou articol' - placeholder: 'http://website.com' + placeholder: 'https://website.ro' form_new: url_label: Url search: diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml index 41379f90f..7d45df1cb 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml @@ -264,7 +264,7 @@ entry: # provided_by: 'Provided by' new: page_title: 'Сохранить новую запись' - placeholder: 'http://website.com' + placeholder: 'https://website.ru' form_new: url_label: Ссылка search: diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml index b5a3bcb61..03f8fa9a9 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml @@ -264,7 +264,7 @@ entry: # provided_by: 'Provided by' new: page_title: 'บันทึกรายการใหม่' - placeholder: 'http://website.com' + placeholder: 'https://website.th' form_new: url_label: Url search: diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml index 4aaef7818..05cfbbfc9 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml @@ -264,7 +264,7 @@ entry: # provided_by: 'Provided by' new: page_title: 'Yeni makaleyi kaydet' - placeholder: 'http://website.com' + placeholder: 'https://website.tr' form_new: url_label: Url search: From 20349b02dd910a344905111271981921378fe02b Mon Sep 17 00:00:00 2001 From: Sebastian Riehm Date: Sun, 26 Jan 2020 09:45:31 +0100 Subject: [PATCH 2/4] Update wallabag.yml reverted generic urls --- app/config/wallabag.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml index bc78053a0..347d766d2 100644 --- a/app/config/wallabag.yml +++ b/app/config/wallabag.yml @@ -44,7 +44,7 @@ wallabag_core: section: entry - name: diaspora_url - value: https://diasporafoundation.org/ + value: https://diasporapod.com/ section: entry - name: share_unmark @@ -64,10 +64,10 @@ wallabag_core: section: entry - name: shaarli_url - value: https://github.com/shaarli/Shaarli + value: https://myshaarli.com section: entry - - name: scuttle_url + name: https://scuttle.org value: https://github.com/scronide/scuttle section: entry - From 6fb7d4a7ae1da189c5fe007b0c49d0a234f1a726 Mon Sep 17 00:00:00 2001 From: Sebastian Riehm Date: Sun, 26 Jan 2020 09:48:17 +0100 Subject: [PATCH 3/4] fixed annoying typo --- app/config/wallabag.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml index 347d766d2..c54d7eb7d 100644 --- a/app/config/wallabag.yml +++ b/app/config/wallabag.yml @@ -44,7 +44,7 @@ wallabag_core: section: entry - name: diaspora_url - value: https://diasporapod.com/ + value: https://diasporapod.com section: entry - name: share_unmark @@ -67,8 +67,8 @@ wallabag_core: value: https://myshaarli.com section: entry - - name: https://scuttle.org - value: https://github.com/scronide/scuttle + name: scuttle_url + value: https://scuttle.org section: entry - name: share_mail From 1de4a8f938771b2a751a57056777aa4bcb8476c2 Mon Sep 17 00:00:00 2001 From: Sebastian Riehm Date: Mon, 27 Jan 2020 20:05:49 +0100 Subject: [PATCH 4/4] Update messages.es.yml --- src/Wallabag/CoreBundle/Resources/translations/messages.es.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml index 9d3ea5ebf..2cf67176b 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml @@ -264,7 +264,7 @@ entry: provided_by: 'Proporcionado por' new: page_title: 'Guardar un nuevo artículo' - placeholder: 'https://sitioweb.com' + placeholder: 'https://sitioweb.es' form_new: url_label: URL search: