From f093fd26c1a99b56a49f9d74e13d9fbd975048b6 Mon Sep 17 00:00:00 2001 From: Flux Industries <88303769+FluxIndustries@users.noreply.github.com> Date: Wed, 15 Sep 2021 23:25:00 +0200 Subject: [PATCH 1/6] Add public instance to readme (#423) search.flux.industries --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 4c4fb66..a1d3208 100644 --- a/README.md +++ b/README.md @@ -488,6 +488,7 @@ A lot of the app currently piggybacks on Google's existing support for fetching | [https://search.exonip.de](https://search.exonip.de) | 🇳🇱 NL | | | [https://whoogle.silkky.cloud](https://whoogle.silkky.cloud) | 🇫🇮 FI | | | [https://s.alefvanoon.xyz](https://s.alefvanoon.xyz) | 🇺🇸 US | ✅ | +| [https://search.flux.industries](https://search.flux.industries) | 🇩🇪 DE | ✅ | | [http://whoogledq5f5wly5p4i2ohnvjwlihnlg4oajjum2oeddfwqdwupbuhqd.onion](http://whoogledq5f5wly5p4i2ohnvjwlihnlg4oajjum2oeddfwqdwupbuhqd.onion) | 🇮🇳 IN | | * A checkmark in the "Cloudflare" category here refers to the use of the reverse proxy, [Cloudflare](https://cloudflare). The checkmark will not be listed for a site which uses Cloudflare DNS but rather the proxying service which grants Cloudflare the ability to monitor traffic to the website. From 598b58a43d3eaac4d085419dfd5c4334c6516d21 Mon Sep 17 00:00:00 2001 From: FlawCra Date: Wed, 15 Sep 2021 23:25:51 +0200 Subject: [PATCH 2/6] Update location of public instance (#425) https://search.flawcra.cc -> DE --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a1d3208..372b398 100644 --- a/README.md +++ b/README.md @@ -484,7 +484,7 @@ A lot of the app currently piggybacks on Google's existing support for fetching | [https://whoogle.kavin.rocks](https://whoogle.kavin.rocks) | 🇮🇳 IN | ✅ | | [https://search.garudalinux.org](https://search.garudalinux.org) | 🇩🇪 DE | | | [https://whooglesearch.net](https://whooglesearch.net) | 🇺🇸 US | | -| [https://search.flawcra.cc](https://search.flawcra.cc) | | ✅ | +| [https://search.flawcra.cc](https://search.flawcra.cc) | 🇩🇪 DE | ✅ | | [https://search.exonip.de](https://search.exonip.de) | 🇳🇱 NL | | | [https://whoogle.silkky.cloud](https://whoogle.silkky.cloud) | 🇫🇮 FI | | | [https://s.alefvanoon.xyz](https://s.alefvanoon.xyz) | 🇺🇸 US | ✅ | From b4e2add14696e60966b34876115ec8a6ba620b63 Mon Sep 17 00:00:00 2001 From: Ben Busby Date: Wed, 15 Sep 2021 15:27:11 -0600 Subject: [PATCH 3/6] Run GH action tests on PRs --- .github/workflows/tests.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 62bfd57..0fd7a52 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -1,7 +1,6 @@ name: tests -on: - push +on: [push, pull_request] jobs: test: From ed963933d9c0a921b30ee605c3bfb724a2f3a7b7 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Thu, 16 Sep 2021 05:27:50 +0800 Subject: [PATCH 4/6] Add ini highlighting to readme (#426) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 372b398..8ac4914 100644 --- a/README.md +++ b/README.md @@ -173,7 +173,7 @@ See the [available environment variables](#environment-variables) for additional #### systemd Configuration After building the virtual environment, you can add the following to `/lib/systemd/system/whoogle.service` to set up a Whoogle Search systemd service: -``` +```ini [Unit] Description=Whoogle From 5289b4ceb326153987acf0522feabd39202d6f19 Mon Sep 17 00:00:00 2001 From: Kang-min Liu Date: Thu, 16 Sep 2021 06:30:53 +0900 Subject: [PATCH 5/6] Add zh-TW translations (#428) There are a few conventional choices but this one should be friendly and generally accepted by local reader. Previous version is still comprehensible but lesser users (perhaps used in Japanese documents) and may give local users a pause. --- app/static/settings/languages.json | 2 +- app/static/settings/translations.json | 33 +++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/app/static/settings/languages.json b/app/static/settings/languages.json index e872766..3bf750a 100644 --- a/app/static/settings/languages.json +++ b/app/static/settings/languages.json @@ -8,7 +8,7 @@ {"name": "Bulgarian (български)", "value": "lang_bg"}, {"name": "Catalan (Català)", "value": "lang_ca"}, {"name": "Chinese, Simplified (简体中文)", "value": "lang_zh-CN"}, - {"name": "Chinese, Traditional (繁体中文)", "value": "lang_zh-TW"}, + {"name": "Chinese, Traditional (正體中文)", "value": "lang_zh-TW"}, {"name": "Croatian (Hrvatski)", "value": "lang_hr"}, {"name": "Czech (čeština)", "value": "lang_cs"}, {"name": "Danish (Dansk)", "value": "lang_da"}, diff --git a/app/static/settings/translations.json b/app/static/settings/translations.json index 3c58cfd..6bb31b9 100644 --- a/app/static/settings/translations.json +++ b/app/static/settings/translations.json @@ -361,5 +361,38 @@ "light": "Světlý", "dark": "Tmavý", "system": "Systémový" + }, + "lang_zh-TW": { + "search": "搜尋", + "config": "設定", + "config-country": "依國家過濾結果", + "config-country-help": "注意：一經套用，只有在部署在指定國家內的網站會出現在搜尋結果中。", + "config-lang": "界面語言", + "config-lang-search": "搜尋語言", + "config-near": "接近", + "config-near-help": "城市名", + "config-block": "排除", + "config-block-help": "網址列表，以逗號分隔", + "config-theme": "主題", + "config-nojs": "顯示 NoJS 連結", + "config-dark": "深色模式", + "config-safe": "安全搜尋", + "config-alts": "將社群網站連結換掉", + "config-alts-help": "將 Twitter/YouTube/Instagram 等網站的連結替換為尊重隱私的第三方網站。", + "config-new-tab": "以新分頁開啟連結", + "config-images": "完整尺寸圖片搜尋", + "config-images-help": "（實驗性）在桌面版圖片搜尋中增加「查看圖片」選項。這會使搜尋結果圖片解析度降低", + "config-tor": "使用 Tor", + "config-get-only": "僅限於 GET 要求", + "config-url": "首頁網址", + "config-css": "自定 CSS", + "load": "載入", + "apply": "套用", + "save-as": "另存為...", + "github-link": "在 GitHub 上查看", + "translate": "翻譯", + "light": "明亮的", + "dark": "黑暗的", + "system": "依系統" } } From 817b51eb481e44878084b9d8b88fae826071a24f Mon Sep 17 00:00:00 2001 From: Ben Busby Date: Wed, 15 Sep 2021 16:00:36 -0600 Subject: [PATCH 6/6] Document WHOOGLE_CONFIG_NEAR env var Fixes #406 --- README.md | 1 + app.json | 5 +++++ whoogle.env | 3 +++ 3 files changed, 9 insertions(+) diff --git a/README.md b/README.md index 8ac4914..8601241 100644 --- a/README.md +++ b/README.md @@ -325,6 +325,7 @@ These environment variables allow setting default config values, but can be over | WHOOGLE_CONFIG_THEME | Set theme mode (light, dark, or system) | | WHOOGLE_CONFIG_SAFE | Enable safe searches | | WHOOGLE_CONFIG_ALTS | Use social media site alternatives (nitter, invidious, etc) | +| WHOOGLE_CONFIG_NEAR | Restrict results to only those near a particular city | | WHOOGLE_CONFIG_TOR | Use Tor routing (if available) | | WHOOGLE_CONFIG_NEW_TAB | Always open results in new tab | | WHOOGLE_CONFIG_VIEW_IMAGE | Enable View Image option | diff --git a/app.json b/app.json index 2962451..791cba4 100644 --- a/app.json +++ b/app.json @@ -110,6 +110,11 @@ "value": "", "required": false }, + "WHOOGLE_CONFIG_NEAR": { + "description": "[CONFIG] Restrict results to only those near a particular city", + "value": "", + "required": false + }, "WHOOGLE_CONFIG_TOR": { "description": "[CONFIG] Use Tor, if available (set to 1 or leave blank)", "value": "", diff --git a/whoogle.env b/whoogle.env index f32fb39..b7c8652 100644 --- a/whoogle.env +++ b/whoogle.env @@ -17,6 +17,9 @@ #WHOOGLE_PROXY_LOC="" #HTTPS_ONLY=1 +# Restrict results to only those near a particular city +#WHOOGLE_CONFIG_NEAR=denver + # See app/static/settings/countries.json for values #WHOOGLE_CONFIG_COUNTRY=countryUK