From 7103d9eccbd106001e84f09c218e13eb1508eecc Mon Sep 17 00:00:00 2001 From: Myzel394 <50424412+Myzel394@users.noreply.github.com> Date: Wed, 2 Jun 2021 01:57:48 +0200 Subject: [PATCH 1/3] Add German translation (#339) * Added german language * Fixed translations.json path * Fixed German name --- README.md | 2 +- app/static/settings/languages.json | 2 +- app/static/settings/translations.json | 28 +++++++++++++++++++++++++++ 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f90ffe0..7e6c04c 100644 --- a/README.md +++ b/README.md @@ -441,7 +441,7 @@ def contains(x: list, y: int) -> bool: #### Translating -Whoogle currently supports translations using [`translations.json`](https://github.com/benbusby/whoogle-search/blob/main/app/static/settings/languages.json). Language values in this file need to match the "value" of the according language in [`languages.json`](https://github.com/benbusby/whoogle-search/blob/main/app/static/settings/languages.json) (i.e. "lang_en" for English, "lang_es" for Spanish, etc). After you add a new set of translations to `translations.json`, open a PR with your changes and they will be merged in as soon as possible. +Whoogle currently supports translations using [`translations.json`](https://github.com/benbusby/whoogle-search/blob/main/app/static/settings/translations.json). Language values in this file need to match the "value" of the according language in [`languages.json`](https://github.com/benbusby/whoogle-search/blob/main/app/static/settings/languages.json) (i.e. "lang_en" for English, "lang_es" for Spanish, etc). After you add a new set of translations to `translations.json`, open a PR with your changes and they will be merged in as soon as possible. ## FAQ **What's the difference between this and [Searx](https://github.com/asciimoo/searx)?** diff --git a/app/static/settings/languages.json b/app/static/settings/languages.json index 7056afa..3a9bab9 100644 --- a/app/static/settings/languages.json +++ b/app/static/settings/languages.json @@ -18,7 +18,7 @@ {"name": "Filipino (Pilipino)", "value": "lang_tl"}, {"name": "Finnish (Suomalainen)", "value": "lang_fi"}, {"name": "French (Français)", "value": "lang_fr"}, - {"name": "German (Deutsche)", "value": "lang_de"}, + {"name": "German (Deutsch)", "value": "lang_de"}, {"name": "Greek (Ελληνικά)", "value": "lang_el"}, {"name": "Hebrew (עִברִית)", "value": "lang_iw"}, {"name": "Hindi (हिंदी)", "value": "lang_hi"}, diff --git a/app/static/settings/translations.json b/app/static/settings/translations.json index 0880740..0f712ea 100644 --- a/app/static/settings/translations.json +++ b/app/static/settings/translations.json @@ -1,4 +1,32 @@ { + "lang_de": { + "search": "Suchen", + "config": "Einstellungen", + "config-country": "Ergebnisse nach Land filtern", + "config-country-help": "Hinweis: Wenn aktiv, wird eine Webseite nur angezeigt, wenn sie auch in dem jeweiligen Land *gehosted* wird.", + "config-lang": "Oberflächen-Sprache", + "config-lang-search": "Such-Sprache", + "config-near": "In der Nähe von", + "config-near-help": "Stadt-Name", + "config-block": "Block", + "config-block-help": "Komma-getrennte Liste von Seiten", + "config-nojs": "NoJS-Links anzeigen", + "config-dark": "Dark Mode", + "config-safe": "Sicheres Suchen", + "config-alts": "Social-Media-Links ersetzen", + "config-alts-help": "Ersetzt Twitter/YouTube/Instagram/etc Links mit Alternativen, welche die Privatsphäre respektieren.", + "config-new-tab": "Links in neuen Tabs öffnen", + "config-images": "Bilder-Suche in Vollbild", + "config-images-help": "(Experimentell) Fügt 'View Image'-Einstellung zu Dekstop Bilder-Suchen hinzu. Dadurch werden Thumbnails in niedrigerer Auflösung angezeigt.", + "config-tor": "Tor benutzen", + "config-get-only": "Auschließlich GET-Anfragen", + "config-url": "Root URL", + "config-css": "Custom CSS", + "load": "Laden", + "apply": "Übernehmen", + "save-as": "Speichern unter...", + "github-link": "Auf GitHub öffnen" + }, "lang_en": { "search": "Search", "config": "Configuration", From 59479228bf8ef19737000c8033d028aab95a76de Mon Sep 17 00:00:00 2001 From: Ben Busby Date: Tue, 1 Jun 2021 20:03:05 -0400 Subject: [PATCH 2/3] Add clarification note for Whoogle CSP headers Fixes #336 --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 7e6c04c..b2112d0 100644 --- a/README.md +++ b/README.md @@ -154,6 +154,9 @@ optional arguments: See the [available environment variables](#environment-variables) for additional configuration. ### F) Manual + +*Note: `Content-Security-Policy` headers are already sent by Whoogle -- you don't/shouldn't need to apply a CSP header yourself* + Clone the repo and run the following commands to start the app in a local-only environment: ```bash From fbbe658320e128b8eae9f33f8a1cd7eb61984dec Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Jun 2021 09:37:03 -0400 Subject: [PATCH 3/3] Bump urllib3 from 1.25.9 to 1.26.5 (#341) Bumps [urllib3](https://github.com/urllib3/urllib3) from 1.25.9 to 1.26.5. - [Release notes](https://github.com/urllib3/urllib3/releases) - [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst) - [Commits](https://github.com/urllib3/urllib3/compare/1.25.9...1.26.5) --- updated-dependencies: - dependency-name: urllib3 dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index ad18435..cdfd7e2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -27,7 +27,7 @@ python-dateutil==2.8.1 requests==2.23.0 soupsieve==1.9.5 stem==1.8.0 -urllib3==1.25.9 +urllib3==1.26.5 waitress==1.4.3 wcwidth==0.1.9 Werkzeug==0.16.0