Skip to content

Conversation

@javascript-translate-bot
Copy link

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

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

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.

hrodward and others added 30 commits October 24, 2019 11:02
Grammar suggestions
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.
arr.values() is supported by majority of browsers. So, maybe we need to change the exception in article.

https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/values
':' character is indicating 'var2' is a key of object.
Removed extra "and" in a sentence
Grammar suggestions
Grammar suggestions
variable user is using for both string and object type different values. these situation is called "ninja code" bu author :)

"Add a new variable only when absolutely necessary.
Instead, reuse existing names. Just write new values into them."
https://javascript.info/ninja-code
We need to put 'null' to end of linked list. otherwise wen we want to get last item in the linked list, it will be undefined. And this situation inconsistent with object literal definition of linked list above.
Update article.md
removes russian text chunk from english text
Removed extra "and" in a sentence
correction for code template consistency
function() { return count++; } is running because it is a function declaration. It is running and result of this running a function has been created and sent as a parameter to return command. "return count++;" this part is not running because the function has not been called yet.
@CLAassistant
Copy link

CLAassistant commented Nov 4, 2019

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.
2 out of 11 committers have signed the CLA.

✅ Violet-Bora-Lee
✅ iliakan
❌ hrodward
❌ TomSssM
❌ lumosmind
❌ ogaclejapan
❌ yogain123
❌ iArazar
❌ lex111
❌ richardzhanghub
❌ TobiObeck
You have signed the CLA already but the status is still pending? Let us recheck it.

@HachemiH HachemiH self-assigned this Nov 4, 2019
@HachemiH HachemiH merged commit 5d1666d into master Nov 4, 2019
@HachemiH HachemiH deleted the sync-ec21af8a branch November 29, 2019 17:52
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.