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

- Fixes dotse/zonemaster-engine#275 #311

Merged
merged 4 commits into from Dec 7, 2017

Conversation

Projects
None yet
3 participants
@vlevigneron
Contributor

vlevigneron commented Sep 12, 2017

  • First test with "develop" branch.
  • Needs translation for RECURSIVITY_UNDEF in swedish

@matsduf matsduf added this to the 2017.4 milestone Sep 27, 2017

@sandoche2k

This comment has been minimized.

Contributor

sandoche2k commented Nov 11, 2017

@matsduf or @mattias-p can you check with the Swedish translation and approve the PR

@@ -141,7 +141,7 @@ sub translation {
'QUERY_DROPPED' => 'Nameserver {ns}/{address} dropped AAAA query.',
'IS_A_RECURSOR' => 'Nameserver {ns}/{address} is a recursor.',
'NO_RECURSOR' => 'None of the following nameservers is a recursor : {names}.',
'RECURSIVITY_UNDEF' => 'Can not determine nameservers recursivity.',
'RECURSIVITY_UNDEF' => 'Can not determine recursivity of the following nameservers : {names}.',

This comment has been minimized.

@matsduf

matsduf Nov 13, 2017

Contributor

I do not think that the language is good. I suggest:

"Cannot determine if the following servers are recursive nameservers or not: {names}."

This comment has been minimized.

@vlevigneron
@@ -305,7 +305,9 @@ sub nameserver01 {
if ( not grep { $_->tag eq q{IS_A_RECURSOR} } @results and not grep { $_->tag eq q{NO_RECURSOR} } @results ) {
push @results,
info(
RECURSIVITY_UNDEF => {}
RECURSIVITY_UNDEF => {
names => join( q{,}, sort keys %nsnames ),

This comment has been minimized.

@matsduf

matsduf Nov 13, 2017

Contributor

In other instances the variable contains a name-IP pair instead of just a name. In this case, is it possible to include both name and IP?

This comment has been minimized.

@vlevigneron
share/sv.po Outdated
@@ -654,7 +654,7 @@ msgid "None of the following nameservers is a recursor : {names}."
msgstr "Ingen av följande namnservrar är en rekursiv resolver: {names}."
#: NAMESERVER:RECURSIVITY_UNDEF
msgid "Can not determine nameservers recursivity."
msgid "None of the following nameservers is a recursor : {names}."

This comment has been minimized.

@matsduf

matsduf Nov 13, 2017

Contributor

The msgid must be the same for all "po" files.

This comment has been minimized.

@vlevigneron
@sandoche2k

This comment has been minimized.

Contributor

sandoche2k commented Nov 22, 2017

@vlevigneron do you approve the review made by @matsduf and if so, thanks for updating the PR.

@vlevigneron

This comment has been minimized.

Contributor

vlevigneron commented Nov 25, 2017

@matsduf OK for me, you can merge this PR.

vlevigneron added some commits Sep 12, 2017

@matsduf

This comment has been minimized.

Contributor

matsduf commented Dec 7, 2017

@vlevigneron, will you update this PR to meet my comments?

@vlevigneron

This comment has been minimized.

Contributor

vlevigneron commented Dec 7, 2017

@matsduf last commit should meet your requirements. Is it OK for you ?

@matsduf

This comment has been minimized.

Contributor

matsduf commented Dec 7, 2017

@vlevigneron, I suggest Cannot determine if the following servers are recursive nameservers or not: {names} instead of Can not determine recursivity of the following nameservers : {names} I think that is easier to understand. What do you think?

All po files must have the same msgid and the same as the message that we finalize on (above).

@vlevigneron

This comment has been minimized.

Contributor

vlevigneron commented Dec 7, 2017

Message modified. Please check swedish translation.

@matsduf

matsduf approved these changes Dec 7, 2017

@vlevigneron vlevigneron merged commit 52d73cf into zonemaster:develop Dec 7, 2017

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment