A Translators Guide to Git

classic Classic list List threaded Threaded
14 messages Options
Reply | Threaded
Open this post in threaded view
|

A Translators Guide to Git

Nick Hall
Translators,

I have started to write a translators guide to git:

https://gramps-project.org/wiki/index.php/A_Translators_Guide_to_Git

I have tried to keep it as simple as possible.  Does it make sense?

Do I need to add anything else?

Regards,


Nick.




_______________________________________________
Gramps-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/gramps-devel
Reply | Threaded
Open this post in threaded view
|

Re: A Translators Guide to Git

Christian Aigner
Hi Nick!

That is a great idea! Thanks!

I read it through and find it very helpful.


Maybe you should make it clear to the reader that the first part (Basic
Workflow) is only for users who have write access to the gramps repository.

For all others the second part (Creating a pull request) is relevant.


I found one thing I want to point out:

under
Obtain a copy of the repository

cd gramps (lower case g)

Otherwise it is concise and clear.

Thanks,
Christian



Am 04.01.19 um 14:56 schrieb Nick Hall:
> Translators,
>
> I have started to write a translators guide to git:
>
> https://gramps-project.org/wiki/index.php/A_Translators_Guide_to_Git
>
> I have tried to keep it as simple as possible.  Does it make sense?
>
> Do I need to add anything else?


_______________________________________________
Gramps-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/gramps-devel
Reply | Threaded
Open this post in threaded view
|

Re: A Translators Guide to Git

GRAMPS - Dev mailing list
In reply to this post by Nick Hall
Is there a mechanism/step for registering as the lead Translator for a language or coordinating with the lead (for code and manual)?

There are unharmonized lists of translation contributors on the wiki. And there was a recent posting from a translator left off the About Box contributors.

On Fri, Jan 4, 2019 at 7:57, Nick Hall
Translators,

I have started to write a translators guide to git:


I have tried to keep it as simple as possible.  Does it make sense?

Do I need to add anything else?

Regards,


Nick.




_______________________________________________
Gramps-devel mailing list


_______________________________________________
Gramps-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/gramps-devel
Reply | Threaded
Open this post in threaded view
|

Re: A Translators Guide to Git

Christian Aigner
In reply to this post by Nick Hall
One thing is missing, and in my case it is always the one thing I
mananged to get wrong:

When creating a Pull Request (PR) I forgot to select the correct base
branch.




Am 04.01.19 um 14:56 schrieb Nick Hall:

> Translators,
>
> I have started to write a translators guide to git:
>
> https://gramps-project.org/wiki/index.php/A_Translators_Guide_to_Git
>
> I have tried to keep it as simple as possible.  Does it make sense?
>
> Do I need to add anything else?
>
> Regards,
>
>
> Nick.
>
>
>
>
> _______________________________________________
> Gramps-devel mailing list
> [hidden email]
> https://lists.sourceforge.net/lists/listinfo/gramps-devel



_______________________________________________
Gramps-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/gramps-devel
Reply | Threaded
Open this post in threaded view
|

Re: A Translators Guide to Git

Nick Hall
In reply to this post by Christian Aigner
On 04/01/2019 14:35, Christian Aigner wrote:
> I found one thing I want to point out:
>
> under
> Obtain a copy of the repository
>
> cd gramps (lower case g)

I specified the destination directory as "Gramps" in the clone
statement.  The default would have been "gramps" as you point out.

Nick.




_______________________________________________
Gramps-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/gramps-devel
Reply | Threaded
Open this post in threaded view
|

Re: A Translators Guide to Git

Nick Hall
In reply to this post by Christian Aigner
On 04/01/2019 15:00, Christian Aigner wrote:
> One thing is missing, and in my case it is always the one thing I
> mananged to get wrong:
>
> When creating a Pull Request (PR) I forgot to select the correct base
> branch.

Thanks.  I have updated the wiki page.

Nick.




_______________________________________________
Gramps-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/gramps-devel
Reply | Threaded
Open this post in threaded view
|

Re: A Translators Guide to Git

