#7320 - Introduce helpcenter role

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

 # Puppet: <%= @title %>

[mathias, 2018/03/27 14:46:52]

Please don't simply copy from our legacy. There's many improvements possible
here, and no need to inherit everything.

 
 root /var/www/<%= @domain %>;
 index index;
 default_type text/html;
 charset utf-8;
 
 set $index_page "index";
 
 <% if @custom_config %>
-  <%= @custom_config %>

[mathias, 2018/03/27 14:46:52]

We know the two spaces in front of the custom configuration to be irritating, to
say the least, and pointless anyway.

[f.lopez, 2018/03/27 19:29:50]

Acknowledged.

+<%=   @custom_config %>
 <% end %>
 
 location /
 {
   expires 1d;
 
   # Redirect server/language root
 
   rewrite ^/$ /$index_page last;
-  rewrite ^/(\w\w(_\w\w)?)$ /$1/ permanent;
-  rewrite ^/(\w\w(_\w\w)?)/$ /$1/$index_page last;
+  rewrite ^/([a-z][a-z](_[A-Z][A-Z])?)$ /$1/ permanent;
+  rewrite ^/([a-z][a-z](_[A-Z][A-Z])?)/$ /$1/$index_page last;
 
   # Match Accept-Language header against available languages
 
-  set $preferredLang en;
-  set $preferredRegion "";

[mathias, 2018/03/27 14:46:52]

Please avoid camel case where possible, and always try to stay consistent with
the surrounding code. Here: use underscores. Also the "preferred" prefix is
pointless because the variable is not used to identify the "preferred" language.
Use "$language" and "$region" directly or, if you want to use a prefix to avoid
collisions, something that is either generic ("$custom_language") or precise
("$requested_language" or "$client_language")

[f.lopez, 2018/03/27 19:29:51]

Acknowledged.

-  if ($http_accept_language ~ ^(\w\w)\b)

[mathias, 2018/03/27 14:46:52]

An empty line in front of this block would be appreciated.

[f.lopez, 2018/03/27 19:29:51]

Acknowledged.

+  set $language en;
+  set $region "";
+
+  if ($http_accept_language ~ ^([a-z][a-z])\b)
   {
-    set $preferredLang $1;
+    set $language $1;
   }
-  if ($http_accept_language ~ ^\w\w-(\w\w)\b)
+  if ($http_accept_language ~ ^([a-z][a-z])-([A-Z][A-Z])\b)
   {
-    set $preferredRegion $1;
+    set $region $1;
   }
 
-  if ($arg_fb_locale ~ ^(\w\w)_(\w\w)$)
+  if ($arg_fb_locale ~ ^([a-z][a-z])_([A-Z][A-Z])$)
   {
-    set $preferredLang $1;
-    set $preferredRegion $2;
+    set $language $1;
+    set $region $2;
   }
 
   # Redirect canonical URLs to language-specific versions
 
-  if (-e "$document_root/${preferredLang}_$preferredRegion$uri")
+  if (-e "$document_root/${language}_$region$uri")
   {
-    rewrite ^(.*) /${preferredLang}_$preferredRegion$1 last;
+    rewrite ^(.*) /${language}_$region last;
   }
-  if (-e "$document_root/$preferredLang$uri")
+  if (-e "$document_root/$language$uri")
   {
-    rewrite ^(.*) /$preferredLang$1 last;
+    rewrite ^(.*) /$language$1 last;
   }
   if (-e "$document_root/en$uri")
   {
     rewrite ^(.*) /en$1 last;
   }
 }
 
 # Redirect language URIs if no translations are found for the requested page
 
 location ~ ^/([a-z][a-z]\_[A-Z][A-Z])(/.+)

[mathias, 2018/03/27 14:46:52]

Why use [a-z] here but \w above?
Why use [A-Z] here but \w above?

[f.lopez, 2018/03/27 19:29:51]

Not sure, gonna try it with \w, I reused what we already had, so I'll try and
change if possible or tell you why we didn't use \w

[f.lopez, 2018/03/28 16:05:09]

This is because how the translations pages are built and looked for:

a translation can be: `es` for spanish or `es_MX` for mexican spanish
so this code looks exactly for lower and upper letters, instead of just letters
in order to avoid confusion.

 {
   if (!-e "$document_root$uri")
   {
     # if there is no language+region translation, try parent language URI
     # example /es_MX/page -> /es/page
     rewrite ^/([a-z][a-z])\_([A-Z][A-Z])(/.+) /$1$3 redirect;
   }
 }
 
 location ~ ^/([a-z][a-z])(/.+)
 {
   if (!-e "$document_root$uri")
   {
     # if there is no language translation, try canonical page for default language
     # example /es/page -> /page
     rewrite ^/([a-z][a-z])(/.+) $2 redirect;
   }
 }