On Sat, Feb 17, 2018 at 11:14 PM, Zoom.Quiet <zoom.qu...@gmail.com> wrote:
> 2 years ago: Re: How to collaborate using Leo
> https://groups.google.com/d/msg/leo-editor/Mr1cAfi8BLs/Q2PlDxsrBwAJ
> discuss about Leonard(Leo user) and Nancy(not Leo user) how to work together,
> the result is :
> @clean be upgraded, and support perfect auto merge from Nancy fixed
> resource files.
>
> but for the doc. translate project:
> work in doc/LeoDocs.leo is the necessarily, because:
>
> 0: the target for translate doc. of Leo , just for Chinese Nancy start love
> Leo
> 1: so contributor base LeoDocs.leo is the only right start
>
> BUT collaborate in github, there is always 2 ways:
> 0: like svn, usage github as one kinds of collaborate Repo., member
> with Repo. ACL;
> 1: base DVCS , usage Fork->Pull-Request flow;
>
> in the doc. translate project, the contributor in different level,
> will produce different result:
> 0: member of Repo. with write ACL, can push LeoDocs.leo, and usage
> Rst3 export new translate results;
> 1: contributor from fork Repo., if P-R LeoDocs.leo, the member can
> not decide accept or not base diff from .leo, because mix so many XML
> info.
>
> SO my question is :
> how to make different roles in doc. translate project all in effective
> edit action?
>
> in my mind:
> 0: member of Project, work in self .leo such as LeoDocs_ZQ.leo, push
> new .rst and .leo into Repo., because we all Leonard
> 1: contributor from fork Repo., work with .rst files,P-R only include
> .rst diff info., because can not requirement Nancy immediately became
> Leonard
>
> BUT there is some problems:
> 0: members .leo can not auto merge by git? or How to auto merge others
> member's new translated into self .leo?
> 1: new translate work result if merge succeed by git from
> Pull-Request, how to make Member's .leo accept them?
>
> for now , i only think out one way:
> - change the nodes in doc/LeoDocs.leo @rst --> @clean
> - so whatever Nancy/Leonard's translate result will auto exchange with .rst
> - in the same time, every member can keep self outlines in .leo
>
after test, i confirm:
- change @rst -> @clean, will lost so many rST need support by Leo
- and @rst really can not auto merge changed from out files
and, if base same .leo collaborate, member's contributor will make
Merge conflict by git:
Traceback (most recent call last):
File "/opt/bin/Leo-5.4/leo/core/leoFileCommands.py", line 1251,
in parse_leo_file
parser.parse(theFile) # expat does not support parseString
File
"/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/xml/sax/expatreader.py",
line 110, in parse
xmlreader.IncrementalParser.parse(self, source)
File
"/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/xml/sax/xmlreader.py",
line 123, in parse
self.feed(buffer)
File
"/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/xml/sax/expatreader.py",
line 217, in feed
self._err_handler.fatalError(exc)
File
"/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/xml/sax/handler.py",
line 38, in fatalError
raise exception
SAXParseException: <unknown>:2288:1: not well-formed (invalid token)
read outline in 0.08 seconds
so what is the effective collaborate with .leo for translate LeoDocs ?
> and is there better collaborate ways for doc. translate project?
>
>
> On Thu, Feb 1, 2018 at 10:28 PM, OMlalala <omlalala0...@gmail.com> wrote:
>> Overview
>>
>> Hi, I use Leo from one month ago, very enjoy ;-)
>> and I want to make chinese version Doc for spread the perfect Leo, any
>> advices?
>>
> ...
>
> leo-editor-cn
> https://github.com/DebugUself/leo-editor-cn
>
>
> --
> life is pathetic, go Pythonic! 人生苦短, Python当歌!
> 俺: http://zoomquiet.io
> 授: http://creativecommons.org/licenses/by-sa/2.5/cn/
> 怒: 冗余不做,日子甭过!备份不做,十恶不赦!
> KM keep growing environment culture which promoting organization learning!
--
life is pathetic, go Pythonic! 人生苦短, Python当歌!
俺: http://zoomquiet.io
授: http://creativecommons.org/licenses/by-sa/2.5/cn/
怒: 冗余不做,日子甭过!备份不做,十恶不赦!
KM keep growing environment culture which promoting organization learning!
--
You received this message because you are subscribed to the Google Groups
"leo-editor" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to leo-editor+unsubscr...@googlegroups.com.
To post to this group, send email to leo-editor@googlegroups.com.
Visit this group at https://groups.google.com/group/leo-editor.
For more options, visit https://groups.google.com/d/optout.
