Vietnamese l10n pull request problems

Vietnamese l10n pull request problems

[Jiang Xin]

Hi, all

Vnwildman, the new git l10n team leader for Vietnamese send me a huge
pull request, it has some problems I think other l10n teams should care about.

The URL for the pull request is https://github.com/git-l10n/git-po/pull/22 .

1. Commit log should has a signed-off-by line, no dought

2. Trival commits (from the same contributor, with not description in
    commit log) should be squashed or not, I am not sure.

    The comment is at:
https://github.com/git-l10n/git-po/pull/22#issuecomment-5954319

>> From Trần Ngọc Quân <vnwildman AT gmail.com>：
>>> squash
>> It isn't necessary. When you pull from my repository, it will merger automatically.
>
> If the six commits are from different people, or each commit is atomic and is
> necessary for other contributors to review it, or every commit has a well written
> commit log (with not only single subject line, Signed-off-by line, but also with
> detail description for the commit), you won't squash them.

3. l10n team leaders should not merge git upstream directly.

>> Oh dear!I hate to change history!
>
> You must clean your history for two reasons:
>
> 1. One pull request to upstream git.git was rejected by Junio, for
>     one commit from the German team hacked files outside po/
>     directory. So I changed the history of git-l10n/git-po. I am sorry
>     you are victim for this.
>
> 2. You pull from git.git, such as commit 95a3338c8dc,
>     25d0a1d66462, 0851be, ad32d7f.
>     which are not suitable for l10n team leaders.
>     Don't do that, I can not review these merge commits.

4. Fuzzy tranlations must be fixed before pull request can be accepted
    and closed.

    Comment URL: https://github.com/git-l10n/git-po/pull/22#issuecomment-5954625

>>> I also found that there were 28 fuzzy translations in your vi.po.
>>> You must fix them before I can close this pull request.
>>
>> fuzzy translations, Why it is the problem?
>
> Fuzzy means wrong, outofdate translation, I will make Vietnamese
> people puzzled. For example, orignal message is
> "Delete file, yes or NO? (default no)", but the fuzzy translation is
> "Delete file, YES or no? (default yes)". You translation will hurt others.
>
> But you can leave them untranslated. Untranslated l10n message is OK.
>
>> The last question:
>> So, I have to change my history, don't I?
>
> You have to make your history more clear, for the two reasons I just talked above.
> But for fuzzy translations, you can just make another commit and fix them.

--
Jiang Xin

Re: Vietnamese l10n pull request problems

[Junio C Hamano]

Jiang Xin <worldhello.net@gmail.com> writes:

> Vnwildman, the new git l10n team leader for Vietnamese send me a huge
> pull request, it has some problems I think other l10n teams should care about.
>
> The URL for the pull request is https://github.com/git-l10n/git-po/pull/22 .
>
> 1. Commit log should has a signed-off-by line, no dought

There doesn't seem to have any S-o-b:.  Please reject and kick this
series back to the team and ask them to redo their history.

> 2. Trival commits (from the same contributor, with not description in
>     commit log) should be squashed or not, I am not sure.

As you noted in 3., there are too many useless merges directly from
me, and after remove them, there remain only commits with useless
single line subject "Continue translation into Vietnamese." (even
for a single-line log message that is wrong; omit the final
full-stop).

I think the reason why these have the same useless subject is
because they are separate only because the translator happened to
have stopped between commits, not because each of these is logically
separate and deserves a unique message.

They should all be squashed into a single commit, after removing the 
merge in the wrong direction.

> 3. l10n team leaders should not merge git upstream directly.

Again, very true.

>>> Oh dear!I hate to change history!

That is not a valid excuse. The history leading to e4797a3bc277 will
never be in my tree, and if Jiang pulls it, the I won't be able to
pull from him either, so as far as wider upstream git is concerned,
the history did not even exist---there is no harm rebuilding a
history that never existed in the first place ;-)

Thanks.

Re: Vietnamese l10n pull request problems

[Jiang Xin]

2012/5/28 Trần Ngọc Quân <vnwildman@gmail.com>:
>> Fuzzy means wrong
> It isn't true! When complete into mo, fuzzy will be ignore. When run, it use origin string.
>> pull from git.git
> Now I will:

> -Drop my current repository

It's not necessary, just making a force push is OK. I already
clean the history, squash the commits, add the signed-off-by
line, and what I have done is pushed to branch WIP/vi/master
at:

 * https://github.com/git-l10n/git-po/commits/WIP/vi/master

You can just reset your master branch to it. See comment:

 * https://github.com/git-l10n/git-po/pull/22#issuecomment-5954600

> -Clone from git.git

You already forked a repo directly from https://github.com/git-l10n/git-po/
right? And registered it as your team's main repo, which you have already
written in the TEAMS file.

You should clone your own forked repo, which you have rights to push.

> Sorry about inconvenience!

Your translation for Vietnamese is most completed than any other languages.
Feel free to make pull request.

Indead, close pull request #22 on GitHub is unnecessary, just clean
commit history of your master branch, create new commit to fix
fuzzy translations, and the pull request will update automatically.

--
Jiang Xin

RE: Vietnamese l10n pull request problems

[Trần Ngọc Quân]

> $ git fetch https://github.com/git-l10n/git-po/ WIP/vi/master
> $ git reset --hard FETCH_HEAD
done! And also translated some tring.
Thank all of you!
Trần Ngọc Quân.

Re: Vietnamese l10n pull request problems

[Jiang Xin]

2012/5/28 Trần Ngọc Quân <vnwildman@gmail.com>:
> done! And also translated some tring.

Your commit log still not quite sane. I update the po-helper.sh script,
which can help you checking your commit log.

1. Checkout po/po-helper.sh script, using:

    $ git remote add git-l10n git://github.com/git-l10n/git-po.git
    $ git fetch git-l10n
    $ git checkout git-l10n/po-helper -- po/po-helper.sh

2. Check your commit with this helper script:

    $ po/po-helper.sh check commits 6f6731e HEAD

3. You will get the following error mesage:

    $ po/po-helper.sh check commits 6f6731e HEAD
    Error: in commit 024e5d89d764edccf76fcf480ac4b2c5d2a2f95d, subject
should not end with a punctuation.
           "Fix conflick in vnwildman/git repository."
    Error: in commit 024e5d89d764edccf76fcf480ac4b2c5d2a2f95d,
multiple lines found in subject.
    Error: in commit 17c1d44fffbb0c4454215015a85791f548900a85, subject
should not end with a punctuation.
           "Continue translate Vietnamese translation."
    Error: in commit dd58f041707cdbdefccca4282c3afaa6c7138cf2, subject
should not end with a punctuation.
           "Init translation for Vietnamese."

4. Currently, this helper script check:

    * Subject line no more than 50 characters.
    * Subject line should not end with a dot (punctuation), this waste
is unnecessary.
    * Insert a blank line between the one line subject and other descriptions.
    * Long descriptions must line wrap at 72 characters.
    * Must add a Signed-off-by line if the commit is not a merge commit.

This script does not perform grammer check, you should check by yourself.
Squash the three commit into one maybe a solution. Your commits  are:

$ git log -3
commit 024e5d89d764edccf76fcf480ac4b2c5d2a2f95d
Author: Tran Ngoc Quan <vnwildman@gmail.com>
Date:   Mon May 28 15:29:02 2012 +0700

    Fix conflick in vnwildman/git repository.
    Transtate more 6% into Vietnamese.
    Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>

commit 17c1d44fffbb0c4454215015a85791f548900a85
Author: Tran Ngoc Quan <vnwildman@gmail.com>
Date:   Fri May 25 14:32:44 2012 +0700

    Continue translate Vietnamese translation.

    Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>

commit dd58f041707cdbdefccca4282c3afaa6c7138cf2
Author: Tran Ngoc Quan <vnwildman@gmail.com>
Date:   Sun May 6 09:42:49 2012 +0700

    Init translation for Vietnamese.

    Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>


-- 
Jiang Xin