Sync with upstream @ 5b195795#40
Closed
javascript-translate-bot wants to merge 1483 commits intomasterfrom
Closed
Conversation
Grammar suggestions
Update article.md
Grammar suggestions
Update article.md
Update article.md
Update task.md
Update article.md
Grammar suggestions
fix typo
Wouldn't this solution be more flexible?
Update article.md
Update solution.md
Update article.md
Grammar suggestions
Grammar suggestions
Some of string outputs are represented with quotes but some of not, there is a inconsistency.
splice method's minimum parameter is 'start' and it is number type. In this tutorial 'str' stands for string parameters.
Update article.md
Update article.md
string outputs without quotes
Update article.md
'str' inside of 'start'
For consistency with definition of "arr.filter(fn)" , we need to add 'fn' parameter to definition of arr.find().
Adding missed semicolon in function expression example.
Grammar and phrasing changes to first paragraph. Not 100% sure didn't change meaning so am leaving it for review.
Grammar and phrasing changes to first paragraph. Wasn't 100% sure didn't change meaning and was going to leave it for review, but it seems I already committed it somehow when I was trying to make revisions, so hope it's right.
Fix small typo in comment
Add a missing word
Update article.md
consistent error output comments
Added clarification
Adding 'object' after 'Property descriptor' -- even though it is said not far above that the 'property descriptor' returned by `Object.getOwnPropertyDescriptor` is an object, I think it wouldn't hurt to discretely include that info here (though of course it's also implied by the usage in the examples). Especially if someone is quickly scanning the article looking for `Object.defineProperty` and didn't just read the part above.
Update solution.md
Update article.md
Update article.md
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR was automatically generated to merge changes from en.javascript.info at 5b19579
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:
Click to open a list of 206 files
To merge changes manually (instead of merging this PR):
git add remote upstream https://github.com/javascript-tutorial/en.javascript.infogit checkout mastergit pull upstream mastergit checkout --ours <path>git diff --word-diff master...upstream/master <path>(please note: three dots in the command)git push origin masterPlease ignore changes in README.md (git checkout --ours README.md && git commit -m ignore README.md).
This PR will be closed and replaced with a new one in a few days.