Skip to content

Upstream master sync #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 460 commits into from
Oct 12, 2017
Merged

Upstream master sync #25

merged 460 commits into from
Oct 12, 2017

Conversation

imagentleman
Copy link

El repo está 459 commits atrás de https://github.com/vuejs/vuejs.org

Este PR se trae todos esos cambios.

No se siguió la guía de #4 (básicamente rebase), ya que involucraba solucionar conflictos en archivos y continuar el rebase, 1 vez por cada PR aceptado en este repo desde el fork.

En cambio se hizo un merge fast-forward (para preservar la historia original) del master de https://github.com/vuejs/vuejs.org y un commit final resolviendo todos los conflictos, en donde simplemente se aceptaron los cambios hechos en este repo (los archivos ya traducidos).

Los conflictos se dieron en:

src/v2/api/index.md

src/v2/examples/hackernews.md

src/v2/guide/class-and-style.md

src/v2/guide/components.md

src/v2/guide/computed.md

src/v2/guide/conditional.md

src/v2/guide/events.md

src/v2/guide/forms.md

src/v2/guide/index.md

src/v2/guide/installation.md

src/v2/guide/instance.md

src/v2/guide/list.md

src/v2/guide/syntax.md

src/v2/guide/transitions.md

Es muy probable que toque volver a revisar el original en inglés y volver a traducir partes en este repo, ya que han pasado 459 commits (y unos 7 meses) : P y los conflictos se resolvieron automáticamente tomando lo nuevo en español.

Haciendo una prueba local, lo nuevo (menús, landing con sponsors, etc) del repo original en inglés aparece actualizado y lo ya traducido se preservó.

Este PR es un poco agresivo, pero es una de las formas sencillas de sincronizar todo el repo con el original.

anteriovieira and others added 30 commits May 17, 2017 00:04
* Update syntax.md


Originally, I'd thought that:

```
<div v-html="rawHtml">This {{ some_html}}</div>
```

(where we might have `vm.data.some_html='<b>hello</b>'`) ... would render something like:

**hello**

But instead we get:

```
Property or method "rawHtml" is not defined on the instance but referenced during render. Make sure to declare reactive data properties in the data option.
```

...if one is watching console errors.

My wording could be a little bit kludgy and others might be able to make it clearer but I think this may overcome some misunderstandings for those not familiar with vuejs.

* Update syntax.md
…js#903)

* Add french translation link

Signed-off-by: Bruno Lesieur <[email protected]>

* kebab-case explaination updates

Signed-off-by: Bruno Lesieur <[email protected]>

* kebab-case to kebab-cased

Signed-off-by: Bruno Lesieur <[email protected]>

* Remove space before self-closing component
Fixed minor grammatical error.
)

* vuejs#769 Add manifest and icons

* fix ie icons

* simple offline support

* complete offline support
In the sample code for a functional component in "Reusable Transitions", fix the missing comma that should separate the props `name` and `mode`.
If we change it form `pre` to `pre-line` we get a nicer trimmed text on each line without the need of modifiers.

Definition on both can be found in [the spec](https://www.w3.org/TR/css-text-3/#white-space-property) as follows:

```
‘pre’
This value prevents user agents from collapsing sequences of white space. Segment breaks such as line feeds and carriage returns are preserved as forced line breaks. Lines only break at forced line breaks; content that does not fit within the block container overflows it.

‘pre-line’
Like ‘normal’, this value collapses consecutive spaces and allows wrapping, but preserves segment breaks in the source as forced line breaks.
```

Both have the same browser support.
Add note regarding explicit prop declaration requirement
fix for the typo at the end of the page
…ion (vuejs#951)

"Camel case is distinct from title case, which is traditionally used for book titles and headlines, as the latter retains the spaces between the words." https://en.wikipedia.org/wiki/Camel_case
* Makes a feature more obvious to the reader

... following an issue that I encountered.

vuejs/vue#5870 (comment)

* Added some missing commas
…e used instead of setting a new array length
Jinjiang and others added 25 commits September 25, 2017 00:24
* kb (meaning kilobit) become kB (meaning kiloByte)

Signed-off-by: Bruno Lesieur <[email protected]>

* kB to KB

Signed-off-by: Bruno Lesieur <[email protected]>
* Add link to modifiers list

* Revise links to modifiers
* initial style guide prototype with examples

* clarify component style scoping in 3rd-party libs

* flesh out rule for complex computed properties

* clarify component style scoping

* flesh out self-closing components rule in style guide

* flesh out style guide entry for component name casing in JS/JSX

* complete draft for priority A rules

* complete draft for priority B rules

* style guide fixes after @KatieMFritz's review

* fix code block styles, especially on style guide

* fix wrong formatting for in-dom templates style rule

* simplify data function detailed explanation in style guide

* in style guide, add detailed explanation with example for keyed v-for

* in style guide, improve explanation of order of words in component names

* in style guide, link to SFC and JSX explanations

* WIP

* complete definitions for all style guide rules

* minor language tweaks to style guide

* update SG recommendation for nested component directories, courtesy of @Akryum

* fix SG typo in self-closing components example

* update SG component options order, tag @Akryum @posva

* add category tags to rule titles

* style guide round of edits and simplification

* move list rendering above conditionals in SG element attribute order

* add SG rule about empty lines in component/instance options

* fixed missing and added commas in SG example

* move style guide to its own page

* make exception to multi-word component names for App in SG

* add beta tag to style guide

* fix typos pointed out by @phanan

* clarify keyed v-for rule in SG

* update when component subdirectories are worth considering in SG

* add link to HTML spec in multi-word component names SG rule
To fix circular reference in webpack, change `require('./tree-folder-contents.vue').default` to `require('./tree-folder-contents.vue')`
my env:
```
nodejs: 6.9.1
vuejs: 2.3.4
webpack: 2.7.1
```
* Update abbreviation rule to note avoidance

* Style guide: Switch abbreviation title with correct tense
# Conflicts:
#	src/v2/api/index.md
#	src/v2/examples/hackernews.md
#	src/v2/guide/class-and-style.md
#	src/v2/guide/components.md
#	src/v2/guide/computed.md
#	src/v2/guide/conditional.md
#	src/v2/guide/events.md
#	src/v2/guide/forms.md
#	src/v2/guide/index.md
#	src/v2/guide/installation.md
#	src/v2/guide/instance.md
#	src/v2/guide/list.md
#	src/v2/guide/syntax.md
#	src/v2/guide/transitions.md
@miljan-aleksic
Copy link

@imagentleman, es justo lo que me tocaba hacer y no encontraba el tiempo :D gracias!

@panietoar, puedes hacer un clone del repo de @imagentleman y comprobar que ninguna traducción se ha perdido? Si fuese así, corregirlo?

Cuando estemos seguros que está bien, hacemos un tag de lo que tenemos ahora, aceptamos los cambios y continuamos traduciendo lo que falte.

Muchas gracias chicos!!

@panietoar
Copy link

Sorry por la demora.

Ya hago la revisión @miljan-aleksic

@panietoar
Copy link

Todos los archivos ya traducidos están correctos. Pero eso es solo una parte de la revisión.
Como dice @imagentleman, tocaría ver la última versión de los docs en inglés, a ver si se ha agregado algo nuevo en los archivos ya traducidos y agregarlo.

Por otro lado, entre más rápido terminemos la traducción, mejor.
@miljan-aleksic completa el merge y continuemos con la sección Advanced

@miljan-aleksic miljan-aleksic merged commit ce671e2 into vuejs-es:master Oct 12, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.