docs: added rebasing and translations

parent 441e545a
Pipeline #18659395 passed with stages
in 16 minutes and 6 seconds
......@@ -26,7 +26,15 @@ tox -e autofix
Fix any of the remarks it gives, otherwise your changes will not be added to the master branch.
When you are happy, review your changes and remove any temporary files using the instructions given.
You can only commit files to the master branch if you're up to date with it's code:
```
git pull --rebase origin master
```
Follow the instructions on screen to fix merge conflicts if any.
When you are happy, review your changes and remove any temporary files using the instructions given:
```
git status
......@@ -44,7 +52,7 @@ Then commit them:
git commit -m "a short description why you changed something"
```
Then push them to the server
Then push them to the server:
```
git push
......
......@@ -22,9 +22,13 @@ This will create the language files for your languages here:
* /failmap/map/locale/'iso code'/django.po
* /failmap/map/locale/'iso code'/djangojs.po
You can edit the .po files.
And for other "django apps" like "map" accordingly.
After you're done, run:
You can edit the .po files, they will be converted to those .mo files for some reason.
After you're done editing, run:
```
failmap translate
```
Translations should then shown up on the website.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment