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

Fix for --sourceaddr bad behaviour #110

Merged

Conversation

vlevigneron
Copy link
Contributor

@vlevigneron vlevigneron commented Jul 20, 2019

fixes #38
danish and swedish translation missing

@vlevigneron vlevigneron requested review from matsduf and mattias-p July 20, 2019 21:55
Copy link
Contributor

@matsduf matsduf left a comment

Choose a reason for hiding this comment

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

In sv.po add:

msgid "Address '"
msgstr "IP-adress '"

msgid "' cannot be used as source address for DNS queries."
msgstr "' kan inte användas som källadress för DNS-frågor."

In da.po just copy the English version as placeholder.

Copy link
Member

@mattias-p mattias-p left a comment

Choose a reason for hiding this comment

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

The code looks nice, but it would be great if you could take another look at dependencies, translatable strings and indentation. I've provided comments.

lib/Zonemaster/CLI.pm Outdated Show resolved Hide resolved
@@ -21,6 +21,7 @@ build_requires( 'Test::More' => 0, );
requires(
'JSON::XS' => 0,
'Locale::TextDomain' => 1.23,
'Net::Interface' => 0,
Copy link
Member

Choose a reason for hiding this comment

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

I can't find a binary package for this on CentOS. Have you checked for alternatives?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@mattias-p I only found Net::Interface that can handle with IPv4 and IPv6. IO::Interface for example does not work with IPv6. Any advices for an alternate library ?

Copy link
Contributor

Choose a reason for hiding this comment

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

According to https://rt.cpan.org/Public/Bug/Display.html?id=124582, me should add this somewhere in travis.yml
mkdir /usr/include/sys/; ln -s /usr/include/bits/socket.h /usr/include/sys/socket.h to prevent the fail on Travis.

Copy link
Member

Choose a reason for hiding this comment

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

@vlevigneron Thanks for the clarification regarding the choice of library. And no, I don't have any alternatives up my sleeve.

lib/Zonemaster/CLI.pm Outdated Show resolved Hide resolved
@matsduf
Copy link
Contributor

matsduf commented Oct 2, 2019

@vlevigneron, what is the milestone of this PR? v2019.2 or v2019.3?

@matsduf matsduf added this to the v2019.3 milestone Oct 31, 2019
@matsduf matsduf modified the milestones: v2019.3, v2020.1 Nov 20, 2019
@matsduf matsduf modified the milestones: v2020.1, v2020.2 Sep 14, 2020
@matsduf matsduf added the P-High Priority: Issue to be solved before other label Nov 12, 2020
matsduf
matsduf previously approved these changes Jan 12, 2021
@mattias-p
Copy link
Member

Should the installation instruction be updated with the new dependency in this PR as well, or do we do that as part of installation testing?

@vlevigneron
Copy link
Contributor Author

@mattias-p Good point. I guess that it is usually done during packaging process, can anyone confirm ? If this is not the case, it can be modified in this PR.
@Matts I finally fixed the issue I had with Travis, it has passed all the checks. Please approve again.

@matsduf
Copy link
Contributor

matsduf commented Jan 12, 2021

@mattias-p Good point. I guess that it is usually done during packaging process, can anyone confirm ? If this is not the case, it can be modified in this PR.

If possible it should be done now. For FreeBSD it is p5-Net-Interface to be installed. CentOS has already CPAN dependencies so I guess it is OK to add it there. Fore Debian/Ubuntu we should have binary package.

@Matts I finally fixed the issue I had with Travis, it has passed all the checks. Please approve again.

Wrong "(a)Matts". I will review again.

@Matts
Copy link

Matts commented Jan 12, 2021

You are not the first, and most certainly will not be the last that accidentally mentions me :P

My own fault for having a common name lmao. Besides, it is interesting to have a look at what other people are up to

@matsduf
Copy link
Contributor

matsduf commented Jan 12, 2021

You are not the first, and most certainly will not be the last that accidentally mentions me :P

My own fault for having a common name lmao. Besides, it is interesting to have a look at what other people are up to

@Matts, you were early to get a short user name. :-) You are welcome to Zonemaster!

matsduf
matsduf previously approved these changes Jan 12, 2021
Copy link
Member

@mattias-p mattias-p left a comment

Choose a reason for hiding this comment

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

Everything looks good to me, except two problems I should have spotted earlier. Sorry about that.

share/da.po Outdated
Comment on lines 134 to 137
#, perl-brace-format
msgid "Address {address} cannot be used as source address for DNS queries.\n"
msgstr "Address {address} cannot be used as source address for DNS queries.\n"

Copy link
Member

Choose a reason for hiding this comment

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

I'm sorry I didn't spot this earlier, but I don't think this should be included. It only makes it difficult for the Danish translators to notice that there is something new for them to translate.

share/nb.po Outdated
Comment on lines 170 to 173
#, perl-brace-format
msgid "Address {address} cannot be used as source address for DNS queries.\n"
msgstr "Address {address} cannot be used as source address for DNS queries.\n"

Copy link
Member

Choose a reason for hiding this comment

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

This should also be excluded for the same reason.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@matsduf As you asked for something different (but it was a long time ago), do you think that @mattias-p proposal is reasonable ?

Copy link
Contributor

Choose a reason for hiding this comment

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

That is fine. I am not sure if it should be empty or non-existent, but at least the latter will mean that msgid will shown, and then when you translate you will be prompted.

@vlevigneron vlevigneron merged commit beae6f0 into zonemaster:develop Jan 12, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
P-High Priority: Issue to be solved before other
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants