To make it easier for us to accept your patches, please follow the conventional GitHub workflow
and keep in mind that your pull requests should have **blaster** branch as both the origin and target.
and keep in mind that your pull requests should have **twisterarmy** branch as both the origin and target.
1. After forking, clone your repo:
@ -47,9 +47,9 @@ and keep in mind that your pull requests should have **blaster** branch as both
@@ -47,9 +47,9 @@ and keep in mind that your pull requests should have **blaster** branch as both
3. CREATE A NEW BRANCH, specific to the fix you're implementing:
@ -61,32 +61,28 @@ and keep in mind that your pull requests should have **blaster** branch as both
@@ -61,32 +61,28 @@ and keep in mind that your pull requests should have **blaster** branch as both
git commit -m "fix of #12345: bad foobarizer" && git push --set-upstream origin my-awesome-fix
6. Now open a pull request from branch 'YOURNICKNAME:my-awesome-fix' to 'twisterarmy:blaster' on GitHub.
6. Now open a pull request from branch 'YOURNICKNAME:my-awesome-fix' to 'twisterarmy:twisterarmy' on GitHub.
7. Once the request is accepted, switch back to 'blaster' and track changes in upstream repo:
7. Once the request is accepted, switch back to 'twisterarmy' and track changes in upstream repo:
git remote add upstream https://github.com/twisterarmy/twister-html.git # this is one-off setup
git fetch upstream && git checkout blaster
git merge upstream/blaster # you should get a fast-forward message here
git fetch upstream && git checkout twisterarmy
git merge upstream/twisterarmy # you should get a fast-forward message here
git push
8. Alternatively, make your contribution into the official project:
7. Alternatively, make your contribution into the official project:
git remote add upstream https://github.com/miguelfreitas/twister-html.git # this is one-off setup
git fetch upstream && git checkout blaster
git merge upstream/blaster # you should get a fast-forward message here
git push
https://github.com/miguelfreitas
Translations
------------
If you want to add your own translation, edit `interface_localization.js` like this:
1. Fork the repo and create a new branch from 'blaster' one:
1. Fork the repo and create a new branch from 'twisterarmy' one:
2. Add your language to the list of available choices. You should use your ISO code here,
@ -116,7 +112,7 @@ For multi-region languages, if you want to catch them all, use only the first ha
@@ -116,7 +112,7 @@ For multi-region languages, if you want to catch them all, use only the first ha
git commit -m 'Klingon translation'
git push origin Klingon-translation
6. Then open the pull request from branch 'YOURNICKNAME:Klingon-translation' to 'miguelfreitas:blaster' or 'miguelfreitas:blaster' on GitHub.
6. Then open the pull request from branch 'YOURNICKNAME:Klingon-translation' to 'twisterarmy:twisterarmy' or 'twisterarmy:twisterarmy' on GitHub.