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.

Sign up for GitHub

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

Use libidn2 instead of libidn #254

Merged
1 commit merged into from Apr 28, 2022
Merged

Use libidn2 instead of libidn #254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ addons:
- libdevel-checklib-perl
- libfile-sharedir-perl
- libfile-slurp-perl
- libidn11-dev
- libidn2-dev
- libintl-perl
- libjson-pp-perl
- liblist-moreutils-perl
Expand Down
2 changes: 1 addition & 1 deletion lib/Zonemaster/CLI.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -669,7 +669,7 @@ sub to_idn {
return Zonemaster::LDNS::to_idn( decode( $self->encoding, $str ) );
}
else {
say STDERR __( "Warning: Zonemaster::LDNS not compiled with libidn, cannot handle non-ASCII names correctly." );
say STDERR __( "Warning: Zonemaster::LDNS not compiled with libidn2, cannot handle non-ASCII names correctly." );
Copy link
Contributor

Choose a reason for hiding this comment

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

I think the following would be better and not bound to details not relevant here.

Warning: Zonemaster::LDNS not compiled with IDN support, cannot handle names with non-ASCII characters correctly.

But I accept as-is.

Copy link
Author

Choose a reason for hiding this comment

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

Good point. I'll do the change in another PR.

return $str;
}
}
Expand Down
4 changes: 2 additions & 2 deletions share/da.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,10 +221,10 @@ msgid "%8s\t%5d entries.\n"
msgstr "%8s\t%5d beskeder.\n"

msgid ""
"Warning: Zonemaster::LDNS not compiled with libidn, cannot handle non-ASCII "
"Warning: Zonemaster::LDNS not compiled with libidn2, cannot handle non-ASCII "
"names correctly."
msgstr ""
"Advarser: Zonemaster::LDNS er ikke kompileret med libidn, kan derfor ikke "
"Advarser: Zonemaster::LDNS er ikke kompileret med libidn2, kan derfor ikke "
"benytte ikke-ASCII navne."

msgid "DEBUG"
Expand Down
4 changes: 2 additions & 2 deletions share/es.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,10 +239,10 @@ msgid "%8s\t%5d entries.\n"
msgstr "%8s\t%5d registros.\n"

msgid ""
"Warning: Zonemaster::LDNS not compiled with libidn, cannot handle non-ASCII "
"Warning: Zonemaster::LDNS not compiled with libidn2, cannot handle non-ASCII "
"names correctly."
msgstr ""
"Advertencia: Zonemaster::LDNS no fue compilado con libidn, no puede manejar "
"Advertencia: Zonemaster::LDNS no fue compilado con libidn2, no puede manejar "
"correctamente nombres no-ASCII."

msgid "DEBUG"
Expand Down
4 changes: 2 additions & 2 deletions share/fi.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,10 +237,10 @@ msgid "%8s\t%5d entries.\n"
msgstr "%8s\t%5d merkintää.\n"

msgid ""
"Warning: Zonemaster::LDNS not compiled with libidn, cannot handle non-ASCII "
"Warning: Zonemaster::LDNS not compiled with libidn2, cannot handle non-ASCII "
"names correctly."
msgstr ""
"Varoitus: Zonemaster::LDNS:n kääntämisessä ei ole käytetty libidn:iä, ei "
"Varoitus: Zonemaster::LDNS:n kääntämisessä ei ole käytetty libidn2:iä, ei "
"käsittele muussa kuin ASCII-muodossa olevia nimiä oikein."

msgid "DEBUG"
Expand Down
4 changes: 2 additions & 2 deletions share/fr.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,10 +250,10 @@ msgid "%8s\t%5d entries.\n"
msgstr "%8s\t%5d entrées.\n"

msgid ""
"Warning: Zonemaster::LDNS not compiled with libidn, cannot handle non-ASCII "
"Warning: Zonemaster::LDNS not compiled with libidn2, cannot handle non-ASCII "
"names correctly."
msgstr ""
"Attention: Zonemaster::LDNS n'est pas compilé avec libidn, impossible de "
"Attention: Zonemaster::LDNS n'est pas compilé avec libidn2, impossible de "
"traiter correctement les noms non ASCII."

msgid "DEBUG"
Expand Down
4 changes: 2 additions & 2 deletions share/nb.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,10 +224,10 @@ msgid "%8s\t%5d entries.\n"
msgstr "%8s\t%5d meldinger.\n"

msgid ""
"Warning: Zonemaster::LDNS not compiled with libidn, cannot handle non-ASCII "
"Warning: Zonemaster::LDNS not compiled with libidn2, cannot handle non-ASCII "
"names correctly."
msgstr ""
"Advarsel: Zonemaster::LDNS er ikke kompilert med libidn som gir IDNA-støtte. "
"Advarsel: Zonemaster::LDNS er ikke kompilert med libidn2 som gir IDNA-støtte. "
"Kan bare håndtere ASCII-navn."

msgid "DEBUG"
Expand Down
2 changes: 1 addition & 1 deletion share/sv.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ msgid "%8s\t%5d entries.\n"
msgstr "%8s\t%5d meddelanden.\n"

msgid ""
"Warning: Zonemaster::LDNS not compiled with libidn, cannot handle non-ASCII "
"Warning: Zonemaster::LDNS not compiled with libidn2, cannot handle non-ASCII "
"names correctly."
msgstr ""
"Varning: Zonemaster::LDNS är inte kompilerad med IDNA-stöd, så enbart ASCII-"
Expand Down