diff --git a/localize/translations/language_en_gb.po b/localize/translations/language_en_gb.po index 78f3eaf..c97b5bb 100644 --- a/localize/translations/language_en_gb.po +++ b/localize/translations/language_en_gb.po @@ -5,7 +5,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: HTML Tidy poconvert.rb\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" "Language-Team: \n" @@ -1141,8 +1141,8 @@ msgstr "" #. be translated. msgctxt "TidyQuiet" msgid "" -"This option specifies if Tidy should output the summary of the numbers " -"of errors and warnings, or the welcome or informational messages. " +"When enabled, this option limits Tidy's non-document output to report " +"only document warnings and errors. " msgstr "" #. Important notes for translators: diff --git a/localize/translations/language_es.po b/localize/translations/language_es.po index 02ab42d..44f5cc5 100644 --- a/localize/translations/language_es.po +++ b/localize/translations/language_es.po @@ -5,7 +5,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: HTML Tidy poconvert.rb\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" "Language-Team: \n" @@ -1107,8 +1107,8 @@ msgstr "" #. be translated. msgctxt "TidyQuiet" msgid "" -"This option specifies if Tidy should output the summary of the numbers " -"of errors and warnings, or the welcome or informational messages. " +"When enabled, this option limits Tidy's non-document output to report " +"only document warnings and errors. " msgstr "" #. Important notes for translators: diff --git a/localize/translations/language_es_mx.po b/localize/translations/language_es_mx.po index 309e528..592c3b2 100644 --- a/localize/translations/language_es_mx.po +++ b/localize/translations/language_es_mx.po @@ -5,7 +5,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: HTML Tidy poconvert.rb\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" "Language-Team: \n" @@ -1102,8 +1102,8 @@ msgstr "" #. be translated. msgctxt "TidyQuiet" msgid "" -"This option specifies if Tidy should output the summary of the numbers " -"of errors and warnings, or the welcome or informational messages. " +"When enabled, this option limits Tidy's non-document output to report " +"only document warnings and errors. " msgstr "" #. Important notes for translators: diff --git a/localize/translations/language_fr.po b/localize/translations/language_fr.po index c871841..50be69b 100644 --- a/localize/translations/language_fr.po +++ b/localize/translations/language_fr.po @@ -5,7 +5,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: HTML Tidy poconvert.rb\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" "Language-Team: \n" @@ -1312,8 +1312,8 @@ msgstr "" #. be translated. msgctxt "TidyQuiet" msgid "" -"This option specifies if Tidy should output the summary of the numbers " -"of errors and warnings, or the welcome or informational messages. " +"When enabled, this option limits Tidy's non-document output to report " +"only document warnings and errors. " msgstr "" "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." diff --git a/localize/translations/language_pt_br.po b/localize/translations/language_pt_br.po index 3f02fb7..ddf4bca 100644 --- a/localize/translations/language_pt_br.po +++ b/localize/translations/language_pt_br.po @@ -5,7 +5,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: HTML Tidy poconvert.rb\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" "Language-Team: \n" @@ -1362,8 +1362,8 @@ msgstr "" #. be translated. msgctxt "TidyQuiet" msgid "" -"This option specifies if Tidy should output the summary of the numbers " -"of errors and warnings, or the welcome or informational messages. " +"When enabled, this option limits Tidy's non-document output to report " +"only document warnings and errors. " msgstr "" "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. " diff --git a/localize/translations/language_zh_cn.po b/localize/translations/language_zh_cn.po index 4280129..5375aa4 100644 --- a/localize/translations/language_zh_cn.po +++ b/localize/translations/language_zh_cn.po @@ -5,7 +5,7 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: HTML Tidy poconvert.rb\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" "Language-Team: \n" @@ -1102,8 +1102,8 @@ msgstr "" #. be translated. msgctxt "TidyQuiet" msgid "" -"This option specifies if Tidy should output the summary of the numbers " -"of errors and warnings, or the welcome or informational messages. " +"When enabled, this option limits Tidy's non-document output to report " +"only document warnings and errors. " msgstr "" #. Important notes for translators: diff --git a/localize/translations/tidy.pot b/localize/translations/tidy.pot index 0cf1d0a..ae8381e 100644 --- a/localize/translations/tidy.pot +++ b/localize/translations/tidy.pot @@ -5,7 +5,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: HTML Tidy poconvert.rb\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" "Language-Team: \n" @@ -1102,8 +1102,8 @@ msgstr "" #. be translated. msgctxt "TidyQuiet" msgid "" -"This option specifies if Tidy should output the summary of the numbers " -"of errors and warnings, or the welcome or informational messages. " +"When enabled, this option limits Tidy's non-document output to report " +"only document warnings and errors. " msgstr "" #. Important notes for translators: diff --git a/src/language_en.h b/src/language_en.h index b9e3d5b..9747a58 100644 --- a/src/language_en.h +++ b/src/language_en.h @@ -1043,8 +1043,8 @@ static languageDefinition language_en = { whichPluralForm_en, { - The strings "Tidy" and "HTML Tidy" are the program name and must not be translated. */ TidyQuiet, 0, - "This option specifies if Tidy should output the summary of the numbers " - "of errors and warnings, or the welcome or informational messages. " + "When enabled, this option limits Tidy's non-document output to report " + "only document warnings and errors. " }, {/* Important notes for translators: - Use only , , , , and diff --git a/src/message.c b/src/message.c index ad9929e..c8559fd 100644 --- a/src/message.c +++ b/src/message.c @@ -161,53 +161,35 @@ static void messageOut( TidyMessageImpl *message ) { 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: */ - switch ( message->code ) - { - case STRING_DOCTYPE_GIVEN: - case STRING_CONTENT_LOOKS: - case STRING_NO_SYSID: - go = go && !cfgBool(doc, TidyQuiet); - break; - default: - break; - } + /* Let TidyQuiet silence a lot of things. */ + if ( cfgBool( doc, TidyQuiet ) == yes ) + { + go = go && message->code != STRING_DOCTYPE_GIVEN; + go = go && message->code != STRING_CONTENT_LOOKS; + go = go && message->code != STRING_NO_SYSID; + go = go && message->level != TidyDialogueInfo; + go = go && message->level != TidyConfig; + go = go && message->level != TidyInfo; + go = go && !(message->level >= TidyDialogueSummary && + message->code != STRING_NEEDS_INTERVENTION); } - /* Suppress TidyWarning on Reports if applicable. */ - if ( message->level == TidyWarning ) + /* Let !TidyShowInfo silence some things. */ + 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 - right now such messages are hidden until we granularize the - output controls. */ - go = go & (cfgBool(doc, TidyShowInfo) == yes); - go = go | (cfgBool(doc, TidyQuiet) == yes); + right now such messages are hidden until we granularize the + output controls. */ + go = go && message->level != TidyDialogueInfo; } - /* Check for conditions to suppress TidyDialogueSummary */ - /* Temporary; TidyQuiet shouldn't hide this type of message. */ - if ( message->level == TidyDialogueSummary && message->code != STRING_NEEDS_INTERVENTION ) + /* Let !TidyShowWarnings silence some things. */ + if ( cfgBool( doc, TidyShowWarnings ) == no ) { - go = go & !cfgBool(doc, TidyQuiet); - } - - /* If we're TidyQuiet and handling any type of dialogue above summaries, - then suppress. */ - if ( message->level > TidyDialogueSummary ) - { - go = go & !cfgBool(doc, TidyQuiet); + go = go && message->level != TidyWarning; } /* Output the message if applicable. */ diff --git a/version.txt b/version.txt index 6bdeaf4..6dabe23 100644 --- a/version.txt +++ b/version.txt @@ -1,2 +1,2 @@ -5.5.70 -2017.10.20 +5.5.71 +2017.10.25