Nick Hall
In reply to this post by GRAMPS - Dev mailing list
On 04/01/2019 14:47, [hidden email] wrote:
Is there a mechanism/step for registering as the lead Translator for a language or coordinating with the lead (for code and manual)?

There are unharmonized lists of translation contributors on the wiki. And there was a recent posting from a translator left off the About Box contributors.

Good question.  I have been trying to compile a list of active lead translators on the Team page:

https://gramps-project.org/wiki/index.php/Team#Translators

There is also a list on the Translators Portal, but it looks out of date:

https://gramps-project.org/wiki/index.php/Portal:Translators

Do you know of anywhere else?

If someone contributes a translation for a language without a lead translator, then I will usually ask them if they want to volunteer for the job.  Anyone can also post to lthe mailing list to apply for the role.

The lead translator will then co-ordinate contributions for their language.

Regards,


Nick.




_______________________________________________
Gramps-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/gramps-devel
Reply | Threaded
Open this post in threaded view
|

Re: A Translators Guide to Git

GRAMPS - Dev mailing list
The message sent last week contained a 1st pass search of translation related documentation.

But it would be good if the 1st step in your guide would be to check that they're not duplicating work already in progress.


On Fri, Jan 4, 2019 at 10:17, Nick Hall
On 04/01/2019 14:47, [hidden email] wrote:
Is there a mechanism/step for registering as the lead Translator for a language or coordinating with the lead (for code and manual)?

There are unharmonized lists of translation contributors on the wiki. And there was a recent posting from a translator left off the About Box contributors.

Good question.  I have been trying to compile a list of active lead translators on the Team page:

https://gramps-project.org/wiki/index.php/Team#Translators

There is also a list on the Translators Portal, but it looks out of date:

https://gramps-project.org/wiki/index.php/Portal:Translators

Do you know of anywhere else?

If someone contributes a translation for a language without a lead translator, then I will usually ask them if they want to volunteer for the job.  Anyone can also post to lthe mailing list to apply for the role.

The lead translator will then co-ordinate contributions for their language.

Regards,


Nick.




_______________________________________________
Gramps-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/gramps-devel
Reply | Threaded
Open this post in threaded view
|

Re: A Translators Guide to Git

P. Ekholm
In reply to this post by Nick Hall
Den 2019-01-04 kl. 17:16, skrev Nick Hall:
On 04/01/2019 14:47, [hidden email] wrote:
Is there a mechanism/step for registering as the lead Translator for a language or coordinating with the lead (for code and manual)?

There are unharmonized lists of translation contributors on the wiki. And there was a recent posting from a translator left off the About Box contributors.

Good question.  I have been trying to compile a list of active lead translators on the Team page:

https://gramps-project.org/wiki/index.php/Team#Translators

There is also a list on the Translators Portal, but it looks out of date:

https://gramps-project.org/wiki/index.php/Portal:Translators

Do you know of anywhere else?

If someone contributes a translation for a language without a lead translator, then I will usually ask them if they want to volunteer for the job.  Anyone can also post to lthe mailing list to apply for the role.

The lead translator will then co-ordinate contributions for their language.

Regards,


Nick.




_______________________________________________
Gramps-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/gramps-devel

Hi, this is very good, I've followed everything. But I have a question: you say "Look for anything unusual such as merge commits", before pushing translation updates, what is that mean? After opening gitk, in the commit history of maintenance/gramps50, on upstream Gramps-project, there is my faulty merge commits, is it possible for you to delete them? Or can I just ignore them. And still push my update?

Regards Pär



_______________________________________________
Gramps-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/gramps-devel
Reply | Threaded
Open this post in threaded view
|

Re: A Translators Guide to Git

Christian Aigner
In reply to this post by Nick Hall
I stand corrected. You are right. :-)


Am 04.01.19 um 16:26 schrieb Nick Hall:

>
> I specified the destination directory as "Gramps" in the clone
> statement.  The default would have been "gramps" as you point out.
>
> Nick.
>
>
>
>
> _______________________________________________
> Gramps-devel mailing list
> [hidden email]
> https://lists.sourceforge.net/lists/listinfo/gramps-devel


_______________________________________________
Gramps-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/gramps-devel
Reply | Threaded
Open this post in threaded view
|

Re: A Translators Guide to Git

Nick Hall
In reply to this post by P. Ekholm
On 04/01/2019 16:34, P. Ekholm wrote:
>
> Hi, this is very good, I've followed everything. But I have a
> question: you say "Look for anything unusual such as merge commits",
> before pushing translation updates, what is that mean? After opening
> gitk, in the commit history of maintenance/gramps50, on upstream
> Gramps-project, there is my faulty merge commits, is it possible for
> you to delete them? Or can I just ignore them. And still push my update?
>
Once you push changes to the repository they are permanent.  We could
remove the merge commits, but this would involve re-writing the git
history, which we don't normally want to do.  This is why it is
important to check what you are pushing.

When a PR is submitted it gives the developers a chance to check it first.

Nick.




_______________________________________________
Gramps-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/gramps-devel
Reply | Threaded
Open this post in threaded view
|

Re: A Translators Guide to Git

Brylie Christopher Oxley
It might also be good to protect certain branches, like gramps50, to ensure there is a review process before changes get merged:

https://help.github.com/articles/about-protected-branches/


On January 4, 2019 8:40:31 PM GMT+02:00, Nick Hall <[hidden email]> wrote:
On 04/01/2019 16:34, P. Ekholm wrote:
>
Hi, this is very good, I've followed everything. But I have a
question: you say "Look for anything unusual such as merge commits",
before pushing translation updates, what is that mean? After opening
gitk, in the commit history of maintenance/gramps50, on upstream
Gramps-project, there is my faulty merge commits, is it possible for
you to delete them? Or can I just ignore them. And still push my update?

Once you push changes to the repository they are permanent.  We could
remove the merge commits, but this would involve re-writing the git
history, which we don't normally want to do.  This is why it is
important to check what you are pushing.

When a PR is submitted it gives the developers a chance to check it first.

Nick.
Gramps-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/gramps-devel

--
Sent from my Android device with K-9 Mail. Please excuse my brevity.

_______________________________________________
Gramps-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/gramps-devel
Reply | Threaded
Open this post in threaded view
|

Re: A Translators Guide to Git

P. Ekholm
In reply to this post by Nick Hall
Thanks for helping with this guide. Now I can push clean updates. It is
working now. Big thanks!

Pär

Den 2019-01-04 kl. 19:40, skrev Nick Hall:

> On 04/01/2019 16:34, P. Ekholm wrote:
>>
>> Hi, this is very good, I've followed everything. But I have a
>> question: you say "Look for anything unusual such as merge commits",
>> before pushing translation updates, what is that mean? After opening
>> gitk, in the commit history of maintenance/gramps50, on upstream
>> Gramps-project, there is my faulty merge commits, is it possible for
>> you to delete them? Or can I just ignore them. And still push my update?
>>
> Once you push changes to the repository they are permanent.  We could
> remove the merge commits, but this would involve re-writing the git
> history, which we don't normally want to do.  This is why it is
> important to check what you are pushing.
>
> When a PR is submitted it gives the developers a chance to check it
> first.
>
> Nick.
>
>
>
>
> _______________________________________________
> Gramps-devel mailing list
> [hidden email]
> https://lists.sourceforge.net/lists/listinfo/gramps-devel




_______________________________________________
Gramps-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/gramps-devel
Reply | Threaded
Open this post in threaded view
|

Re: A Translators Guide to Git

Nick Hall
In reply to this post by Brylie Christopher Oxley
On 04/01/2019 18:47, Brylie Christopher Oxley wrote:
> It might also be good to protect certain branches, like gramps50, to
> ensure there is a review process before changes get merged:
>
> https://help.github.com/articles/about-protected-branches/
>
The master and maintenance branches are already protected which prevents
them being deleted or force pushed.

We don't really have the resources to require reviews and when I enabled
required status checks there were complaints.

Nick.




_______________________________________________
Gramps-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/gramps-devel