Skip to content

Commit 7acdd85

Browse files
authored
Merge branch 'master' into alessandra
2 parents 6f54a29 + 1a53edf commit 7acdd85

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+1466
-1210
lines changed

src/.vuepress/components/common/vuemastery-video-modal.vue

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,20 @@
1818
</div>
1919

2020
<p class="modal-text">
21-
Video by
21+
Vídeo por
2222
<a
2323
href="https://www.vuemastery.com"
2424
target="_blank"
2525
rel="sponsored noopener"
26-
title="Vue.js Courses on Vue Mastery"
26+
title="Cursos de Vue.js na Vue Mastery"
2727
>Vue Mastery</a
28-
>. Watch Vue Mastery’s free
28+
>. Assista ao gratuito
2929
<a
3030
href="https://www.vuemastery.com/courses/intro-to-vue-3/intro-to-vue3"
3131
target="_blank"
3232
rel="sponsored noopener"
33-
title="Vue.js Courses on Vue Mastery"
34-
>Intro to Vue course</a
33+
title="Cursos de Vue.js na Vue Mastery"
34+
>Curso de Introdução ao Vue</a
3535
>.
3636
</p>
3737
</div>

src/.vuepress/components/community/team/members.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ const members = [
252252
languages: ['uk', 'ru', 'en'],
253253
reposOfficial: ['vuejs.org', 'vue-cli'],
254254
work: {
255-
role: 'Senior Frontend Engineer',
255+
role: 'Staff Frontend Engineer',
256256
org: 'GitLab',
257257
orgUrl: 'https://gitlab.com/'
258258
},

src/.vuepress/config.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ const sidebar = {
1515
'/guide/introduction',
1616
'/guide/instance',
1717
'/guide/template-syntax',
18+
'/guide/data-methods',
1819
'/guide/computed',
1920
'/guide/class-and-style',
2021
'/guide/conditional',
@@ -156,6 +157,7 @@ const sidebar = {
156157
'/api/global-api',
157158
{
158159
title: 'Options',
160+
path: '/api/options-api',
159161
collapsable: false,
160162
children: [
161163
'/api/options-data',
@@ -173,6 +175,7 @@ const sidebar = {
173175
'/api/built-in-components.md',
174176
{
175177
title: 'Reactivity API',
178+
path: '/api/reactivity-api',
176179
collapsable: false,
177180
children: [
178181
'/api/basic-reactivity',
@@ -251,10 +254,10 @@ module.exports = {
251254
],
252255
['meta', { name: 'msapplication-TileColor', content: '#000000' }],
253256
[
254-
('script',
257+
'script',
255258
{
256259
src: 'https://player.vimeo.com/api/player.js'
257-
})
260+
}
258261
],
259262
[
260263
'script',
@@ -295,7 +298,7 @@ module.exports = {
295298
},
296299
{
297300
text: 'API Reference',
298-
link: '/api/application-config'
301+
link: '/api/'
299302
},
300303
{
301304
text: 'Ecosystem',

src/.vuepress/public/images/css-vs-js-ease.svg

Lines changed: 1 addition & 1 deletion
Loading
-3.78 KB
Loading

src/.vuepress/theme/components/Newsletter.vue

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template>
22
<div class="newsletter">
33
<div class="inner">
4-
<h3><label for="member_email">Subscribe to our Weekly Newsletter</label></h3>
4+
<h3><label for="member_email">Inscreva-se em nossas Notícias Semanais</label></h3>
55
<form
66
class="newsletter-form"
77
id="revue-form"
@@ -17,18 +17,18 @@
1717
name="member[email]"
1818
id="member_email"
1919
required
20-
placeholder="Email address"
20+
placeholder="Endereço de e-mail"
2121
>
2222
<input
2323
class="button newsletter-button"
2424
type="submit"
25-
value="Subscribe"
25+
value="Assinar"
2626
name="member[subscribe]"
2727
id="member_submit"
2828
>
2929
</form>
3030
<p>
31-
You can read the previous issues and listen to our podcast at <a href="https://news.vuejs.org" target="_blank" rel="noopener">news.vuejs.org</a>.
31+
Você pode ler as edições anteriores e escutar nosso podcast em <a href="https://news.vuejs.org" target="_blank" rel="noopener">news.vuejs.org</a>.
3232
</p>
3333
</div>
3434
</div>
@@ -71,7 +71,7 @@
7171
position: absolute;
7272
padding: 4px 20px;
7373
margin: 0;
74-
height: calc(100% - 8px);
74+
min-height: calc(100% - 8px);
7575
right: 4px;
7676
top: 4px;
7777
font-size: 1.05em;

src/.vuepress/theme/components/sponsors/OpenCollectiveSponsors.vue

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<template>
22
<SponsorsLayout extra-classes="sponsors__open-collective">
3-
<template #heading>Open Collective Sponsors</template>
3+
<template #heading>Patrocínio no Open Collective</template>
44

55
<template #content>
6-
<h4>Platinum</h4>
6+
<h4>Platina</h4>
77
<a
88
:href="`https://opencollective.com/vuejs/tiers/platinum-sponsors/${index}/website`"
99
rel="sponsored noopener"
@@ -12,11 +12,11 @@
1212
>
1313
<img
1414
:src="`https://opencollective.com/vuejs/tiers/platinum-sponsors/${index}/avatar.svg`"
15-
alt="Vue.JS platinum sponsor"
15+
alt="Patrocinador Platina do Vue.JS"
1616
>
1717
</a>
1818

19-
<h4>Gold</h4>
19+
<h4>Ouro</h4>
2020
<a
2121
:href="`https://opencollective.com/vuejs/tiers/gold-sponsors/${index}/website`"
2222
rel="sponsored noopener"
@@ -25,7 +25,7 @@
2525
>
2626
<img
2727
:src="`https://opencollective.com/vuejs/tiers/gold-sponsors/${index}/avatar.svg`"
28-
alt="Vue.JS gold sponsor"
28+
alt="Patrocinador Ouro do Vue.JS"
2929
>
3030
</a>
3131
</template>

src/.vuepress/theme/components/sponsors/PatreonSponsors.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<SponsorsLayout extra-classes="sponsors__patreon">
3-
<template #heading>Patreon Sponsors</template>
3+
<template #heading>Patrocínio no Patreon</template>
44

55
<template #content>
66
<div class="platinum">
@@ -26,7 +26,7 @@
2626
</a>
2727
</div>
2828

29-
<RoundedButton url="https://vuejs.org/support-vuejs/">Become a Sponsor!</RoundedButton>
29+
<RoundedButton url="https://vuejs.org/support-vuejs/">Seja um Patrocinador!</RoundedButton>
3030
</template>
3131
</SponsorsLayout>
3232
</template>

src/.vuepress/theme/components/sponsors/SpecialSponsors.vue

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,23 @@ export default {
2626
2727
computed: {
2828
heading () {
29-
return `Special Sponsor${this.sponsors.length === 1 ? '' : 's'}`
29+
return (
30+
this.sponsors.length > 0
31+
? `Patrocinador${this.getPlural(0)} Especia${this.getPlural(1)}`
32+
: ''
33+
)
34+
}
35+
},
36+
37+
methods: {
38+
getPlural(wordId) {
39+
const plurals = ['es', 'is']
40+
const singulars = ['', 'l']
41+
return (
42+
this.sponsors.length === 1
43+
? singulars[wordId]
44+
: plurals[wordId]
45+
)
3046
}
3147
}
3248
}

src/.vuepress/theme/data/patreon-sponsors.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export default {
1010
"url": "https://autocode.com",
1111
"img": "autocode.svg",
1212
"name": "Autocode",
13-
"description": "Build app-to-app workflows and connect APIs"
13+
"description": "Construa workflows de app à app e conecte APIs"
1414
}
1515
],
1616
"platinum_sponsors": [

0 commit comments

Comments
 (0)