Fix url-based rewrites

modules/adblockplusorg/files/adblockplus.org

 server {
   root /var/www/adblockplus.org/httpdocs;
 
   location / {
     index index.php index index.html;
 
     if ($arg_a = "view") {
       rewrite ^(.*) $1? permanent;
     }
 
@@ skipping 11 matching lines @@
     }
     if ($http_user_agent ~ \bPresto/\d+) {
       set $browser "opera";
     }
     if ($http_user_agent ~ \bAndroid\s.*\bAppleWebKit/\d+) {
       set $browser "android";
     }
 
     if ($arg_a ~ ^(view|show)?$) {
       rewrite ^/(index\.html)?$ /$preferredLang/$browser redirect;
-      rewrite ^/(\w\w(_\w\w)?)$ /$1/$browser redirect;
+      rewrite ^/(\w\w(_\w\w)?)/?$ /$1/$browser redirect;
     }
 
     rewrite ^/(\w\w(_\w\w)?)/installation$ /$1/ permanent;
     rewrite ^/anwiki/(.*) /$1 permanent;
 
     if (-f $request_filename) {
       break;
     }
     if (-d $request_filename) {
       break;
     }
 
     set $static_uri $uri;
-    if ($uri ~ ^/(\w\w(_\w\w)?)/(firefox|chrome|opera|android)) {
+    if ($uri ~ ^/(\w\w(_\w\w)?)/(firefox|chrome|opera|android)/?$) {
       set $static_uri "/$1/";
       set $browser $3;
     }
     set $static "";
     if (-f "$document_root/static$static_uri") {
       set $static "ok";
     }
     if (-d "$document_root/static$static_uri") {
       set $static "ok";
     }
     set $static "$static!$arg_a!$cookie_anwiki_anwsesscode";
     if ($static ~ ^ok!(view|show)?!$) {
       rewrite ^ /static$static_uri?browser=$browser last;
     }
 
-    rewrite ^/(\w\w(_\w\w)?)/(firefox|chrome|opera|android) /index.php?p=$1&browser=$3 last;
+    rewrite ^/(\w\w(_\w\w)?)/(firefox|chrome|opera|android)/?$ /index.php?p=$1&browser=$3 last;
     rewrite ^/(.*) /index.php?p=$1 last;
   }
 
   location /static/ {
       index index;
       internal;
       types {
         image/png png;
         text/xml xml;
         text/css css;
@@ skipping 35 matching lines @@
     fastcgi_param GATEWAY_INTERFACE CGI/1.1;
     fastcgi_param SERVER_SOFTWARE nginx/$nginx_version;
 
     fastcgi_param REMOTE_ADDR $remote_addr;
     fastcgi_param REMOTE_PORT $remote_port;
     fastcgi_param SERVER_ADDR $server_addr;
     fastcgi_param SERVER_PORT $server_port;
     fastcgi_param SERVER_NAME $server_name;
   }
 }