commit 6dd0fde8a3d1dd819b9e1ac043e494090b5be3ae Author: emma peel <emma.peel@riseup.net> Date: Wed Jan 15 17:40:18 2020 +0100 update to master, also lego --- .htaccess | 18 ------------------ lego | 2 +- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/.htaccess b/.htaccess index ba7c37a..6e2c53a 100644 --- a/.htaccess +++ b/.htaccess @@ -1,22 +1,4 @@ -RewriteEngine On - # forward requests in /en to the root folder RewriteRule ^(en-US|en)$ / [R=302,L] RewriteRule ^(en-US|en)/(.*) /$2 [R=302,L] -# forward requests in /en and /en-US to the root folder -RewriteRule ^(en|en-US)$ / [R=302,L] -RewriteRule ^(en|en-US)/(.*) /$2 [R=302,L] - -# Rewrites for languages that have a different mapping in the page than in TBB -RewriteRule ^(es-ES|es-MX|es-CO|es-AR)(.*) /es$2 [R=302,L] - -# we have only one translation for this locales -RewriteRule ^(bn-BD|bn-IN)(.*) /bn$2 [R=302,L] -RewriteRule ^ga-IE/(.*) /ga$1 [R=302,L] - -# Rewrites for languages that have a Tor Browser release -# but don't have a community page -# You can see them at https://dist.torproject.org/torbrowser/, pick the last alpha for the most languages -# this languages are the translation priority for the community portal! -RewriteRule ^(ar|ca|cs|da|de|el|es|fa|fr|ga|he|hu|id|is|ja|ka|ko|lt|mk|ms|nb-NO|nl|pl|pt-BR|pt-PT|ro|ru|sv-SE|th|tr|vi|zh-CN|zh-TW)/(.*) /$2 [R=302,L] diff --git a/lego b/lego index e058aee..abbf18c 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit e058aee7e40a97434ddbffbb1d5ffe18a610076b +Subproject commit abbf18cb1bbca70caeb8913d2b60f0cb9332f287