Merge remote-tracking branch 'origin/main' into heroku-app

2021-06-11 11:34:39 -04:00 · 2021-06-11 11:34:39 -04:00 · 5525aa5b4f
commit 5525aa5b4f
parent 23ce8dea27 82ccace647
3 changed files with 76 additions and 2 deletions
--- a/README.md
+++ b/README.md
@ -27,6 +27,7 @@ Contents
    1. [Set Primary Search Engine](#set-whoogle-as-your-primary-search-engine)
    2. [Prevent Downtime (Heroku Only)](#prevent-downtime-heroku-only)
    3. [Manual HTTPS Enforcement](#https-enforcement)
+    4. [Using with Firefox Containers](#using-with-firefox-containers)
 7. [Contributing](#contributing)
 8. [FAQ](#faq)
 9. [Public Instances](#public-instances)
@ -342,7 +343,12 @@ To filter by a range of time, append ":past <time>" to the end of your search, w

 Browser settings:
  - Firefox (Desktop)
-    - Navigate to your app's url, and click the 3 dot menu in the address bar. At the bottom, there should be an option to "Add Search Engine". Once you've clicked this, open your Firefox Preferences menu, click "Search" in the left menu, and use the available dropdown to select "Whoogle" from the list.
+    - Version 89+
+      - Navigate to your app's url, right click the address bar, and select "Add Search Engine".
+    - Previous versions
+      - Navigate to your app's url, and click the 3 dot menu in the address bar. At the bottom, there should be an option to "Add Search Engine".
+    - Once you've added the new search engine, open your Firefox Preferences menu, click "Search" in the left menu, and use the available dropdown to select "Whoogle" from the list.
+    - **Note**: If your Whoogle instance uses Firefox Containers, you'll need to [go through the steps here](#using-with-firefox-containers) to get it working properly.
  - Firefox (iOS)
    - In the mobile app Settings page, tap "Search" within the "General" section. There should be an option titled "Add Search Engine" to select. It should prompt you to enter a title and search query url - use the following elements to fill out the form:
      - Title: "Whoogle"
@ -395,6 +401,15 @@ Note: You should have your own domain name and [an https certificate](https://le
 - Docker image: Set the environment variable HTTPS_ONLY=1
 - Pip/Pipx: Add the `--https-only` flag to the end of the `whoogle-search` command
 - Default `run` script: Modify the script locally to include the `--https-only` flag at the end of the python run command
+	
+### Using with Firefox Containers
+Unfortunately, Firefox Containers do not currently pass through `POST` requests (the default) to the engine, and Firefox caches the opensearch template on initial page load. To get around this, you can take the following steps to get it working as expected:
+
+1. Remove any existing Whoogle search engines from Firefox settings
+2. Enable `GET Requests Only` in Whoogle config
+3. Clear Firefox cache
+4. Restart Firefox
+5. Navigate to Whoogle instance and [re-add the engine](#set-whoogle-as-your-primary-search-engine)

 ## Contributing

--- a/app/static/settings/languages.json
+++ b/app/static/settings/languages.json
@ -37,6 +37,7 @@
  {"name": "Romanian (Română)", "value": "lang_ro"},
  {"name": "Russian (русский)", "value": "lang_ru"},
  {"name": "Serbian (Српски)", "value": "lang_sr"},
+  {"name": "Sinhala (සිංහල)", "value": "lang_si"},
  {"name": "Slovak (Slovák)", "value": "lang_sk"},
  {"name": "Slovenian (Slovenščina)", "value": "lang_sl"},
  {"name": "Spanish (Español)", "value": "lang_es"},
@ -45,5 +46,7 @@
  {"name": "Thai (ไทย)", "value": "lang_th"},
  {"name": "Turkish (Türk)", "value": "lang_tr"},
  {"name": "Ukranian (Український)", "value": "lang_uk"},
-  {"name": "Vietnamese (Tiếng Việt)", "value": "lang_vi"}
+  {"name": "Vietnamese (Tiếng Việt)", "value": "lang_vi"},
+  {"name": "Xhosa (isiXhosa)", "value": "lang_xh"},
+  {"name": "Zulu (isiZulu)", "value": "lang_zu"}
 ]
--- a/app/static/settings/translations.json
+++ b/app/static/settings/translations.json
@ -166,5 +166,61 @@
        "apply": "Aplicar",
        "save-as": "Salvar Como...",
        "github-link": "Ver no GitHub"
+    },
+    "lang_zh-CN": {
+        "search": "搜索",
+        "config": "配置",
+        "config-country": "按国家过滤搜索结果",
+        "config-country-help": "注意：启用后，只有在所选国家*部署*的网站会出现在搜索结果中。",
+        "config-lang": "界面语言",
+        "config-lang-search": "搜索语言",
+        "config-near": "接近",
+        "config-near-help": "城市名",
+        "config-block": "屏蔽",
+        "config-block-help": "逗号分隔的网站列表",
+        "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": "站点根 URL",
+        "config-css": "自定义 CSS",
+        "load": "载入",
+        "apply": "应用",
+        "save-as": "另存为...",
+        "github-link": "在 GitHub 上查看"
+    },
+    "lang_si": {
+        "search": "සොයන්න",
+        "config": "වින්‍යාසය",
+        "config-country": "රට අනුව ප්‍රතිඵල පෙරහන් කරන්න",
+        "config-country-help": "සටහන: සබල කර ඇත්නම්, වියමන අඩවියක් සෙවුම් ප්‍රතිඵලවල දිස්වන්නේ එය තෝරාගත් රටෙහි සිට *සත්කාරකත්වය* දරන්නේ නම් පමණි.",
+        "config-lang": "අතුරු මුහුණතෙහි භාෂාව",
+        "config-lang-search": "භාෂාව සොයන්න",
+        "config-near": "ආසන්න",
+        "config-near-help": "නගරයේ නම",
+        "config-block": "අවහිර",
+        "config-block-help": "අල්ප විරාම වලින් වෙන් වූ අඩවි ලැයිස්තුව",
+        "config-nojs": "නෝජේඑස් සබැඳි පෙන්වන්න",
+        "config-dark": "අඳුරු ආකාරය",
+        "config-safe": "ආරක්ෂිත සෙවීම",
+        "config-alts": "සමාජ මාධ්‍ය සබැඳි ප්‍රතිස්ථාපනය කරන්න",
+        "config-alts-help": "ට්විටර්/යූ ටියුබ්/ඉන්ස්ටග්‍රෑම් ආදී සබැඳි පෞද්ගලිකත්වයට ගරු කරන විකල්ප සමඟ ප්‍රතිස්ථාපනය කරයි.",
+        "config-new-tab": "නව තීරුවකින් සබැඳි විවෘත කරන්න",
+        "config-images": "සම්පූර්ණ ප්‍රමාණයේ රූප සෙවීම",
+        "config-images-help": "(පර්යේෂණාත්මක) මේස පරිගණකවල රූප සෙවීමට 'රූපය බලන්න' විකල්පය එකතු කරයි. මෙය රූප ප්‍රතිඵල සංක්ෂිප්තවල අඩු විභේදනයක් ඇති කිරීමට හේතු වේ.",
+        "config-tor": "ටෝර් භාවිතා කරන්න",
+        "config-get-only": "ඉල්ලීම් පමණක් ලබා ගන්න",
+        "config-url": "ඒ.ස.නි.(URL) මූලය",
+        "config-css": "අභිරුචි සීඑස්එස්",
+        "load": "පූරනය කරන්න",
+        "apply": "යොදන්න",
+        "save-as": "...ලෙස සුරකින්න",
+        "github-link": "ගිට්හබ් හි බලන්න"
    }
 }