Skip to content
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

docs: fixes #872

Merged
merged 45 commits into from
May 11, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
5ecc269
docs: (ru) translation start
Alex-Sokolov Apr 5, 2020
95179f9
api.md перевод заголовков и общих фраз
Alex-Sokolov Apr 6, 2020
f3ac3cf
wip
Alex-Sokolov Apr 6, 2020
c67e246
wip
Alex-Sokolov Apr 6, 2020
8788121
wip
Alex-Sokolov Apr 6, 2020
bce7c73
wip
Alex-Sokolov Apr 6, 2020
fe13b10
wip
Alex-Sokolov Apr 6, 2020
26d51e0
wip
Alex-Sokolov Apr 6, 2020
481690a
wip
Alex-Sokolov Apr 6, 2020
94b3dbd
wip
Alex-Sokolov Apr 6, 2020
f2042b5
wip
Alex-Sokolov Apr 6, 2020
e0914a2
installation.md translated
Alex-Sokolov Apr 9, 2020
ba9fedc
formatting.md translated
Alex-Sokolov Apr 9, 2020
d89bb35
pluralization.md translated
Alex-Sokolov Apr 9, 2020
974b4d7
(ru) wip translation
Alex-Sokolov Apr 9, 2020
fc4b2b7
daterime.md translated
Alex-Sokolov Apr 9, 2020
b49b431
number.md translated
Alex-Sokolov Apr 9, 2020
33d97f0
(ru) translation wip
Alex-Sokolov Apr 9, 2020
68734dc
(ru) multiple linebreaks replaced
Alex-Sokolov Apr 9, 2020
82b979b
(ru) translation wip
Alex-Sokolov Apr 9, 2020
b67f15a
api.md translation wip
Alex-Sokolov Apr 9, 2020
7516f80
(ru) translation wip: change external docs links
Alex-Sokolov Apr 9, 2020
1831d67
(ru) translation wip: formatting
Alex-Sokolov Apr 9, 2020
dbf36fd
(ru) translation wip
Alex-Sokolov Apr 9, 2020
5cca44f
docs: (ru) translation wip
Alex-Sokolov Apr 12, 2020
e8df30a
Merge remote-tracking branch 'upstream/v8.x' into v8.x
Alex-Sokolov Apr 12, 2020
1a3f4b3
docs: merge updates
Alex-Sokolov Apr 12, 2020
afacc4a
(ru) translation wip
Alex-Sokolov Apr 12, 2020
088c67c
docs: (ru) translation wip
Alex-Sokolov Apr 19, 2020
07db325
docs: (ru) translation wip
Alex-Sokolov Apr 19, 2020
1e6d228
docs: (ru) translation wip
Alex-Sokolov Apr 19, 2020
934aaef
docs: (ru) translation wip
Alex-Sokolov Apr 19, 2020
583d1ba
docs: (ru) translation wip
Alex-Sokolov Apr 19, 2020
e6639da
docs: (ru) translation wip
Alex-Sokolov Apr 19, 2020
5657312
docs: (ru) translation wip
Alex-Sokolov Apr 26, 2020
24821f4
docs: (ru) translation wip
Alex-Sokolov May 1, 2020
313d43a
docs: (ru) translation wip
Alex-Sokolov May 1, 2020
5344cd2
docs: (ru) translation wip
Alex-Sokolov May 1, 2020
efefafb
Merge remote-tracking branch 'upstream/v8.x' into v8.x
Alex-Sokolov May 1, 2020
f7ed50b
docs: (ru) Translation finished
Alex-Sokolov May 6, 2020
c26c8d6
docs: (ru) hot-update.md update
Alex-Sokolov May 6, 2020
6e66335
Merge remote-tracking branch 'upstream/v8.x' into v8.x
Alex-Sokolov May 6, 2020
a4906ac
docs: (ru) translation updates
Alex-Sokolov May 6, 2020
ae898ec
Merge remote-tracking branch 'upstream/v8.x' into v8.x
Alex-Sokolov May 11, 2020
a2ede47
docs: small fixes
Alex-Sokolov May 11, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 3 additions & 14 deletions vuepress/api/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ If you have specified an `i18n` option at component options, you will be able to

