Skip to content

Commit

Permalink
Merge pull request #780 from ethereum/dev
Browse files Browse the repository at this point in the history
Deploy v1.2.1
  • Loading branch information
samajammin authored Feb 24, 2020
2 parents 7a251f7 + f6d3cef commit d22b506
Show file tree
Hide file tree
Showing 22 changed files with 1,711 additions and 37 deletions.
26 changes: 12 additions & 14 deletions docs/.vuepress/components/HomePage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</div>

<div class="intro-blocks">
<div class="intro-block" v-if="isEnglish">
<div class="intro-block" v-if="contentVersion >= 1.1">
<h3 class="header">
<span class="arrow">→</span
>{{ translateString('page-home-section-individuals-title') }}
Expand All @@ -34,15 +34,15 @@
{{ translateString('page-home-section-individuals-item-three') }}
</router-link>
</li>
<li>
<li v-if="contentVersion > 1.1">
<router-link :to="langPath() + 'community/'" class="black">
{{ translateString('page-community') }}
</router-link>
</li>
</ul>
</div>

<div class="intro-block-nonenglish" v-if="!isEnglish">
<div class="intro-block-content-version-1" v-if="contentVersion < 1.1">
<h3>
<router-link :to="langPath() + 'what-is-ethereum/'">
<span class="arrow">→</span
Expand All @@ -68,7 +68,7 @@
</ul>
</div>

<div class="intro-block-nonenglish" v-if="!isEnglish">
<div class="intro-block-content-version-1" v-if="contentVersion < 1.1">
<h3>
<router-link :to="langPath() + 'use/'">
<span class="arrow">→</span
Expand Down Expand Up @@ -106,7 +106,7 @@
</ul>
</div>

<div class="intro-block-nonenglish" v-if="!isEnglish">
<div class="intro-block-content-version-1" v-if="contentVersion < 1.1">
<h3>
<router-link :to="langPath() + 'learn/'">
<span class="arrow">→</span
Expand Down Expand Up @@ -140,8 +140,8 @@

<div
v-bind:class="{
'intro-block': isEnglish,
'intro-block-nonenglish': !isEnglish
'intro-block': contentVersion >= 1.1,
'intro-block-content-version-1': contentVersion < 1.1
}"
>
<h3>
Expand All @@ -151,15 +151,15 @@
</router-link>
</h3>
<ul>
<li v-if="!isEnglish">
<li v-if="contentVersion < 1.1">
<router-link
:to="langPath() + 'developers/#getting-started'"
class="black"
>
{{ translateString('page-home-section-developers-item-one') }}
</router-link>
</li>
<li v-if="isEnglish">
<li v-if="contentVersion >= 1.05">
<router-link :to="langPath() + 'build/'" class="black">
{{ translateString('page-home-section-developers-item-one') }}
</router-link>
Expand All @@ -183,7 +183,7 @@
</ul>
</div>

<div class="intro-block" v-if="isEnglish">
<div class="intro-block" v-if="contentVersion >= 1.1">
<h3>
<router-link :to="langPath() + 'enterprise/'">
<span class="arrow">→</span
Expand Down Expand Up @@ -226,10 +226,8 @@ import { translate } from '../theme/utils/translations'
export default {
computed: {
// TODO update this to return a contentVersion
// e.g. English is 1.2, Indonesian is 1.1, all others 1.0
isEnglish() {
return this.$lang === 'en-US'
contentVersion() {
return translate('version', this.$lang)
}
},
methods: {
Expand Down
72 changes: 69 additions & 3 deletions docs/.vuepress/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,9 @@ module.exports = {
],
[
'script',
{ type: 'application/ld+json'},
{ type: 'application/ld+json' },

`{"@context": "https://schema.org", "@type": "Organization", "url": "https://www.ethereum.org", "email": "[email protected]", "name": "ethereum.org (Ethereum)", "logo": "https://ethereum.org/og-image.png"}`

]
],
markdown: {
Expand Down Expand Up @@ -361,6 +360,73 @@ module.exports = {
}
]
},
'/se/': {
lang: 'sv-SE',
label: translate('language'),
nav: [
{ text: translate('page-home', 'sv-SE'), link: '/se/' },
{
text: translate('page-individuals', 'sv-SE'),
ariaLabel: translate('page-individuals-aria-label', 'sv-SE'),
items: [
{
text: translate(
'page-home-section-individuals-item-one',
'sv-SE'
),
link: '/se/what-is-ethereum/'
},
{
text: translate(
'page-home-section-individuals-item-four',
'sv-SE'
),
link: '/se/eth/'
},
{
text: translate(
'page-home-section-individuals-item-two',
'sv-SE'
),
link: '/se/dapps/'
},
{
text: translate(
'page-home-section-individuals-item-five',
'sv-SE'
),
link: '/se/wallets/'
},
{
text: translate(
'page-home-section-individuals-item-three',
'sv-SE'
),
link: '/se/learn/'
}
]
},
{
text: translate('page-developers', 'sv-SE'),
ariaLabel: translate('page-developers-aria-label', 'sv-SE'),
items: [
{
text: translate('get-started', 'sv-SE'),
link: '/se/build/'
},
{
text: 'Ethereum Studio',
link: 'https://studio.ethereum.org/'
},
{
text: translate('developer-resources', 'sv-SE'),
link: '/se/developers/'
}
]
},
{ text: translate('page-enterprise', 'sv-SE'), link: '/se/enterprise/' }
]
},
'/sk/': {
lang: 'sk',
label: translate('language', 'sk'),
Expand Down
4 changes: 2 additions & 2 deletions docs/.vuepress/theme/styles/theme.styl
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ ul
flex-wrap wrap

.intro-block,
.intro-block-nonenglish
.intro-block-content-version-1
flex 1 1 29%
padding-left 1em
padding-right 1em
Expand All @@ -183,7 +183,7 @@ ul
background-repeat no-repeat

// TODO remove once translations are updated w/ new personas
.intro-block-nonenglish
.intro-block-content-version-1
flex 1 1 40%
padding-left 2em
padding-right 2em
Expand Down
124 changes: 108 additions & 16 deletions docs/.vuepress/theme/utils/translations.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ const portugueseBrazilian = require('../../../pt-br/strings.json')
const ru = require('../../../ru/strings.json')
const sk = require('../../../sk/strings.json')
const sl = require('../../../sl/strings.json')
const se = require('../../../se/strings.json')
const simplifiedChinese = require('../../../zh/strings.json')

// These lang keys should match the equivalent CrowdIn translation page
Expand All @@ -48,44 +49,135 @@ const stringTranslations = {
ru,
sk,
sl,
'sv-SE': se,
'zh-CN': simplifiedChinese
}

// These lang keys should match `stringTranslations` keys
// TODO add contentVersion key to each lang, e.g. for HomePage display logic
const languageMetaData = {
'en-US': {
version: 1.2,
language: 'English',
'language-english': 'English',
path: '/'
},
ar: { language: 'العربية', 'language-english': 'Arabic', path: '/ar/' },
cs: { language: 'čeština', 'language-english': 'Czech', path: '/cs/' },
de: { language: 'Deutsch', 'language-english': 'German', path: '/de/' },
el: { language: 'Ελληνικά', 'language-english': 'Greek', path: '/el/' },
'es-EM': { language: 'Español', 'language-english': 'Spanish', path: '/es/' },
fa: { language: 'فارسی', 'language-english': 'Farsi', path: '/fa/' },
fr: { language: 'Français', 'language-english': 'French', path: '/fr/' },
ar: {
version: 1.0,
language: 'العربية',
'language-english': 'Arabic',
path: '/ar/'
},
cs: {
version: 1.0,
language: 'čeština',
'language-english': 'Czech',
path: '/cs/'
},
de: {
version: 1.0,
language: 'Deutsch',
'language-english': 'German',
path: '/de/'
},
el: {
version: 1.0,
language: 'Ελληνικά',
'language-english': 'Greek',
path: '/el/'
},
'es-EM': {
version: 1.0,
language: 'Español',
'language-english': 'Spanish',
path: '/es/'
},
fa: {
version: 1.0,
language: 'فارسی',
'language-english': 'Farsi',
path: '/fa/'
},
fr: {
version: 1.0,
language: 'Français',
'language-english': 'French',
path: '/fr/'
},
id: {
version: 1.05,
language: 'Bahasa Indonesia',
'language-english': 'Indonesian',
path: '/id/'
},
ig: { language: 'Ibo', 'language-english': 'Igbo', path: '/ig/' },
it: { language: 'Italiano', 'language-english': 'Italian', path: '/it/' },
ja: { language: '日本語', 'language-english': 'Japanese', path: '/ja/' },
ko: { language: '한국어', 'language-english': 'Korean', path: '/ko/' },
nl: { language: 'Nederlands', 'language-english': 'Dutch', path: '/nl/' },
pl: { language: 'Polski', 'language-english': 'Polish', path: '/pl/' },
ig: {
version: 1.0,
language: 'Ibo',
'language-english': 'Igbo',
path: '/ig/'
},
it: {
version: 1.0,
language: 'Italiano',
'language-english': 'Italian',
path: '/it/'
},
ja: {
version: 1.0,
language: '日本語',
'language-english': 'Japanese',
path: '/ja/'
},
ko: {
version: 1.0,
language: '한국어',
'language-english': 'Korean',
path: '/ko/'
},
nl: {
version: 1.0,
language: 'Nederlands',
'language-english': 'Dutch',
path: '/nl/'
},
pl: {
version: 1.0,
language: 'Polski',
'language-english': 'Polish',
path: '/pl/'
},
'pt-BR': {
version: 1.0,
language: 'Português',
'language-english': 'Portuguese (Brazilian)',
path: '/pt-br/'
},
ru: { language: 'Pусский', 'language-english': 'Russian', path: '/ru/' },
sk: { language: 'Slovenský', 'language-english': 'Slovak', path: '/sk/' },
sl: { language: 'Slovenija', 'language-english': 'Slovenian', path: '/sl/' },
ru: {
version: 1.0,
language: 'Pусский',
'language-english': 'Russian',
path: '/ru/'
},
sk: {
version: 1.0,
language: 'Slovenský',
'language-english': 'Slovak',
path: '/sk/'
},
sl: {
version: 1.0,
language: 'Slovenija',
'language-english': 'Slovenian',
path: '/sl/'
},
'sv-SE': {
version: 1.1,
language: 'Svenska',
'language-english': 'Swedish',
path: '/se/'
},
'zh-CN': {
version: 1.0,
language: '简体中文',
'language-english': 'Simplified Chinese',
path: '/zh/'
Expand Down
2 changes: 1 addition & 1 deletion docs/dot-net/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ Need a more basic primer first? Check out [ethereum.org/learn](/learn/) or [ethe
- [eth-utils](https://github.com/ethereum/eth-utils/) - _utility functions for working with Ethereum related codebases_
- [TestChains](https://github.com/Nethereum/TestChains) - _Pre-configured .NET devchains for fast response (PoA)_

Looking for more resources? Check out [ethereum.org/developers.](/developers/)
Looking for more resources? Check out [ethereum.org/developers](/developers/).

## .NET Community Contributors {#dot-net-community-contributors}

Expand Down
16 changes: 16 additions & 0 deletions docs/se/build/index.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---
title: Börja bygga
meta:
- name: beskrivning
content: Lär dig grunderna i Ethereum med Ethereum Studio, vår webbaserade IDE för att bygga och testa smarta kontrakt.
- property: og:title
content: Börja bygga | Ethereum
- property: og:description
content: Lär dig grunderna i Ethereum med Ethereum Studio, vår webbaserade IDE för att bygga och testa smarta kontrakt.
sidebar: false
layout: home
hideHero: true
lang: sv-SE
---

<BuildPage />
Loading

0 comments on commit d22b506

Please sign in to comment.