Merge pull request #116 from austinhuang0131/master

Add Chinese translation, handle /shorts/ urls, and fix #105 folder

4 files changed, 147 insertions, 1 deletions

diff --git a/_locales/store.md b/_locales/pl/store.md
index 0385351b..0385351b 100644
--- a/_locales/store.md
+++ b/_locales/pl/store.md
diff --git a/_locales/zh-CN/messages.json b/_locales/zh-CN/messages.json
new file mode 100644
index 00000000..8c19e2de
--- /dev/null
+++ b/_locales/zh-CN/messages.json
@@ -0,0 +1,110 @@
+{
+  "extensionName": {
+    "message": "Privacy Redirect",
+    "description": "Name of the extension."
+  },
+  "extensionDescription": {
+    "message": "将 Twitter、YouTube、Instagram 和 Google Maps 重定向至尊重隐私的替代品",
+    "description": "Description of the extension."
+  },
+  "nitterInstance": {
+    "message": "Nitter 实例",
+    "description": "Label for Nitter instance field option (options)."
+  },
+  "invidiousInstance": {
+    "message": "Invidious 实例",
+    "description": "Label for Invidious instance field option (options)."
+  },
+  "bibliogramInstance": {
+    "message": "Bibliogram 实例",
+    "description": "Label for Bibliogram instance field option (options)."
+  },
+  "osmInstance": {
+    "message": "OpenStreetMap 实例",
+    "description": "Label for OSM instance field option (options)."
+  },
+  "disableNitter": {
+    "message": "Nitter 重定向",
+    "description": "Label for enable/disable Nitter redirects option (options & pop-up)."
+  },
+  "disableInvidious": {
+    "message": "Invidious 重定向",
+    "description": "Label for enable/disable Invidious redirects option (options & pop-up)."
+  },
+  "disableBibliogram": {
+    "message": "Bibliogram 重定向",
+    "description": "Label for enable/disable Bibliogram redirects option (options & pop-up)."
+  },
+  "disableOsm": {
+    "message": "OpenStreetMap 重定向",
+    "description": "Label for enable/disable OSM redirects option (options & pop-up)."
+  },
+  "alwaysProxy": {
+    "message": "使用 Invidious 时始终使用视频代理",
+    "description": "Label for 'Always proxy videos through Invidious' option (options)."
+  },
+  "onlyEmbeddedVideo": {
+    "message": "只重定向嵌入视频至 Invidious",
+    "description": "Label for 'Only redirect embedded video to Invidious' option (options)."
+  },
+  "videoQuality": {
+    "message": "Invidious 视频画质",
+    "description": "Label for 'Invidious Video Quality' option (options)."
+  },
+  "removeTwitterSW": {
+    "message": "主动移除 Twitter 后台脚本",
+    "description": "Label for 'Proactively remove Twitter service worker' option (options)."
+  },
+  "invidiousDarkMode": {
+    "message": "Invidious 始终使用夜间模式",
+    "description": "Label for 'Invidious dark mode always on' option (options)."
+  },
+  "persistInvidiousPrefs": {
+    "message": "以 cookie 形式记住 Invidious 设置",
+    "description": "Label for 'Persist Invidious preferences (as cookie)' option (options)."
+  },
+  "generalTab": {
+    "message": "常规",
+    "description": "General tab (options)."
+  },
+  "advancedTab": {
+    "message": "高级",
+    "description": "Advanced tab (options)."
+  },
+  "exceptionsTab": {
+    "message": "例外",
+    "description": "Exceptions tab (options)."
+  },
+  "exceptionsDescriptionP1": {
+    "message": "请输入一个不要重定向 URL 链接或正则表达式。",
+    "description": "A description of the 'Exceptions' feature paragraph 1 (options)."
+  },
+  "exceptionsDescriptionP2": {
+    "message": "若发起请求或访问的页面 URL 符合任一表达式，则插件将不会将其重定向。",
+    "description": "A description of the 'Exceptions' feature paragraph 2 (options)."
+  },
+  "exceptionsDescriptionP3": {
+    "message": "注：支持 JavaScript 正则表达式，且无须用正斜杠始末。",
+    "description": "A description of the 'Exceptions' feature paragraph 3 (options)."
+  },
+  "addException": {
+    "message": "添加例外",
+    "description": "'Add Exceptions' button (options)."
+  },
+  "moreOptions": {
+    "message": "更多设置",
+    "description": "More Options button (pop-up)."
+  },
+  "privacy": {
+    "message": "Privacy",
+    "description": "Extension title - Privacy (pop-up)."
+  },
+  "redirect": {
+    "message": "Redirect",
+    "description": "Extension title - Redirect (pop-up)."
+  },
+  "version": {
+    "message": "版本",
+    "description": "Version"
+  }
+}
diff --git a/_locales/zh-CN/store.md b/_locales/zh-CN/store.md
new file mode 100644
index 00000000..ae124065
--- /dev/null
+++ b/_locales/zh-CN/store.md
@@ -0,0 +1,36 @@
+# Extension Store (AMO & Chrome Web Store) Listing
+
+## Summary:
+```
+一个简单的扩展程序来将 Twitter、YouTube、Instagram 和 Google地图重定向至尊重隐私的替代品。
+```
+## Description:
+```
+将 Twitter、YouTube、Instagram 和 Google地图重定向至尊重隐私的替代品： <a href='https://nitter.net/'>Nitter</a>、<a href='https://invidio.us/'>Invidious</a>、<a href='https://bibliogram.art/'>Bibliogram</a> 和 <a href='https://www.openstreetmap.org'>OpenStreetMap</a>。
+
+允许自定义实例，开关重定向等设定。
+
+<b>★ 更多详细：ℹ️</b>
+<ul>
+  <li><a href='https://github.com/zedeus/nitter#nitter-wip'>Nitter</a></li>
+  <li><a href='https://github.com/iv-org/invidious#invidious'>Invidious</a></li>
+  <li><a href='https://sr.ht/~cadence/bibliogram/#a-hrefhttpsbibliogramartbibliograma'>Bibliogram</a></li>
+  <li><a href='https://wiki.openstreetmap.org/'>OpenStreetMap</a></li>
+</ul>
+
+本扩展的源代码可在 <a href='https://github.com/SimonBrazell/privacy-redirect'>Github</a> 上查看。
+
+<b>★ 捐赠：👨🏻‍💻</b>
+若您喜欢本扩展程序，且有闲钱，不妨<a href='https://www.buymeacoffee.com/SimonBrazell'>给我买杯咖啡</a>来表达您对这个项目的感谢与支持。
+
+<b>★ What's New in This Version (v1.1.36) 🆕</b>
+<ul>
+  <li>Added Russian language translation.</li>
+  <li>Fix Invidious autoplay parameter.</li>
+</ul>
+
+<b>★ 权限：ℹ️</b>
+<ul>
+  <li>请注意，您需授予查看所有 URL（不只是需要重定向的URL）网站导向活动的权限，以来重定向嵌入的视频。目前我不知道其他重定向iframe的方法，有能者请解囊相助！ 🙂</li>
+</ul>
+```
diff --git a/background.js b/background.js
index 3f5145cd..e1405acd 100644
--- a/background.js
+++ b/background.js
@@ -307,7 +307,7 @@ function redirectYouTube(url, initiator, type) {
   url.searchParams.append("autoplay", invidiousAutoplay ? 1 : 0);
 
   return `${invidiousInstance || getRandomInstance(invidiousInstances)}${
-    url.pathname
+    url.pathname.replace("/shorts","")
   }${url.search}`;
 }