Merge pull request #947 from ethereum/dev

Deploy v1.4.0

Author: samajammin

.all-contributorsrc

@@ -723,7 +723,8 @@
       "profile": "https://github.com/sorumfactory",
       "contributions": [
         "translation",
-        "projectManagement"
+        "projectManagement",
+        "content"
       ]
     },
     {
@@ -1383,7 +1384,8 @@
       "avatar_url": "https://avatars1.githubusercontent.com/u/27454964?v=4",
       "profile": "https://github.com/tvanepps",
       "contributions": [
-        "bug"
+        "bug",
+        "content"
       ]
     },
     {
@@ -1450,6 +1452,33 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "evertonfraga",
+      "name": "Ev",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/47108?v=4",
+      "profile": "https://github.com/evertonfraga",
+      "contributions": [
+        "ideas"
+      ]
+    },
+    {
+      "login": "0xKiwi",
+      "name": "Ivan Martinez",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/6251510?v=4",
+      "profile": "https://discord.gg/5W5tVb3",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "sebastiantf",
+      "name": "Sebastian T F",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/36922376?v=4",
+      "profile": "https://github.com/sebastiantf",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

README.md

@@ -1,5 +1,5 @@
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-157-orange.svg?style=flat-square)](#contributors)
+[![All Contributors](https://img.shields.io/badge/all_contributors-160-orange.svg?style=flat-square)](#contributors)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 <h1 align="center" style="margin-top: 1em; margin-bottom: 3em;">
@@ -98,17 +98,15 @@ Dapp submissions will be assessed on the following criteria:
 
 ### Translation Program
 
-Ethereum is a global project, and it is critical that Ethereum.org is accessible to everyone, regardless of their nationality or language. Our community has been working hard to make this vision a reality. We're constantly working to add additional language support & to keep our existing translations up to date. You can [view the progress of all our translations here](https://crowdin.com/project/ethereumfoundation).
+Ethereum is a global project, and we believe it's critical that Ethereum.org is accessible to everyone, regardless of their nationality or language. Our community has been working hard to make this vision a reality.
 
-Looking to get involved as a translator? Here's how:
+**Looking for a specific translation?**
 
-1. Follow [this invite link](https://crowdin.com/project/ethereumfoundation/invite) to join our project on CrowdIn.
-2. You will need to create a CrowdIn account if you don't have one. Here's [documentation on how to use CrowdIn](https://support.crowdin.com/online-editor/).
-3. Find the language you want to participate in. If it's below 100%, please contribute! Don't see your langugae? [Open an issue](https://github.com/ethereum/ethereum-org-website/issues/new/choose).
+We're constantly working to add additional language support & to keep our existing translations up to date. You can [view available translations and the progress of all our translations here](https://ethereum.org/languages/).
 
-Once translation is completed (i.e. all files display 100%), our professional translation service will review (and potentially edit) the content. Once the review is complete, we will add it to the website.
+**Looking to get join our community of translators?**
 
-Thank you for your particpation in the language program!
+Great! We'd love to get you involved. [Follow the instructions here](https://ethereum.org/languages/#ethereum-org-translation-program). Thank you in advance for your particpation!
 
 ## 🤔 How are decisions about the site made?
 
@@ -331,7 +329,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <td align="center"><a href="https://github.com/natacha-involves"><img src="https://avatars1.githubusercontent.com/u/49870579?v=4" width="100px;" alt=""/><br /><sub><b>Natacha Souza</b></sub></a><br /><a href="#translation-natacha-involves" title="Translation">🌍</a></td>
   </tr>
   <tr>
-    <td align="center"><a href="https://github.com/sorumfactory"><img src="https://avatars1.githubusercontent.com/u/15648718?v=4" width="100px;" alt=""/><br /><sub><b>sorumfactory</b></sub></a><br /><a href="#translation-sorumfactory" title="Translation">🌍</a> <a href="#projectManagement-sorumfactory" title="Project Management">📆</a></td>
+    <td align="center"><a href="https://github.com/sorumfactory"><img src="https://avatars1.githubusercontent.com/u/15648718?v=4" width="100px;" alt=""/><br /><sub><b>sorumfactory</b></sub></a><br /><a href="#translation-sorumfactory" title="Translation">🌍</a> <a href="#projectManagement-sorumfactory" title="Project Management">📆</a> <a href="#content-sorumfactory" title="Content">🖋</a></td>
     <td align="center"><a href="https://www.samajammin.com/"><img src="https://avatars1.githubusercontent.com/u/8097623?v=4" width="100px;" alt=""/><br /><sub><b>Sam Richards</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=samajammin" title="Code">💻</a> <a href="#content-samajammin" title="Content">🖋</a> <a href="https://github.com/ethereum/ethereum-org-website/commits?author=samajammin" title="Documentation">📖</a> <a href="#projectManagement-samajammin" title="Project Management">📆</a></td>
     <td align="center"><a href="http://antodp.xyz"><img src="https://avatars3.githubusercontent.com/u/20992089?v=4" width="100px;" alt=""/><br /><sub><b>Antonio Della Porta</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=antodp" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/Abhimanyu121"><img src="https://avatars0.githubusercontent.com/u/16034874?v=4" width="100px;" alt=""/><br /><sub><b>Abhimanyu Shekhawat</b></sub></a><br /><a href="#content-Abhimanyu121" title="Content">🖋</a></td>
@@ -423,7 +421,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
   <tr>
     <td align="center"><a href="https://github.com/evanstucker-hates-2fa"><img src="https://avatars0.githubusercontent.com/u/20584445?v=4" width="100px;" alt=""/><br /><sub><b>Evans Tucker</b></sub></a><br /><a href="#content-evanstucker-hates-2fa" title="Content">🖋</a></td>
     <td align="center"><a href="https://github.com/fluffays"><img src="https://avatars1.githubusercontent.com/u/39056857?v=4" width="100px;" alt=""/><br /><sub><b>Adina Cretu</b></sub></a><br /><a href="#translation-fluffays" title="Translation">🌍</a></td>
-    <td align="center"><a href="https://github.com/tvanepps"><img src="https://avatars1.githubusercontent.com/u/27454964?v=4" width="100px;" alt=""/><br /><sub><b>tvanepps</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Atvanepps" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="https://github.com/tvanepps"><img src="https://avatars1.githubusercontent.com/u/27454964?v=4" width="100px;" alt=""/><br /><sub><b>tvanepps</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Atvanepps" title="Bug reports">🐛</a> <a href="#content-tvanepps" title="Content">🖋</a></td>
     <td align="center"><a href="https://github.com/FlipFloop"><img src="https://avatars3.githubusercontent.com/u/19635051?v=4" width="100px;" alt=""/><br /><sub><b>Victor Guyard</b></sub></a><br /><a href="#a11y-FlipFloop" title="Accessibility">️️️️♿️</a></td>
     <td align="center"><a href="http://www.abhranil.net"><img src="https://avatars0.githubusercontent.com/u/1142007?v=4" width="100px;" alt=""/><br /><sub><b>Abhranil Das</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Aabhranildas" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://www.emin.tech"><img src="https://avatars2.githubusercontent.com/u/10382507?v=4" width="100px;" alt=""/><br /><sub><b>Ahmet Emin Koçal</b></sub></a><br /><a href="#translation-ahmeteminkocal" title="Translation">🌍</a></td>
@@ -433,6 +431,9 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <td align="center"><a href="https://github.com/linda-xie"><img src="https://avatars0.githubusercontent.com/u/55955358?v=4" width="100px;" alt=""/><br /><sub><b>Linda Xie</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/pulls?q=is%3Apr+reviewed-by%3Alinda-xie" title="Reviewed Pull Requests">👀</a> <a href="#content-linda-xie" title="Content">🖋</a></td>
     <td align="center"><a href="https://github.com/IanEck"><img src="https://avatars2.githubusercontent.com/u/5863338?v=4" width="100px;" alt=""/><br /><sub><b>Ian Eck</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/pulls?q=is%3Apr+reviewed-by%3AIanEck" title="Reviewed Pull Requests">👀</a> <a href="#content-IanEck" title="Content">🖋</a></td>
     <td align="center"><a href="http://wwaves.co"><img src="https://avatars2.githubusercontent.com/u/106938?v=4" width="100px;" alt=""/><br /><sub><b>Chris Waring</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=cwaring" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/evertonfraga"><img src="https://avatars2.githubusercontent.com/u/47108?v=4" width="100px;" alt=""/><br /><sub><b>Ev</b></sub></a><br /><a href="#ideas-evertonfraga" title="Ideas, Planning, & Feedback">🤔</a></td>
+    <td align="center"><a href="https://discord.gg/5W5tVb3"><img src="https://avatars2.githubusercontent.com/u/6251510?v=4" width="100px;" alt=""/><br /><sub><b>Ivan Martinez</b></sub></a><br /><a href="#content-0xKiwi" title="Content">🖋</a></td>
+    <td align="center"><a href="https://github.com/sebastiantf"><img src="https://avatars3.githubusercontent.com/u/36922376?v=4" width="100px;" alt=""/><br /><sub><b>Sebastian T F</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=sebastiantf" title="Code">💻</a></td>
   </tr>
 </table>
 

docs/.vuepress/components/RandomAppList.vue

@@ -3,50 +3,52 @@
 </template>
 
 <script>
+import { translate } from '../theme/utils/translations'
 import RandomList from './RandomList.vue'
 
 export default {
   components: { RandomList },
 
-  data() {
-    const items = [
-      {
-        name: 'Gitcoin',
-        url: 'https://gitcoin.co',
-        description: 'a network of incentivized open-source developers'
-      },
-      {
-        name: 'Cent',
-        url: 'https://beta.cent.co',
-        description: 'a social network where you can earn money by posting'
-      },
-      {
-        name: 'Gods Unchained',
-        url: 'https://godsunchained.com/',
-        description: 'a competitive collectible card game'
-      },
-      {
-        name: 'DAI',
-        url: 'https://makerdao.com/en/',
-        description: 'a stable cryptocurrency that holds value at $1 USD'
-      },
-      {
-        name: 'Decentraland',
-        url: 'https://decentraland.org/',
-        description: 'a virtual world owned and built by its users'
-      },
-      {
-        name: 'Dharma',
-        url: 'https://www.dharma.io/',
-        description: 'the easiest way to earn interest on your cryptocurrency'
-      },
-      {
-        name: 'Augur',
-        url: 'https://www.augur.net/',
-        description: 'The world’s most accessible, no-limit betting exchange'
-      }
-    ]
-    return { items }
+  computed: {
+    items() {
+      return [
+        {
+          name: 'Gitcoin',
+          url: 'https://gitcoin.co',
+          description: translate('dapp-desc-gitcoin', this.$lang)
+        },
+        {
+          name: 'Cent',
+          url: 'https://beta.cent.co',
+          description: translate('dapp-desc-cent', this.$lang)
+        },
+        {
+          name: 'Gods Unchained',
+          url: 'https://godsunchained.com/',
+          description: translate('dapp-desc-gods-unchained', this.$lang)
+        },
+        {
+          name: 'DAI',
+          url: 'https://makerdao.com/en/',
+          description: translate('dapp-desc-makerdao', this.$lang)
+        },
+        {
+          name: 'Decentraland',
+          url: 'https://decentraland.org/',
+          description: translate('dapp-desc-decentraland', this.$lang)
+        },
+        {
+          name: 'Dharma',
+          url: 'https://www.dharma.io/',
+          description: translate('dapp-desc-dharma', this.$lang)
+        },
+        {
+          name: 'Augur',
+          url: 'https://www.augur.net/',
+          description: translate('dapp-desc-augur', this.$lang)
+        }
+      ]
+    }
   }
 }
 </script>

docs/.vuepress/components/TranslationsAvailable.vue

@@ -0,0 +1,56 @@
+<template>
+  <div>
+    <div class="flex flex-wrap m-0 mt-2 mb-2">
+      <router-link
+        :to="lang.path"
+        class="lang-item w-100 ma-1 pt-15 pb-15 pr-1 pl-1 border-box-shadow-hover"
+        v-for="lang in completed"
+        :key="lang.language"
+      >
+        <div class="l6 tc-text200 mt-0 mb-05">
+          {{ lang['language-english'] }}
+        </div>
+        <router-link class="l4 tc-text500 ma-0" :to="lang.path">{{
+          lang.language
+        }}</router-link>
+      </router-link>
+    </div>
+  </div>
+</template>
+
+<script>
+import { translations } from '../theme/utils/translations'
+const axios = require('axios')
+
+export default {
+  data() {
+    return {
+      completed: translations
+    }
+  }
+}
+</script>
+
+<style lang="stylus" scoped>
+@import '../theme/styles/config.styl';
+
+.lang-item
+  flex 0 1 260px
+  list-style none
+  border-radius .5rem
+  width 100%
+
+  & > h3:before
+    display none
+
+#wrapper.dark-mode
+  .lang-item
+    &:hover
+      border 1px dotted $colorPrimaryDark500
+
+@media (max-width: $breakXS)
+  .lang-item
+    margin 0
+    margin-top 1rem
+    flex 1 1 260px
+</style>

…s/.vuepress/components/LanguagesPage.vue …ss/components/TranslationsInProgress.vuedocs/.vuepress/components/LanguagesPage.vue renamed to docs/.vuepress/components/TranslationsInProgress.vue docs/.vuepress/components/LanguagesPage.vue renamed to docs/.vuepress/components/TranslationsInProgress.vue

@@ -1,23 +1,5 @@
 <template>
   <div>
-    <h2 class="l3">Ethereum.org is available in the following languages:</h2>
-    <div class="flex flex-wrap m-0 mt-2 mb-2">
-      <router-link
-        :to="lang.path"
-        class="lang-item w-100 ma-1 pt-15 pb-15 pr-1 pl-1 border-box-shadow-hover"
-        v-for="lang in completed"
-        :key="lang.language"
-      >
-        <div class="l6 tc-text200 mt-0 mb-05">
-          {{ lang['language-english'] }}
-        </div>
-        <router-link class="l4 tc-text500 ma-0" :to="lang.path">{{
-          lang.language
-        }}</router-link>
-      </router-link>
-    </div>
-
-    <h2 class="l3">The following language translations are in progress:</h2>
     <div class="flex flex-wrap m-0 mt-2 mb-2">
       <a
         :href="lang.url"
@@ -46,15 +28,13 @@
 </template>
 
 <script>
-import { translations } from '../theme/utils/translations'
 const axios = require('axios')
 
 export default {
   data() {
     // TODO add loading & error states for this section
     // https://vuejs.org/v2/cookbook/using-axios-to-consume-apis.html
     return {
-      completed: translations,
       incomplete: []
     }
   },
@@ -67,7 +47,6 @@ export default {
         if (response.data && response.data.data) {
           languages = response.data.data
         }
-        const completedLangCodes = Object.keys(this.completed)
         const incomplete = languages
           .map(lang => {
             lang.url = `https://crowdin.com/project/ethereumfoundation/${lang.code}`