emelie/tidy-html5
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'next' into snapshot_fixes

Browse source
This commit is contained in:
Jim Derry 2017-10-25 20:03:17 -04:00
parent fc3cba86a8 504d2b3466
commit a1a58ec1bd
10 changed files with 45 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
localize/translations/language_en_gb.po
View file

@ -5,7 +5,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=n != 1;\n" "Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: HTML Tidy poconvert.rb\n" "X-Generator: HTML Tidy poconvert.rb\n"
"Project-Id-Version: \n" "Project-Id-Version: \n"
"PO-Revision-Date: 2017-10-10 08:20:36\n" "PO-Revision-Date: 2017-10-20 08:58:05\n"
"Last-Translator: jderry\n" "Last-Translator: jderry\n"
"Language-Team: \n" "Language-Team: \n"
@ -1141,8 +1141,8 @@ msgstr ""
#. be translated. #. be translated.
msgctxt "TidyQuiet" msgctxt "TidyQuiet"
msgid "" msgid ""
"This option specifies if Tidy should output the summary of the numbers " "When enabled, this option limits Tidy's non-document output to report "
"of errors and warnings, or the welcome or informational messages. " "only document warnings and errors. "
msgstr "" msgstr ""
#. Important notes for translators: #. Important notes for translators:

6
localize/translations/language_es.po
View file

@ -5,7 +5,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=n != 1;\n" "Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: HTML Tidy poconvert.rb\n" "X-Generator: HTML Tidy poconvert.rb\n"
"Project-Id-Version: \n" "Project-Id-Version: \n"
"PO-Revision-Date: 2017-10-10 08:20:36\n" "PO-Revision-Date: 2017-10-20 08:58:05\n"
"Last-Translator: jderry\n" "Last-Translator: jderry\n"
"Language-Team: \n" "Language-Team: \n"
@ -1107,8 +1107,8 @@ msgstr ""
#. be translated. #. be translated.
msgctxt "TidyQuiet" msgctxt "TidyQuiet"
msgid "" msgid ""
"This option specifies if Tidy should output the summary of the numbers " "When enabled, this option limits Tidy's non-document output to report "
"of errors and warnings, or the welcome or informational messages. " "only document warnings and errors. "
msgstr "" msgstr ""
#. Important notes for translators: #. Important notes for translators:

6
localize/translations/language_es_mx.po
View file

@ -5,7 +5,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=n != 1;\n" "Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: HTML Tidy poconvert.rb\n" "X-Generator: HTML Tidy poconvert.rb\n"
"Project-Id-Version: \n" "Project-Id-Version: \n"
"PO-Revision-Date: 2017-10-10 08:20:36\n" "PO-Revision-Date: 2017-10-20 08:58:05\n"
"Last-Translator: jderry\n" "Last-Translator: jderry\n"
"Language-Team: \n" "Language-Team: \n"
@ -1102,8 +1102,8 @@ msgstr ""
#. be translated. #. be translated.
msgctxt "TidyQuiet" msgctxt "TidyQuiet"
msgid "" msgid ""
"This option specifies if Tidy should output the summary of the numbers " "When enabled, this option limits Tidy's non-document output to report "
"of errors and warnings, or the welcome or informational messages. " "only document warnings and errors. "
msgstr "" msgstr ""
#. Important notes for translators: #. Important notes for translators:

6
localize/translations/language_fr.po
View file

