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

Adds translation to Slovenian #384

Merged
merged 9 commits into from
Feb 27, 2025

Conversation

bzwitt
Copy link

@bzwitt bzwitt commented Sep 18, 2024

Merge master into develop (CLI)

Purpose

Adding slovenian translation (sl.po)

Context

How to test this PR

...

@matsduf matsduf changed the base branch from master to develop November 6, 2024 13:24
@matsduf matsduf changed the title Merge pull request #380 from zonemaster/master Adds translation to Slovenian Nov 6, 2024
@matsduf matsduf added this to the v2024.2 milestone Nov 13, 2024
@matsduf matsduf added A-Translation Area: Documentation of, implementation of or actual translation of text V-Patch Versioning: The change gives an update of patch in version. labels Nov 25, 2024
@matsduf
Copy link
Contributor

matsduf commented Nov 25, 2024

@bzwitt, since your translation work there has been some changes. Could you update your PO file? Please start with "develop" branch and then insert your PO file and run an update. See Instructions for translators (in develop branch) or Instructions for translators (proposed update).

@bzwitt
Copy link
Author

bzwitt commented Nov 26, 2024

I have checked PO files for zonemaster-backend, zonemaster-cli, zonemaster-engine and haven't found any new tag to translate.

@matsduf
Copy link
Contributor

matsduf commented Nov 26, 2024

@bzwitt,

Can you first verify that you have origin pointing at zonemaster https://github.com/zonemaster/zonemaster-cli.git

git remote -v

Then do the following steps in you clone to move your branch on top of current develop branch:

git fetch --all
git checkout translation-update
git rebase origin/develop
cd share
./update-po sl.po 

Now you have an updated sl.po with some new msgids. Please see Instructions for translators (in develop branch). If you have further questions and want to take them via email you will find my email address with my profile.

@matsduf matsduf modified the milestones: v2024.2, v2024.2.1 Dec 3, 2024
@matsduf matsduf changed the base branch from develop to release-v2024.2.1 December 17, 2024 09:21
@matsduf matsduf changed the base branch from release-v2024.2.1 to develop December 17, 2024 09:30
@matsduf matsduf changed the base branch from develop to release-v2024.2.1 December 17, 2024 09:39
@tgreenx tgreenx removed the V-Patch Versioning: The change gives an update of patch in version. label Feb 24, 2025
@matsduf
Copy link
Contributor

matsduf commented Feb 26, 2025

@bzwitt, when we were about to merge this PR we saw that there are some lines that should be there, probably from some diff, example

<<<<<<< HEAD
"POT-Creation-Date: 2024-12-05 10:33+0100\n"
"PO-Revision-Date: 2024-12-10 10:18+0100\n"
=======
"POT-Creation-Date: 2023-05-22 07:23+0200\n"
"PO-Revision-Date: 2024-09-18 08:58+0200\n"
>>>>>>> 4e87c6bce6a6fd1129a4b5fde987568d1088556e

Could you update the PR so that it is correct?

Copy link
Contributor

@tgreenx tgreenx left a comment

Choose a reason for hiding this comment

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

Thank you for the updates @bzwitt ! I see some remaining issues, they should be quick to take care of:

  • First, running ../../zonemaster-engine/util/check-msg-args sl.po from the zonemaster-cli/share directory shows missing message arguments in translated strings. Could you update those three lines accordingly ? See output below.
# sl.po line 15
msgid "Warning: setting locale category LC_MESSAGES to {locale} failed -- is it installed on this system?\n\n"
msgstr "Opozorilo: Neuspešno nastavljanje jezika %s za LC_MESSAGES(Je jezik nameščen na sistemu?).\n\n"
  Only in msgid: {locale}

# sl.po line 25
msgid "Warning: setting locale category LC_CTYPE to {locale} failed -- is it installed on this system?\n\n"
msgstr "Opozorilo: Neuspešno nastavljanje jezika %s za LC_CTYPE (Je jezik nameščen na sistemu?).\n\n"
  Only in msgid: {locale}

# sl.po line 101
msgid "Failed to recognize stop level '{level}'."
msgstr "Ni mogoče prepoznati stopnjo resnosti, ki povzroči ustavitev '"
  Only in msgid: {level}
  • Second, could you inspect every line with the fuzzy tag and then remove the tag if the translation is correct?
  • Third, could you remove all lines beginning with #~ at the end of the file? i.e. starting with line 181.
  • Fourth, could you run make POFILES=sl.po tidy-po from the zonemaster-cli/share directory?

And push a commit after doing these steps. We should be good after that !

Copy link
Contributor

@tgreenx tgreenx left a comment

Choose a reason for hiding this comment

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

@bzwitt I've added a final commit containing the remaining fixes (see 246a0f6), we should be good to go now. Thanks again for this!

@tgreenx tgreenx requested a review from matsduf February 26, 2025 15:21
@matsduf matsduf merged commit 006498e into zonemaster:release-v2024.2.1 Feb 27, 2025
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-Translation Area: Documentation of, implementation of or actual translation of text
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants