Skip to content

Commit d22b506

Browse files
samajamminsamajammin
authored
Merge pull request #780 from ethereum/dev
Deploy v1.2.1
2 parents 7a251f7 + f6d3cef commit d22b506

File tree

22 files changed

+1711
-37
lines changed

22 files changed

+1711
-37
lines changed

‎docs/.vuepress/components/HomePage.vue‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</div>
1414

1515
<div class="intro-blocks">
16-
<div class="intro-block" v-if="isEnglish">
16+
<div class="intro-block" v-if="contentVersion >= 1.1">
1717
<h3 class="header">
1818
<span class="arrow">→</span
1919
>{{ translateString('page-home-section-individuals-title') }}
@@ -34,15 +34,15 @@
3434
{{ translateString('page-home-section-individuals-item-three') }}
3535
</router-link>
3636
</li>
37-
<li>
37+
<li v-if="contentVersion > 1.1">
3838
<router-link :to="langPath() + 'community/'" class="black">
3939
{{ translateString('page-community') }}
4040
</router-link>
4141
</li>
4242
</ul>
4343
</div>
4444

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

71-
<div class="intro-block-nonenglish" v-if="!isEnglish">
71+
<div class="intro-block-content-version-1" v-if="contentVersion < 1.1">
7272
<h3>
7373
<router-link :to="langPath() + 'use/'">
7474
<span class="arrow">→</span
@@ -106,7 +106,7 @@
106106
</ul>
107107
</div>
108108

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

141141
<div
142142
v-bind:class="{
143-
'intro-block': isEnglish,
144-
'intro-block-nonenglish': !isEnglish
143+
'intro-block': contentVersion >= 1.1,
144+
'intro-block-content-version-1': contentVersion < 1.1
145145
}"
146146
>
147147
<h3>
@@ -151,15 +151,15 @@
151151
</router-link>
152152
</h3>
153153
<ul>
154-
<li v-if="!isEnglish">
154+
<li v-if="contentVersion < 1.1">
155155
<router-link
156156
:to="langPath() + 'developers/#getting-started'"
157157
class="black"
158158
>
159159
{{ translateString('page-home-section-developers-item-one') }}
160160
</router-link>
161161
</li>
162-
<li v-if="isEnglish">
162+
<li v-if="contentVersion >= 1.05">
163163
<router-link :to="langPath() + 'build/'" class="black">
164164
{{ translateString('page-home-section-developers-item-one') }}
165165
</router-link>
@@ -183,7 +183,7 @@
183183
</ul>
184184
</div>
185185

