Issue 4040 - Introduce new language-specific redirects

modules/web/templates/adblockplus.org.conf.erb

 # XSS and clickjacking prevention headers
 
 set $csp_frame "";
 if ($uri ~ ^/(:?\w\w(_\w\w)?/)?(?:index|firefox|chrome|opera|android|internet-explorer|safari|yandex-browser|maxthon)?$)
 {
   set $csp_frame "; frame-src www.youtube-nocookie.com;";
 }
 add_header Content-Security-Policy "default-src 'self'; img-src * data:; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline' 'unsafe-eval' $csp_frame";
 add_header X-Frame-Options "sameorigin";
 
@@ skipping 76 matching lines @@
 rewrite ^/androidupdates.xml$ https://update.adblockplus.org/adblockplusandroid/updates.xml permanent;
 rewrite ^/ieupdate.json$ https://update.adblockplus.org/adblockplusie/update.json permanent;
 
 rewrite ^/(\w\w(_\w\w)?/)?adblock-browser/?$ https://adblockbrowser.org/ permanent;
 
 location /redirect
 {
   set $adblock_browser_android_download "https://downloads.adblockplus.org/adblockbrowser-1.1.0-arm.apk";
   set $adblock_browser_android_store "https://play.google.com/store/apps/details?id=org.adblockplus.browser";
 
+  set $lang "en";
+
+  if ($arg_lang ~ ^(\w+))
+  {
+    set $lang $1;
+  }
+
   # Google Play is not available in China, so we redirect them to the
   # builds for download, see https://issues.adblockplus.org/ticket/3094
   if ($geoip_country_code = 'CN')
   {
     set $adblock_browser_android_store $adblock_browser_android_download;
   }
 
   if ($arg_link = "reporter_connect_issue")
   {
     rewrite ^ /forum/? redirect;
@@ skipping 25 matching lines @@
   if ($arg_link = "adblock_browser_android_beta_community")
   {
     rewrite ^ https://plus.google.com/communities/104936844759781288661? redirect;
   }
   if ($arg_link ~ "^adblock_browser_promotion_\d$")
   {
     rewrite ^ https://adblockplus.org/adblock-browser redirect;
   }
   if ($arg_link = "adblock_browser_android_support")
   {
-    rewrite ^ https://adblockbrowser.org/en/android-support/? redirect;
+    rewrite ^ https://adblockbrowser.org/$lang/android-support/? redirect;
+  }
+  if ($arg_link = "adblock_browser_android_faq")
+  {
+    rewrite ^ https://adblockbrowser.org/$lang/android-support/faq? redirect;
   }
   if ($arg_link = "adblock_browser_ios_support")
   {
     rewrite ^ https://adblockbrowser.org/en/ios-support/? redirect;
   }
   if ($arg_link = "adblock_browser_android_store")
   {
     rewrite ^ $adblock_browser_android_store? redirect;
   }
   if ($arg_link = "adblock_browser_ios_store")
@@ skipping 10 matching lines @@
   }
   if ($arg_link = "adblock_plus_safari_ios_store")
   {
     rewrite ^ https://itunes.apple.com/app/adblock-plus-abp/id1028871868? redirect;
   }
   if ($arg_link = "adblock_plus_sbrowser_store")
   {
     rewrite ^ https://play.google.com/store/apps/details?id=org.adblockplus.adblockplussbrowser? redirect;
   }
 
-  set $lang "en";
   set $link "";
   set $anchor "";
 
   if ($arg_link ~ "^share-")
   {
     set $link "share";
     set $anchor "?a=minimal";
   }
   if ($arg_link = "uninstalled")
   {
@@ skipping 13 matching lines @@
   }
   if ($arg_link = "subscriptions")
   {
     set $link "subscriptions";
   }
   if ($arg_link = "reporter_privacy")
   {
     set $link "privacy";
     set $anchor "#abp_issue_reporter";
   }
+  if ($arg_link = "privacy")
+  {
+    set $link "privacy";
+  }
   if ($arg_link = "contribute")
   {
     set $link "contribute";
   }
   if ($arg_link = "donate")
   {
     set $link "donate";
   }
   if ($arg_link = "acceptable_ads")
   {
     set $link "acceptable-ads";
   }
   if ($arg_link = "acceptable_ads_criteria")
   {
     set $link "acceptable-ads";
     set $anchor "#criteria";
   }
   if ($arg_link = "contributors")
   {
     set $link "contributors";
   }
 
   if ($link = "")
   {
     return 404;
   }
 
-  if ($arg_lang ~ ^(\w+))
-  {
-    set $lang $1;
-  }
   if (!-f "$document_root/$lang/$link")
   {
     set $lang "!!";
   }
   set $langtest "$arg_lang $lang";
   if ($langtest ~ "^(\w+)-(\w+) !!")
   {
     set $lang "$1_$2";
   }
   if (!-f "$document_root/$lang/$link")
@@ skipping 63 matching lines @@
 location /403.html
 {
   try_files $uri @proxied;
 }
 location @proxied
 {
   proxy_pass https://server16.adblockplus.org;
   proxy_set_header Host adblockplus.org;
   proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 }