Merge branch 'master' into patch-1

Author: mlinksva

Gemfile.lock

@@ -84,7 +84,7 @@ GEM
     html-pipeline (2.11.0)
       activesupport (>= 2)
       nokogiri (>= 1.4)
-    html-proofer (3.11.0)
+    html-proofer (3.11.1)
       activesupport (>= 4.2, < 6.0)
       addressable (~> 2.3)
       mercenary (~> 0.3.2)

_articles/getting-paid.md

@@ -112,7 +112,7 @@ Depending on your personal circumstances, you can try raising money independentl
 Finally, sometimes open source projects put bounties on issues that you might consider helping with. 
 
 * @ConnorChristie was able to get paid for [helping](https://web.archive.org/web/20181030123412/https://webcache.googleusercontent.com/search?strip=1&q=cache:https%3A%2F%2Fgithub.com%2FMARKETProtocol%2FMARKET.js%2Fissues%2F14) @MARKETProtocol work on their javascript library [through a bounty on gitcoin](https://gitcoin.co/).
-* @mamiM did Japanese translations for @MetaMask after the [issue was funded on Bounties Network](https://beta.bounties.network/bounty/v1/134).
+* @mamiM did Japanese translations for @MetaMask after the [issue was funded on Bounties Network](https://explorer.bounties.network/bounty/134).
 
 ## Finding funding for your project
 

_articles/pt/getting-paid.md

@@ -107,7 +107,7 @@ Dependendo de suas circunstâncias pessoais, você pode tentar conseguir dinheir
 Finalmente, as vezes, projetos open source põem recompensas em issues que você pode considerar ajudar a resolver. 
 
 * @ConnorChristie conseguiu ser pago por [ajudar](https://web.archive.org/web/20181030123412/https://webcache.googleusercontent.com/search?strip=1&q=cache:https%3A%2F%2Fgithub.com%2FMARKETProtocol%2FMARKET.js%2Fissues%2F14) @MARKETProtocol a trabalhar em sua biblioteca javascript [através de uma recompensa em gitcoin](https://gitcoin.co/).
-* @mamiM fez traduções para o Japonês para @MetaMask após a [issue ser financiada na Bounties Network](https://beta.bounties.network/bounty/v1/134).
+* @mamiM fez traduções para o Japonês para @MetaMask após a [issue ser financiada na Bounties Network](https://explorer.bounties.network/bounty/134).
 
 ## Encontrando financiamento para o seu projeto
 

assets/js/locale.js

@@ -5,11 +5,11 @@ $(document).ready(function() {
 });
 
 function loadLanguage(lang) {
-  base_pathname = window.location.pathname.replace(/^\/[a-z]+([_-][a-z]+)?\//, "/")
+  base_pathname = window.location.pathname.replace(/\/[a-z]+([_-][a-z]+)?\//, "/")
   if (lang === "en") {
     url = base_pathname
   } else {
-    url = "/" + lang + base_pathname
+    url = base_pathname + lang
   }
   window.location.assign(url);
 }