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: diff --git a/README.md b/README.md index 00a9d63..8d04ac2 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 @@ -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 | @@ -480,15 +481,16 @@ A lot of the app currently piggybacks on Google's existing support for fetching | Website | Country | Language | Cloudflare | |-|-|-| -| [https://whoogle.sdf.org](https://whoogle.sdf.org) | 🇺🇸 US | Multi-choice | | -| [https://whoogle.kavin.rocks](https://whoogle.kavin.rocks) | 🇮🇳 IN | | ✅ | -| [https://search.garudalinux.org](https://search.garudalinux.org) | 🇩🇪 DE | Multi-choice | | -| [https://whooglesearch.net](https://whooglesearch.net) | 🇩🇪 DE | Spanish | | -| [https://search.flawcra.cc](https://search.flawcra.cc) | | | ✅ | -| [https://search.exonip.de](https://search.exonip.de) | 🇳🇱 NL | Multi-choice | | -| [https://whoogle.silkky.cloud](https://whoogle.silkky.cloud) | 🇫🇮 FI | English | | -| [https://s.alefvanoon.xyz](https://s.alefvanoon.xyz) | 🇺🇸 US | English | ✅ | -| [http://whoogledq5f5wly5p4i2ohnvjwlihnlg4oajjum2oeddfwqdwupbuhqd.onion](http://whoogledq5f5wly5p4i2ohnvjwlihnlg4oajjum2oeddfwqdwupbuhqd.onion) | 🇮🇳 IN | | | +| [https://whoogle.sdf.org](https://whoogle.sdf.org) | 🇺🇸 US | +| [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) | 🇩🇪 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 | ✅ | +| [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. 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/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": "依系統" } } 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