Skip to content
Snippets Groups Projects
Commit 9b830cd5 authored by Hefee's avatar Hefee
Browse files

more README :D

parent a6700731
No related branches found
No related tags found
No related merge requests found
### Installing
* copy mergetool to a locaton `<pathto>`
* Add this to your .git/config or ~/.gitconfig:
[merge "po-merge"]
name = Gettext merge driver
driver = <patho> %O %A %B
Add this to .gitattributes in some dir:
*.po merge=po-merge
*.pot merge=po-merge
### Testing
run: ipython3 -i runtests.py
In [18]: runTest("translated-remote")
Using custom PO merge driver (local; /tmp/merge-po.JIyZ)
0
0
In [19]: runTest("translated-local-and-remote")
Using custom PO merge driver (local; /tmp/merge-po.lZsH)
0
0
In [22]: runTest("confict")
Using custom PO merge driver (local; /tmp/merge-po.7FoH)
Conflict(s) detected
between /tmp/merge-po.7FoH.local and /tmp/merge-po.7FoH.remote
1
--- /tmp/tmp5cbetvbs/local 2018-03-22 16:40:55.000000000 +0100
+++ tests/confict/merged 2018-03-22 16:40:51.954196950 +0100
@@ -27,9 +27,9 @@
"> **amnesia**, *noun*:<br/>\n"
"> forgetfulness; loss of long-term memory.\n"
msgstr ""
-"#-#-#-#-# merge-po.7FoH.local-only (Tails) #-#-#-#-#\n"
+"#-#-#-#-# merge-po.PE9w.local-only (Tails) #-#-#-#-#\n"
"> Je ne sais pas \n"
-"#-#-#-#-# merge-po.7FoH.remote-only (Tails) #-#-#-#-#\n"
+"#-#-#-#-# merge-po.PE9w.remote-only (Tails) #-#-#-#-#\n"
"Un deuxième traduction."
#. type: Plain text
1
### Documentation
I didn't have written the different po merge tools. I found them at the internet :D
https://stackoverflow.com/questions/16214067/wheres-the-3-way-git-merge-driver-for-po-gettext-files
https://github.com/mezis/git-whistles/blob/master/libexec/git-merge-po.sh
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment