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

Fixed tomb listing failure message: localization friendly #512

Merged
merged 4 commits into from
May 6, 2024

Conversation

nerun
Copy link
Contributor

@nerun nerun commented Jan 26, 2024

Resubmission of PR #506: it had conflicts that I didn't know how to resolve, so I did it again.

1. Tomb Listing issue

When listing tombs with tomb list, if there are no tombs open, this failure message is shown:

Line 2668:

_failure "I can't see any ::1 status:: tomb, may they all rest in peace." ${1:-open} }

The problem is that the ::1 status:: is always open. So the message shown will be always:

I can't see any open tomb, may they all rest in peace.

But the word open cannot be translated because it is a variable. In other languages, it sounds bad.

The phrase I can't see any open tomb, may they all rest in peace. is used twice along tomb script, in lines 2832 (index_tombs) and 2946 (search_tombs). So we can safely adopt this phrase also for list_tombs in line 2668.

2. Update POT and translation PO files

About this, @jaromil said:

shouldn't we change the .pot file then and update some translations? perhaps this can be done inside this PR

Yes, you're right! I will update the POT. This also raises other questions though.

As I explained in extras / translations / README ALL .po files are outdated (except pt_BR-2.10.po). They are for Tomb 2.3 not 2.10+. I created that tomb-2.10.pot for this reason in a very old PR already merged if you remember, but the old tomb.pot (for v2.3) was not deleted. I think we should delete that one too, and rename the tomb-2.10.pot to just tomb.pot. Will be a good idea to update the translation PO files with the new version, so translators can choose to update what is needed:

$ git rm tomb.pot
$ git rm tomb-2.10.pot
$ perl generate_translatable_strings.pl > tomb.pot
$ git add tomb.pot
$ git rm pt_BR.po
$ git mv pt_BR-2.10.po pt_BR.po
$ msgmerge --update de.po tomb.pot
$ msgmerge --update es.po tomb.pot
$ msgmerge --update fr.po tomb.pot
$ msgmerge --update it.po tomb.pot
$ msgmerge --update pt_BR.po tomb.pot
$ msgmerge --update ru.po tomb.pot
$ msgmerge --update sv.po tomb.pot
$ msgmerge --update zh_Hans.po tomb.pot
$ git add *po

@nerun nerun force-pushed the listing-tombs-fail-msg branch from 21f80ee to 1b06ab9 Compare January 28, 2024 14:29
@jaromil
Copy link
Member

jaromil commented May 6, 2024

cheers!!

@jaromil jaromil merged commit ddb2de6 into dyne:master May 6, 2024
2 of 4 checks passed
@nerun nerun deleted the listing-tombs-fail-msg branch May 6, 2024 13:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants