Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

it: update translation #974

Merged
merged 12 commits into from
Jul 20, 2023
Merged

it: update translation #974

merged 12 commits into from
Jul 20, 2023

Conversation

henrythebuilder
Copy link
Contributor

Context: #537

Update the Italian translation (po/it.po) from latest source and update first three sections:

  • Summary
  • Welcome
  • Day 1: Morning

Enrico

@google-cla
Copy link

google-cla bot commented Jul 13, 2023

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

@detro
Copy link
Collaborator

detro commented Jul 15, 2023

@henrythebuilder thank you for this, it's quite long so it's going to take a while for me to go through it, so bear with me.

Meanwhile, could you please go through the CLA process? Please see https://github.com/google/comprehensive-rust/pull/974/checks?check_run_id=15059836270

@henrythebuilder
Copy link
Contributor Author

@henrythebuilder thank you for this, it's quite long so it's going to take a while for me to go through it, so bear with me.

Meanwhile, could you please go through the CLA process? Please see https://github.com/google/comprehensive-rust/pull/974/checks?check_run_id=15059836270

Thanks for response.
I did the procedure for the CLA process: 'Individual agreements' done.

@henrythebuilder
Copy link
Contributor Author

The changes seem to be many but it should be kept in mind that some have remained the same and others have only been modified in part. It should be noted that the initial refresh procedure ('Generating the PO Template' + 'Refreshing an Existing Translation') modified the initial file on which I worked.
However, if it helps, I attach the 'patch' file for the new changes compared to the original 'regenerated' (it-update-translation.patch.txt)

@mgeisler
Copy link
Collaborator

@henrythebuilder thank you for this, it's quite long so it's going to take a while for me to go through it, so bear with me.

Meanwhile, could you please go through the CLA process? Please see https://github.com/google/comprehensive-rust/pull/974/checks?check_run_id=15059836270

@detro, just in case you haven't seen it: you can review the commits one-by-one and then you get the changes are much more manageable:

image

@henrythebuilder
Copy link
Contributor Author

henrythebuilder commented Jul 17, 2023

Need help:
I got news by email that the PR integration failed -> PR run failed: Test, Attempt #2 - it: update translation (9496e96)
Errors look like this: 'msgid' and 'msgstr' entries do not both end with '\n'
The error seems easy to fix by inserting a '\n' where needed, but it must be taken into account that in the translation the subdivision of the pragraph in English (with '\n') does not always coincide with that of the translated language.
So I ask you for support on how to handle this issue.
thanks in advance

edit: I made a new commit in the 'it-translation' branch as fix attempts!

Copy link
Collaborator

@detro detro left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is excellent @henrythebuilder. Thank you so much for doing this, and thanks for partitioning your work into manageable commits, so to make the review easier.

I have mostly found a few typos and maybe one or two suggestions: should be easy to address or tweak.

In regards to the error you got:

'msgid' and 'msgstr' entries do not both end with '\n'

I admit I'm very much new to the .po format, and I leave it to @mgeisler to suggest if the workaround you put in place is the right one. But I do agree with you that it seems odd and might end up with odd formatting (i.e. line breaks where they are not needed).

Anyway, once those small issues are solved, I'd be happy to approve.

Thanks again for this.

po/it.po Outdated Show resolved Hide resolved
po/it.po Outdated Show resolved Hide resolved
po/it.po Outdated Show resolved Hide resolved
po/it.po Outdated Show resolved Hide resolved
po/it.po Outdated Show resolved Hide resolved
po/it.po Show resolved Hide resolved
@henrythebuilder
Copy link
Contributor Author

I updated the branch henrythebuilder:it-translation!

@detro detro merged commit bb6fdea into google:main Jul 20, 2023
29 checks passed
@henrythebuilder
Copy link
Contributor Author

Thanks

@henrythebuilder henrythebuilder deleted the it-translation branch July 21, 2023 05:53
@detro
Copy link
Collaborator

detro commented Jul 21, 2023

Thank You Enrico ;)

@mgeisler
Copy link
Collaborator

In regards to the error you got:

'msgid' and 'msgstr' entries do not both end with '\n'

I admit I'm very much new to the .po format, and I leave it to @mgeisler to suggest if the workaround you put in place is the right one. But I do agree with you that it seems odd and might end up with odd formatting (i.e. line breaks where they are not needed).

@henrif75 is now helping with all things related to the translations.

Here, the problem is that source text (msgid) and translation (msgstr) fields don't match in the way they use newlines. It's a very simply filter implemented with msgfmt and it doesn't actually know about the Markdown syntax used here. For us, an extra newline is mostly harmless since we split the Markdown text on \n\n+ anyway — but when translating a GUI program, it would looks very weird if "File" becomes "File\n" in the translation.

yohcop pushed a commit to yohcop/comprehensive-rust that referenced this pull request Sep 12, 2023
* Updating 'it' Translation

- MDBOOK_OUTPUT='{"xgettext": {"pot-file": "messages.pot"}}' \
    mdbook build -d po
- msgmerge --update po/it.po po/messages.pot

* it: summary

* it: welcome

* it: 'Running the Course'

* it: using cargo

* it: Day 1 - Morning

* it: Fix attempt to resolve errors for the PR integration:

PR run failed: Test, Attempt google#2 - it: update translation (9496e96):
https://github.com/google/comprehensive-rust/actions/runs/5544681099

* Minor fixes validated with @detro for PR merge (google#974)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants