Skip to content

Translate Reconciliation #139

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 21 commits into from
Feb 27, 2019
Merged

Translate Reconciliation #139

merged 21 commits into from
Feb 27, 2019

Conversation

styopaiv
Copy link
Contributor

No description provided.

@styopaiv styopaiv mentioned this pull request Feb 14, 2019
Closed
88 tasks
@another-guy another-guy added the needs review A pull request ready to be reviewed label Feb 14, 2019
ntishkevich
ntishkevich reviewed Feb 14, 2019
View reviewed changes
lex111
lex111 reviewed Feb 17, 2019
View reviewed changes
Copy link
Member

@lex111 lex111 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Спасибо за перевод, небольшие предложения по его улучшению.

@another-guy another-guy added work in progress Author opened the pull-request but it's still being worked on and removed needs review A pull request ready to be reviewed labels Feb 23, 2019
another-guy
another-guy reviewed Feb 25, 2019
View reviewed changes
Copy link
Collaborator

@another-guy another-guy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Несколько предложений по стилю.

Ряд сложных предложений переведён блестяще, @astralpunch ! 👏

content/docs/reconciliation.md Outdated

When a component updates, the instance stays the same, so that state is maintained across renders. React updates the props of the underlying component instance to match the new element, and calls `componentWillReceiveProps()` and `componentWillUpdate()` on the underlying instance.
Когда компонент обновляется, его экземпляр не меняется, чтобы его состояние сохранялось сквозь рендеры. React обновляет пропсы базового экземпляра компонента для соответствия новому элементу и вызывает `componentWillReceiveProps()` и `componentWillUpdate()` на базовом экземпляре.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

React обновляет пропсы базового экземпляра компонента для соответствия новому элементу и вызывает componentWillReceiveProps() и componentWillUpdate() на базовом экземпляре.

@astralpunch @lex111 при первом прочтении мне было не ясно, о каком "базовом" компоненте идёт речь. В оригинале underlying звучит очень понятно, но плохо ложится на русский в вариантах ниже лежащий, лежащий в основе и подобных. Если ли мысли, как это предложение получше переписать.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Пока вариантов нет, потом можно к этому вернуться.

another-guy and others added 10 commits February 25, 2019 15:39
@another-guy @styopaiv
Update content/docs/reconciliation.md
96b8f09 
Co-Authored-By: astralpunch <[email protected]>
@another-guy @styopaiv
Update content/docs/reconciliation.md
097044c 
Co-Authored-By: astralpunch <[email protected]>
@another-guy @styopaiv
Update content/docs/reconciliation.md
6f1af5d 
Co-Authored-By: astralpunch <[email protected]>
@another-guy @styopaiv
Update content/docs/reconciliation.md
9b8e818 
Co-Authored-By: astralpunch <[email protected]>
@another-guy @styopaiv
Update content/docs/reconciliation.md
dac2f10 
Co-Authored-By: astralpunch <[email protected]>
@another-guy @styopaiv
Update content/docs/reconciliation.md
49c1ce8 
Co-Authored-By: astralpunch <[email protected]>
@another-guy @styopaiv
Update content/docs/reconciliation.md
73e9128 
Co-Authored-By: astralpunch <[email protected]>
@another-guy @styopaiv
Update content/docs/reconciliation.md
ec6239f 
Co-Authored-By: astralpunch <[email protected]>
@another-guy @styopaiv
Update content/docs/reconciliation.md
585900e 
Co-Authored-By: astralpunch <[email protected]>
@another-guy @styopaiv
Update content/docs/reconciliation.md
97d5154 
Co-Authored-By: astralpunch <[email protected]>
@netlify
Copy link

netlify bot commented Feb 25, 2019

Deploy preview for ru-reactjs ready!

Built with commit 96b8f09

https://deploy-preview-139--ru-reactjs.netlify.com

@netlify
Copy link

netlify bot commented Feb 25, 2019

Deploy preview for ru-reactjs ready!

Built with commit 585900e

https://deploy-preview-139--ru-reactjs.netlify.com

@netlify
Copy link

netlify bot commented Feb 25, 2019 •
edited
Loading

Deploy preview for ru-reactjs ready!

Built with commit 079c74e

https://deploy-preview-139--ru-reactjs.netlify.com

@another-guy
Copy link
Collaborator

@astralpunch исправь, пожалуйста, merge conflict. Спасибо за внесение изменений.

@lex111 lex111 merged commit bc72c29 into reactjs:master Feb 27, 2019
@lex111
Copy link
Member

lex111 commented Feb 27, 2019

Спасибо @astralpunch, а также @ntishkevich и @another-guy за ревью!

@lex111 lex111 removed the work in progress Author opened the pull-request but it's still being worked on label Feb 27, 2019
@lex111 lex111 added the needs proofread A read-through is still needed to release the document label Feb 27, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lex111 lex111 lex111 approved these changes

@ntishkevich ntishkevich ntishkevich left review comments

@another-guy another-guy another-guy approved these changes

Assignees
No one assigned
Labels
needs proofread A read-through is still needed to release the document
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@styopaiv @another-guy @lex111 @ntishkevich