186-
<div class="intro-block" v-if="isEnglish">
186+
<div class="intro-block" v-if="contentVersion >= 1.1">
187187
<h3>
188188
<router-link :to="langPath() + 'enterprise/'">
189189
<span class="arrow">→</span
@@ -226,10 +226,8 @@ import { translate } from '../theme/utils/translations'
226226
227227
export default {
228228
computed: {
229-
// TODO update this to return a contentVersion
230-
// e.g. English is 1.2, Indonesian is 1.1, all others 1.0
231-
isEnglish() {
232-
return this.$lang === 'en-US'
229+
contentVersion() {
230+
return translate('version', this.$lang)
233231
}
234232
},
235233
methods: {

‎docs/.vuepress/config.js‎

Lines changed: 69 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,9 @@ module.exports = {
6464
],
6565
[
6666
'script',
67-
{ type: 'application/ld+json'},
68-
67+
{ type: 'application/ld+json' },
68+
6969
`{"@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"}`
70-
7170
]
7271
],
7372
markdown: {
@@ -361,6 +360,73 @@ module.exports = {
361360
}
362361
]
363362
},
363+
'/se/': {
364+
lang: 'sv-SE',
365+
label: translate('language'),
366+
nav: [
367+
{ text: translate('page-home', 'sv-SE'), link: '/se/' },
368+
{
369+
text: translate('page-individuals', 'sv-SE'),
370+
ariaLabel: translate('page-individuals-aria-label', 'sv-SE'),
371+
items: [
372+
{
373+
text: translate(
374+
'page-home-section-individuals-item-one',
375+
'sv-SE'
376+
),
377+
link: '/se/what-is-ethereum/'
378+
},
379+
{
380+
text: translate(
381+
'page-home-section-individuals-item-four',
382+
'sv-SE'
383+
),
384+
link: '/se/eth/'
385+
},
386+
{
387+
text: translate(
388+
'page-home-section-individuals-item-two',
389+
'sv-SE'
390+
),
391+
link: '/se/dapps/'
392+
},
393+
{
394+
text: translate(
395+
'page-home-section-individuals-item-five',
396+
'sv-SE'
397+
),
398+
link: '/se/wallets/'
399+
},
400+
{
401+
text: translate(
402+
'page-home-section-individuals-item-three',
403+
'sv-SE'
404+
),
405+
link: '/se/learn/'
406+
}
407+
]
408+
},
409+
{
410+
text: translate('page-developers', 'sv-SE'),
411+
ariaLabel: translate('page-developers-aria-label', 'sv-SE'),
412+
items: [
413+
{
414+
text: translate('get-started', 'sv-SE'),
415+
link: '/se/build/'
416+
},
417+
{
418+
text: 'Ethereum Studio',
419+
link: 'https://studio.ethereum.org/'
420+
},
421+
{
422+
text: translate('developer-resources', 'sv-SE'),
423+
link: '/se/developers/'
424+
}
425+
]
426+
},
427+
{ text: translate('page-enterprise', 'sv-SE'), link: '/se/enterprise/' }
428+
]
429+
},
364430
'/sk/': {
365431
lang: 'sk',
366432
label: translate('language', 'sk'),

‎docs/.vuepress/theme/styles/theme.styl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ ul
162162
flex-wrap wrap
163163

164164
.intro-block,
165-
.intro-block-nonenglish
165+
.intro-block-content-version-1
166166
flex 1 1 29%
167167
padding-left 1em
168168
padding-right 1em
@@ -183,7 +183,7 @@ ul
183183
background-repeat no-repeat
184184

185185
// TODO remove once translations are updated w/ new personas
186-
.intro-block-nonenglish
186+
.intro-block-content-version-1
187187
flex 1 1 40%
188188
padding-left 2em
189189
padding-right 2em

‎docs/.vuepress/theme/utils/translations.js‎

Lines changed: 108 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ const portugueseBrazilian = require('../../../pt-br/strings.json')
2323
const ru = require('../../../ru/strings.json')
2424
const sk = require('../../../sk/strings.json')
2525
const sl = require('../../../sl/strings.json')
26+
const se = require('../../../se/strings.json')
2627
const simplifiedChinese = require('../../../zh/strings.json')
2728

2829
// These lang keys should match the equivalent CrowdIn translation page
@@ -48,44 +49,135 @@ const stringTranslations = {
4849
ru,
4950
sk,
5051
sl,
52+
'sv-SE': se,
5153
'zh-CN': simplifiedChinese
5254
}
5355

5456
// These lang keys should match `stringTranslations` keys
5557
// TODO add contentVersion key to each lang, e.g. for HomePage display logic
5658
const languageMetaData = {
5759
'en-US': {
60+
version: 1.2,
5861
language: 'English',
5962
'language-english': 'English',
6063
path: '/'
6164
},
62-
ar: { language: 'العربية', 'language-english': 'Arabic', path: '/ar/' },
63-
cs: { language: 'čeština', 'language-english': 'Czech', path: '/cs/' },
64-
de: { language: 'Deutsch', 'language-english': 'German', path: '/de/' },
65-
el: { language: 'Ελληνικά', 'language-english': 'Greek', path: '/el/' },
66-
'es-EM': { language: 'Español', 'language-english': 'Spanish', path: '/es/' },
67-
fa: { language: 'فارسی', 'language-english': 'Farsi', path: '/fa/' },
68-
fr: { language: 'Français', 'language-english': 'French', path: '/fr/' },
65+
ar: {
66+
version: 1.0,
67+
language: 'العربية',
68+
'language-english': 'Arabic',
69+
path: '/ar/'
70+
},
71+
cs: {
72+
version: 1.0,
73+
language: 'čeština',
74+
'language-english': 'Czech',
75+
path: '/cs/'
76+
},
77+
de: {
78+
version: 1.0,
79+
language: 'Deutsch',
80+
'language-english': 'German',
81+
path: '/de/'
82+
},
83+
el: {
84+
version: 1.0,
85+
language: 'Ελληνικά',
86+
'language-english': 'Greek',
87+
path: '/el/'
88+
},
89+
'es-EM': {
90+
version: 1.0,
91+
language: 'Español',
92+
'language-english': 'Spanish',
93+
path: '/es/'
94+
},
95+
fa: {
96+
version: 1.0,
97+
language: 'فارسی',
98+
'language-english': 'Farsi',
99+
path: '/fa/'
100+
},
101+
fr: {
102+
version: 1.0,
103+
language: 'Français',
104+
'language-english': 'French',
105+
path: '/fr/'
106+
},
69107
id: {
108+
version: 1.05,
70109
language: 'Bahasa Indonesia',
71110
'language-english': 'Indonesian',
72111
path: '/id/'
73112
},
74-
ig: { language: 'Ibo', 'language-english': 'Igbo', path: '/ig/' },
75-
it: { language: 'Italiano', 'language-english': 'Italian', path: '/it/' },
76-
ja: { language: '日本語', 'language-english': 'Japanese', path: '/ja/' },
77-
ko: { language: '한국어', 'language-english': 'Korean', path: '/ko/' },
78-
nl: { language: 'Nederlands', 'language-english': 'Dutch', path: '/nl/' },
79-
pl: { language: 'Polski', 'language-english': 'Polish', path: '/pl/' },
113+
ig: {
114+
version: 1.0,
115+
language: 'Ibo',
116+
'language-english': 'Igbo',
117+
path: '/ig/'
118+
},
119+
it: {
120+
version: 1.0,
121+
language: 'Italiano',
122+
'language-english': 'Italian',
123+
path: '/it/'
124+
},
125+
ja: {
126+
version: 1.0,
127+
language: '日本語',
128+
'language-english': 'Japanese',
129+
path: '/ja/'
130+
},
131+
ko: {
132+
version: 1.0,
133+
language: '한국어',
134+
'language-english': 'Korean',
135+
path: '/ko/'
136+
},
137+
nl: {
138+
version: 1.0,
139+
language: 'Nederlands',
140+
'language-english': 'Dutch',
141+
path: '/nl/'
142+
},
143+
pl: {
144+
version: 1.0,
145+
language: 'Polski',
146+
'language-english': 'Polish',
147+
path: '/pl/'
148+
},
80149
'pt-BR': {
150+
version: 1.0,
81151
language: 'Português',
82152
'language-english': 'Portuguese (Brazilian)',
83153
path: '/pt-br/'
84154
},
85-
ru: { language: 'Pусский', 'language-english': 'Russian', path: '/ru/' },
86-
sk: { language: 'Slovenský', 'language-english': 'Slovak', path: '/sk/' },
87-
sl: { language: 'Slovenija', 'language-english': 'Slovenian', path: '/sl/' },
155+
ru: {
156+
version: 1.0,
157+
language: 'Pусский',
158+
'language-english': 'Russian',
159+
path: '/ru/'
160+
},
161+
sk: {
162+
version: 1.0,
163+
language: 'Slovenský',
164+
'language-english': 'Slovak',
165+
path: '/sk/'
166+
},
167+
sl: {
168+
version: 1.0,
169+
language: 'Slovenija',
170+
'language-english': 'Slovenian',
171+
path: '/sl/'
172+
},
173+
'sv-SE': {
174+
version: 1.1,
175+
language: 'Svenska',
176+
'language-english': 'Swedish',
177+
path: '/se/'
178+
},
88179
'zh-CN': {
180+
version: 1.0,
89181
language: '简体中文',
90182
'language-english': 'Simplified Chinese',
91183
path: '/zh/'

‎docs/dot-net/index.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ Need a more basic primer first? Check out [ethereum.org/learn](/learn/) or [ethe
8484
- [eth-utils](https://github.com/ethereum/eth-utils/) - _utility functions for working with Ethereum related codebases_
8585
- [TestChains](https://github.com/Nethereum/TestChains) - _Pre-configured .NET devchains for fast response (PoA)_
8686

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

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

‎docs/se/build/index.md‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
---
2+
title: Börja bygga
3+
meta:
4+
- name: beskrivning
5+
content: Lär dig grunderna i Ethereum med Ethereum Studio, vår webbaserade IDE för att bygga och testa smarta kontrakt.
6+
- property: og:title
7+
content: Börja bygga | Ethereum
8+
- property: og:description
9+
content: Lär dig grunderna i Ethereum med Ethereum Studio, vår webbaserade IDE för att bygga och testa smarta kontrakt.
10+
sidebar: false
11+
layout: home
12+
hideHero: true
13+
lang: sv-SE
14+
---
15+
16+
<BuildPage />

0 commit comments

Comments
 (0)