@ -5,7 +5,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n"
"X-Generator: HTML Tidy poconvert.rb\n" "X-Generator: HTML Tidy poconvert.rb\n"
"Project-Id-Version: \n" "Project-Id-Version: \n"
"PO-Revision-Date: 2017-10-10 08:20:36\n" "PO-Revision-Date: 2017-10-20 08:58:05\n"
"Last-Translator: jderry\n" "Last-Translator: jderry\n"
"Language-Team: \n" "Language-Team: \n"
@ -1312,8 +1312,8 @@ msgstr ""
#. be translated. #. be translated.
msgctxt "TidyQuiet" msgctxt "TidyQuiet"
msgid "" msgid ""
"This option specifies if Tidy should output the summary of the numbers " "When enabled, this option limits Tidy's non-document output to report "
"of errors and warnings, or the welcome or informational messages. " "only document warnings and errors. "
msgstr "" msgstr ""
"Cette option précise si Tidy doit afficher le résumé du nombre des erreurs et avertissements, ou " "Cette option précise si Tidy doit afficher le résumé du nombre des erreurs et avertissements, ou "
"les messages de bienvenue et d'information." "les messages de bienvenue et d'information."

6
localize/translations/language_pt_br.po
View file

@ -5,7 +5,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n"
"X-Generator: HTML Tidy poconvert.rb\n" "X-Generator: HTML Tidy poconvert.rb\n"
"Project-Id-Version: \n" "Project-Id-Version: \n"
"PO-Revision-Date: 2017-10-10 08:20:36\n" "PO-Revision-Date: 2017-10-20 08:58:05\n"
"Last-Translator: jderry\n" "Last-Translator: jderry\n"
"Language-Team: \n" "Language-Team: \n"
@ -1362,8 +1362,8 @@ msgstr ""
#. be translated. #. be translated.
msgctxt "TidyQuiet" msgctxt "TidyQuiet"
msgid "" msgid ""
"This option specifies if Tidy should output the summary of the numbers " "When enabled, this option limits Tidy's non-document output to report "
"of errors and warnings, or the welcome or informational messages. " "only document warnings and errors. "
msgstr "" msgstr ""
"Essa opção especifica se o Tidy deve emitir o resumo dos números de erros e " "Essa opção especifica se o Tidy deve emitir o resumo dos números de erros e "
"avisos, ou as mensagens de boas-vidas ou informacionais. " "avisos, ou as mensagens de boas-vidas ou informacionais. "

6
localize/translations/language_zh_cn.po
View file

@ -5,7 +5,7 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n" "Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: HTML Tidy poconvert.rb\n" "X-Generator: HTML Tidy poconvert.rb\n"
"Project-Id-Version: \n" "Project-Id-Version: \n"
"PO-Revision-Date: 2017-10-10 08:20:36\n" "PO-Revision-Date: 2017-10-20 08:58:05\n"
"Last-Translator: jderry\n" "Last-Translator: jderry\n"
"Language-Team: \n" "Language-Team: \n"
@ -1102,8 +1102,8 @@ msgstr ""
#. be translated. #. be translated.
msgctxt "TidyQuiet" msgctxt "TidyQuiet"
msgid "" msgid ""
"This option specifies if Tidy should output the summary of the numbers " "When enabled, this option limits Tidy's non-document output to report "
"of errors and warnings, or the welcome or informational messages. " "only document warnings and errors. "
msgstr "" msgstr ""
#. Important notes for translators: #. Important notes for translators:

6
localize/translations/tidy.pot
View file

@ -5,7 +5,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=n != 1;\n" "Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: HTML Tidy poconvert.rb\n" "X-Generator: HTML Tidy poconvert.rb\n"
"Project-Id-Version: \n" "Project-Id-Version: \n"
"POT-Creation-Date: 2017-10-10 08:20:36\n" "POT-Creation-Date: 2017-10-20 08:58:05\n"
"Last-Translator: jderry\n" "Last-Translator: jderry\n"
"Language-Team: \n" "Language-Team: \n"
@ -1102,8 +1102,8 @@ msgstr ""
#. be translated. #. be translated.
msgctxt "TidyQuiet" msgctxt "TidyQuiet"
msgid "" msgid ""
"This option specifies if Tidy should output the summary of the numbers " "When enabled, this option limits Tidy's non-document output to report "
"of errors and warnings, or the welcome or informational messages. " "only document warnings and errors. "
msgstr "" msgstr ""
#. Important notes for translators: #. Important notes for translators:

4
src/language_en.h
View file

@ -1043,8 +1043,8 @@ static languageDefinition language_en = { whichPluralForm_en, {
- The strings "Tidy" and "HTML Tidy" are the program name and must not - The strings "Tidy" and "HTML Tidy" are the program name and must not
be translated. */ be translated. */
TidyQuiet, 0, TidyQuiet, 0,
"This option specifies if Tidy should output the summary of the numbers " "When enabled, this option limits Tidy's non-document output to report "
"of errors and warnings, or the welcome or informational messages. " "only document warnings and errors. "
}, },
{/* Important notes for translators: {/* Important notes for translators:
- Use only <code></code>, <var></var>, <em></em>, <strong></strong>, and - Use only <code></code>, <var></var>, <em></em>, <strong></strong>, and

58
src/message.c
View file

@ -161,53 +161,35 @@ static void messageOut( TidyMessageImpl *message )
{ {
go = go & ( doc->errors < cfg(doc, TidyShowErrors) ); go = go & ( doc->errors < cfg(doc, TidyShowErrors) );
} }
/* Check for conditions to suppress TidyInfo. */
if ( message->level == TidyInfo )
{
go = go & (cfgBool(doc, TidyShowInfo) == yes);
/* Temporary; we currently let TidyQuiet hide these: */ /* Let TidyQuiet silence a lot of things. */
switch ( message->code ) if ( cfgBool( doc, TidyQuiet ) == yes )
{ {
case STRING_DOCTYPE_GIVEN: go = go && message->code != STRING_DOCTYPE_GIVEN;
case STRING_CONTENT_LOOKS: go = go && message->code != STRING_CONTENT_LOOKS;
case STRING_NO_SYSID: go = go && message->code != STRING_NO_SYSID;
go = go && !cfgBool(doc, TidyQuiet); go = go && message->level != TidyDialogueInfo;
break; go = go && message->level != TidyConfig;
default: go = go && message->level != TidyInfo;
break; go = go && !(message->level >= TidyDialogueSummary &&
} message->code != STRING_NEEDS_INTERVENTION);
} }
/* Suppress TidyWarning on Reports if applicable. */ /* Let !TidyShowInfo silence some things. */
if ( message->level == TidyWarning ) if ( cfgBool( doc, TidyShowInfo ) == no )
{ {
go = go & (cfgBool(doc, TidyShowWarnings) == yes); go = go && message->level != TidyInfo;
}
/* Check for conditions to suppress TidyDialogueInfo */
if ( message->level == TidyDialogueInfo )
{
/* Temporary; TidyShowInfo shouldn't affect TidyDialogueInfo, but /* Temporary; TidyShowInfo shouldn't affect TidyDialogueInfo, but
right now such messages are hidden until we granularize the right now such messages are hidden until we granularize the
output controls. */ output controls. */
go = go & (cfgBool(doc, TidyShowInfo) == yes); go = go && message->level != TidyDialogueInfo;
go = go | (cfgBool(doc, TidyQuiet) == yes);
} }
/* Check for conditions to suppress TidyDialogueSummary */ /* Let !TidyShowWarnings silence some things. */
/* Temporary; TidyQuiet shouldn't hide this type of message. */ if ( cfgBool( doc, TidyShowWarnings ) == no )
if ( message->level == TidyDialogueSummary && message->code != STRING_NEEDS_INTERVENTION )
{ {
go = go & !cfgBool(doc, TidyQuiet); go = go && message->level != TidyWarning;
}
/* If we're TidyQuiet and handling any type of dialogue above summaries,
then suppress. */
if ( message->level > TidyDialogueSummary )
{
go = go & !cfgBool(doc, TidyQuiet);
} }
/* Output the message if applicable. */ /* Output the message if applicable. */

4
version.txt
View file

@ -1,2 +1,2 @@
5.5.70 5.5.71
2017.10.20 2017.10.25