Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Sync with upstream @ 2b5ac971 #2

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
zaicevas merged 61 commits into master from sync-2b5ac971
Nov 11, 2019
Merged

Sync with upstream @ 2b5ac971 #2

zaicevas merged 61 commits into master from sync-2b5ac971
Nov 11, 2019

Conversation

@javascript-translate-bot
Copy link

@javascript-translate-bot javascript-translate-bot commented Nov 11, 2019

This PR was automatically generated to merge changes from en.javascript.info at 2b5ac97

Conflicted files in this PR have labels ">>>..." with both sides of conflict. If you merge this PR, you'll need to examine the listed files and resolve conflicts.

Alternatively, you can close this PR and merge conflicting changes manually.

The following files have conflicts and may need updates of the translations:

To merge changes manually (instead of merging this PR):

  1. Add remote upstream that links to the English version (only needs to be done once)
    • git add remote upstream https://github.com/javascript-tutorial/en.javascript.info
  2. Commit all current work locally and git checkout master
  3. Pull the recent changes from the English version:
    • git pull upstream master
  4. Deal with the conflicts. If a conflict touches a few lines, then just fix it. Otherwise, following commands can help:
    • Checkout your (translated) version of a file/folder at the given path (removes all upstream changes):
      • git checkout --ours <path>
    • See the diff, what changed in the upstream file since branches diverged:
      • git diff --word-diff master...upstream/master <path> (please note: three dots in the command)
    • Then you can examine the changes in upstream and add them manually
  5. When conflicts resolved, commit them and git push origin master

This PR will be closed and replaced with a new one in a few days.

paroche and others added 30 commits November 3, 2019 22:19
Array.from: 'copies there all items' -> 'copies all items to it'
re-edit: on tables lead-in.
Adding some mention of implicit `<tbody>` element. Comes up later in Modifying the Document task #10 solution.
Putting `<tbody>` in backticks. Wasn't showing.
Grammar suggestions
Grammar suggestions
Grammar suggestions
trivial: indefinite to definite article
Grammar suggestions
historically and in general use this phenomena is called as "syntactic sugar". I think we can change it for understand-ability and engineering convention.
https://www.computerhope.com/jargon/s/syntactic-sugar.htm 
Grammar suggestions
"computed property" term can make us recall "dynamically computed property" like fullname. And it can create misunderstanding.
get fullname(){
 return this.name+ ' ' + this.surname;
}
"The property name is not placed into User.prototype. Instead, it is created by new before calling the constructor, it’s a property of the object itself."
you are talking about some features of "class properties" but the example code doesn't show these features. I changed the example code to show that defining property out of the constructor method is different from defining method in class structure.
example code must be executable because, it has dependent on another example code above. So it can't work in plunker container.
there is an example code but it doesn't prove anything. But it was created to show that :
"That actually does the same as assigning it as a property directly:"
example code must be unexecutable
"syntactic sugar" instead of "syntax sugar"
This PR just includes grammar and formatting suggestions.
'forbids to apply' -> 'forbids applying'
'sideway' -> 'side way'
iliakan and others added 25 commits November 6, 2019 21:33
"computed property name" instead of "computed property"
not proved features of class properties
Grammatical changes to description of `offsetParent`. Adding 'the' before 'browser', removing commas. Changing "satisfies the following conditions" to "satisfies **one of** the following conditions", which I **think** is what is meant.
Further changes to `offsetParent` description.
`offsetParent` criteria list -- minor formatting change to previous change (added spaces).
`null` if that's `offsetParent` -> `null` for `offsetParent`
"CSS width is useless at all." -> "CSS width is useless."
Could have also said "CSS width is of no use at all."
"starts to bug..." -> "becomes buggy..."
I am not aware of "bug" being used as a verb in IT, but if it is, this is the first time I recall seeing it, so I would say it's probably not common.
Anyway, using it as a verb kind of bugged me a little.
'from bottom scroll' -> 'to bottom scroll'
"how to..." -> "how do we..."
"find out" -> "find"
And an added "the": "**the** `<html>` tag".
'"pro" and "contra" -> 'pros and cons'.
'pros and cons' is a much more typical way of saying it. But "pro" and "contra" is interesting. I hadn't previously thought about what "cons" stood for, though now it seems obvious.
Also, punctuation change.
'work with event' -> 'work with events'
"but strongly" -> "but is strongly". "is strongly not recommended" is still a bit odd, though it's readable and totally understandable. Could maybe be changed to "but is strongly discouraged". Still, not bad as (now) is.
Copy link

CLAassistant commented Nov 11, 2019
edited
Loading

CLA assistant check
Thank you for your submission, we really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
1 out of 9 committers have signed the CLA.

✅ iliakan
❌ paroche
❌ petrem
❌ lumosmind
❌ hrodward
❌ wgolledge
❌ lex111
❌ embok345
❌ dashaezhova
You have signed the CLA already but the status is still pending? Let us recheck it.

@zaicevas zaicevas merged commit f518b9c into master Nov 11, 2019
www-learn-en pushed a commit that referenced this pull request Jun 15, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

AltStyle によって変換されたページ (->オリジナル) /