## `VueI18n` class

`Vuei18n` class implement `I18n` interface of [flowtype definitions](https://github.com/kazupon/vue-i18n/blob/dev/decls/i18n.js)
`VueI18n` class implement `I18n` interface of [flowtype definitions](https://github.com/kazupon/vue-i18n/blob/dev/decls/i18n.js)

### Static properties

Expand Down Expand Up @@ -326,7 +326,7 @@ In next major version, `warnHtmlInMessage` option is `warn` as default.

* **Default:** `undefined`

The shared locale messages of localization for components. More detail see [Component based localizatrion](../guide/component.md#shared-locale-messages-for-components).
The shared locale messages of localization for components. More detail see [Component based localization](../guide/component.md#shared-locale-messages-for-components).

#### postTranslation

Expand Down Expand Up @@ -445,7 +445,7 @@ Whether to allow the use locale messages of HTML formatting.
If you set `warn` or` error`, will check the locale messages on the VueI18n instance.

If you are specified `warn`, a warning will be output at console.
If you are specified `error` will occured an Error.
If you are specified `error` will occurred an Error.

In VueI18n instance, set the `off` as default.

Expand Down Expand Up @@ -527,17 +527,6 @@ If you set `warn` or` error` in the `warnHtmlInMessage` property, when this meth

This is the same as the `Function` returned with `$t` method. More detail see [$t](#t).

#### i( key, [locale], [values] )

> :new: 7.0+

* **Arguments:**

* `{Path} key`: required
* `{Locale} locale`: optional
* `{Array} values`: optional
* **Return:** : `TranslateResult`

#### tc( key, [choice], [values] )

* **Arguments:**
Expand Down
6 changes: 3 additions & 3 deletions vuepress/guide/directive.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,9 @@ Outputs:
:new: 8.7+
:::

When `v-t` directive is applied to an element inside [`<transition>` component](https://vuejs.org/v2/api/#transition), you may notice that the translated message disappears during the transition. This behavior is related to the nature of the `<transition>` component implementation – all directives in the disappearing element inside the `<transition>` component will be destroyed **before the transition starts**. This behavior may result in content flickering on short animations, but is most noticable on long transitions.
When `v-t` directive is applied to an element inside [`<transition>` component](https://vuejs.org/v2/api/#transition), you may notice that the translated message disappears during the transition. This behavior is related to the nature of the `<transition>` component implementation – all directives in the disappearing element inside the `<transition>` component will be destroyed **before the transition starts**. This behavior may result in content flickering on short animations, but is most noticeable on long transitions.

To make sure directive content stays un-touched during a transition, just add the [`.preserve` modifier](../api/#v-t) to the `v-t` directive defintion.
To make sure directive content stays un-touched during a transition, just add the [`.preserve` modifier](../api/#v-t) to the `v-t` directive definition.

Javascript:

Expand Down Expand Up @@ -161,7 +161,7 @@ About the above examples, see the [example](https://github.com/kazupon/vue-i18n/

#### Pros

You can **flexibly** use mustash syntax `{{}}` in templates and also computed props and methods in Vue instance.
You can **flexibly** use mustache syntax `{{}}` in templates and also computed props and methods in Vue instance.

#### Cons

Expand Down
6 changes: 3 additions & 3 deletions vuepress/guide/fallback.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ For example `de-DE-bavarian` would fallback
1. `de-DE`
1. `de`

To supress the automatic fallback, add the postfix exclamation mark `!`, for example `de-DE!`
To suppress the automatic fallback, add the postfix exclamation mark `!`, for example `de-DE!`

## Explicit fallback with one locale

Sometimes some items will not be translated into some languages. In this example, the item `hello` is available in English but not Japanese:
Sometimes some items will not be translated into some languages. In this example, the item `hello` is available in English but not Japanese:

```js
const messages = {
Expand Down Expand Up @@ -108,7 +108,7 @@ const messages = {

This is useful because you don't have to specify a translation for the string "Hello, world!" into English.

In fact, you can even include template parameters in a key. Together with `formatFallbackMessages: true`, this lets you skip writing templates for your "base" language; the keys *are* your templates.
In fact, you can even include template parameters in a key. Together with `formatFallbackMessages: true`, this lets you skip writing templates for your "base" language; the keys *are* your templates.

```javascript
const messages = {
Expand Down
2 changes: 1 addition & 1 deletion vuepress/guide/formatting.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ We recommended using the [component interpolation](interpolation.md) feature.
:::warning Notice
> :new: 8.11+

You can control the use of HTML formatting. see the detail `warnHtmlInMessage` constructor option and property API.
You can control the use of HTML formatting. see the detail `warnHtmlInMessage` constructor option and property API.
:::

In some cases you might want to render your translation as an HTML message and not a static string.
Expand Down
2 changes: 1 addition & 1 deletion vuepress/guide/hot-reload.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const messages = {
}

// VueI18n instance
const i18n = new Vuei18n({
const i18n = new VueI18n({
locale: 'en',
messages
})
Expand Down
2 changes: 1 addition & 1 deletion vuepress/guide/interpolation.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ The children of `i18n` functional component are interpolated with locale message
:::
is interpolated with `term` locale message.

In the above example, the component interpolation follows the **list formatting**. The children of `i18n` functional component are interpolated by their order of appearance.
In the above example, the component interpolation follows the **list formatting**. The children of `i18n` functional component are interpolated by their order of appearance.

## Slots syntax usage

Expand Down
2 changes: 1 addition & 1 deletion vuepress/guide/messages.md
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ Output:
### Formatting linked locale messages

If the language distinguish cases of character, you may need control the case of the linked locale messages.
Linked messages can be formatted with modifier `@.modifier:key`
Linked messages can be formatted with modifier `@.modifier:key`

The below modifiers are available currently.

Expand Down
2 changes: 1 addition & 1 deletion vuepress/guide/sfc.md
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ __Translation contains only text__ (Work without deep selector)
<i18n>
{
"en": {
"hello": "helloworld!"
"hello": "hello world!"
},
"ja": {
"hello": "こんにちは、世界"
Expand Down
12 changes: 0 additions & 12 deletions vuepress/ru/api/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -535,18 +535,6 @@ VueI18n.prototype.getChoiceIndex = /* пользовательская реал

Аналогично функции возвращаемой методом `$t`. Подробнее см. [\$t](#t).

#### i( key, [locale], [values] )

> :new: Добавлено в версии 7.0+

- **Аргументы:**

- `{Path} key`: обязательный
- `{Locale} locale`: опционально
- `{Array} values`: опционально

- **Возвращает:** : `TranslateResult`

#### tc( key, [choice], [values] )

- **Аргументы:**
Expand Down
11 changes: 0 additions & 11 deletions vuepress/zh/api/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -430,17 +430,6 @@ VueI18n.prototype.getChoiceIndex = /* 自定义实现 */

这与 `$t` 方法返回的 `Function` 相同。更多细节见[$t](#t)。

#### i( key, [locale], [values] )

> :new: 7.0 新增

* **参数:**

* `{Path} key`:必填
* `{Locale} locale`:可选
* `{Array} values`:可选
* **返回值:**:`TranslateResult`

#### tc( key, [choice], [values] )

* **参数:**
Expand Down
2 changes: 1 addition & 1 deletion vuepress/zh/guide/hot-reload.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const messages = {
}

// VueI18n 实例
const i18n = new Vuei18n({
const i18n = new VueI18n({
locale: 'en',
messages
})
Expand Down