diff --git a/console/tidy.c b/console/tidy.c index 9337ee3..77dc24c 100644 --- a/console/tidy.c +++ b/console/tidy.c @@ -487,15 +487,15 @@ static Bool hasPickList( TidyOption topt ) return tidyOptGetNextPick( topt, &pos ) != NULL; } -/** Returns the configuration category name for the specified configuration +/** Returns the configuration category id for the specified configuration ** category id. This will be used as an XML class attribute value. ** @param id The TidyConfigCategory for which to lookup the category name. ** @result Returns the configuration category, such as "diagnostics". */ -static ctmbstr ConfigCategoryName( TidyConfigCategory id ) +static ctmbstr ConfigCategoryId( TidyConfigCategory id ) { if (id >= TidyDiagnostics && id <= TidyInternalCategory) - return tidyLocalizedString(id); + return tidyErrorCodeAsKey( id ); fprintf(stderr, tidyLocalizedString(TC_STRING_FATAL_ERROR), (int)id); fprintf(stderr, "\n"); @@ -538,7 +538,7 @@ static void GetOption(TidyDoc tdoc, /**< The tidy document. */ TidyOptionType optTyp = tidyOptGetType( topt ); d->name = tidyOptGetName( topt ); - d->cat = ConfigCategoryName( tidyOptGetCategory( topt ) ); + d->cat = ConfigCategoryId( tidyOptGetCategory( topt ) ); d->catid = tidyOptGetCategory( topt ); d->vals = NULL; d->def = NULL; diff --git a/include/tidyenum.h b/include/tidyenum.h index 999a20b..2208fa3 100644 --- a/include/tidyenum.h +++ b/include/tidyenum.h @@ -98,7 +98,7 @@ extern "C" { FN(TidyMarkupTeach) /**< Teach tidy new things */ \ FN(TidyMarkupXForm) /**< Transform HTML one way or another */ \ FN(TidyPrettyPrint) /**< Pretty printing options */ \ - FN(TidyInternalCategory) /**< Option is internal only. */ + FN(TidyInternalCategory) /**< Option is internal only. */ \ /** These message codes comprise every possible message that can be output by diff --git a/localize/translations/language_en_gb.po b/localize/translations/language_en_gb.po index 196d86b..c61cab8 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-03 12:44:37\n" +"PO-Revision-Date: 2017-10-05 09:29:27\n" "Last-Translator: jderry\n" "Language-Team: \n" @@ -1755,34 +1755,6 @@ msgid "" "head of the document. " msgstr "" -msgctxt "TidyUnknownCategory" -msgid "unknown category!" -msgstr "" - -msgctxt "TidyDiagnostics" -msgid "diagnostics" -msgstr "" - -msgctxt "TidyEncoding" -msgid "encoding" -msgstr "" - -msgctxt "TidyInternalCategory" -msgid "internal (private)" -msgstr "" - -msgctxt "TidyMarkup" -msgid "markup" -msgstr "" - -msgctxt "TidyMiscellaneous" -msgid "misc" -msgstr "" - -msgctxt "TidyPrettyPrint" -msgid "print" -msgstr "" - msgctxt "TidyInfo" msgid "Info: " msgstr "" diff --git a/localize/translations/language_es.po b/localize/translations/language_es.po index 444d0e7..2a00ff3 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-03 12:44:37\n" +"PO-Revision-Date: 2017-10-05 09:29:27\n" "Last-Translator: jderry\n" "Language-Team: \n" @@ -1703,34 +1703,6 @@ msgid "" "head of the document. " msgstr "" -msgctxt "TidyUnknownCategory" -msgid "unknown category!" -msgstr "" - -msgctxt "TidyDiagnostics" -msgid "diagnostics" -msgstr "" - -msgctxt "TidyEncoding" -msgid "encoding" -msgstr "" - -msgctxt "TidyInternalCategory" -msgid "internal (private)" -msgstr "" - -msgctxt "TidyMarkup" -msgid "markup" -msgstr "" - -msgctxt "TidyMiscellaneous" -msgid "misc" -msgstr "" - -msgctxt "TidyPrettyPrint" -msgid "print" -msgstr "" - msgctxt "TidyInfo" msgid "Info: " msgstr "" diff --git a/localize/translations/language_es_mx.po b/localize/translations/language_es_mx.po index d1c4bdf..6fab04d 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-03 12:44:37\n" +"PO-Revision-Date: 2017-10-05 09:29:27\n" "Last-Translator: jderry\n" "Language-Team: \n" @@ -1698,34 +1698,6 @@ msgid "" "head of the document. " msgstr "" -msgctxt "TidyUnknownCategory" -msgid "unknown category!" -msgstr "" - -msgctxt "TidyDiagnostics" -msgid "diagnostics" -msgstr "" - -msgctxt "TidyEncoding" -msgid "encoding" -msgstr "" - -msgctxt "TidyInternalCategory" -msgid "internal (private)" -msgstr "" - -msgctxt "TidyMarkup" -msgid "markup" -msgstr "" - -msgctxt "TidyMiscellaneous" -msgid "misc" -msgstr "" - -msgctxt "TidyPrettyPrint" -msgid "print" -msgstr "" - msgctxt "TidyInfo" msgid "Info: " msgstr "" diff --git a/localize/translations/language_fr.po b/localize/translations/language_fr.po index d35f7dc..f88a90e 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-03 12:44:37\n" +"PO-Revision-Date: 2017-10-05 09:29:27\n" "Last-Translator: jderry\n" "Language-Team: \n" @@ -2017,34 +2017,6 @@ msgid "" "head of the document. " msgstr "" -msgctxt "TidyUnknownCategory" -msgid "unknown category!" -msgstr "catégorie inconnue!" - -msgctxt "TidyDiagnostics" -msgid "diagnostics" -msgstr "" - -msgctxt "TidyEncoding" -msgid "encoding" -msgstr "encodage" - -msgctxt "TidyInternalCategory" -msgid "internal (private)" -msgstr "interne (privée)" - -msgctxt "TidyMarkup" -msgid "markup" -msgstr "structure de balises" - -msgctxt "TidyMiscellaneous" -msgid "misc" -msgstr "divers" - -msgctxt "TidyPrettyPrint" -msgid "print" -msgstr "affichage" - msgctxt "TidyInfo" msgid "Info: " msgstr "Info:" diff --git a/localize/translations/language_pt_br.po b/localize/translations/language_pt_br.po index 49a9080..6c8e8df 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-03 12:44:37\n" +"PO-Revision-Date: 2017-10-05 09:29:27\n" "Last-Translator: jderry\n" "Language-Team: \n" @@ -2097,34 +2097,6 @@ msgstr "" "Esta opção especifica se o Tidy deve mover todas as tags de estilo para o " "cabeçalho do documento. " -msgctxt "TidyUnknownCategory" -msgid "unknown category!" -msgstr "categoria desconhecida!" - -msgctxt "TidyDiagnostics" -msgid "diagnostics" -msgstr "diagnósticos" - -msgctxt "TidyEncoding" -msgid "encoding" -msgstr "codificação" - -msgctxt "TidyInternalCategory" -msgid "internal (private)" -msgstr "interna (privada)" - -msgctxt "TidyMarkup" -msgid "markup" -msgstr "marcação" - -msgctxt "TidyMiscellaneous" -msgid "misc" -msgstr "miscelânea" - -msgctxt "TidyPrettyPrint" -msgid "print" -msgstr "impressão" - msgctxt "TidyInfo" msgid "Info: " msgstr "" diff --git a/localize/translations/language_zh_cn.po b/localize/translations/language_zh_cn.po index 40a1d7b..a48970d 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-03 12:44:37\n" +"PO-Revision-Date: 2017-10-05 09:29:27\n" "Last-Translator: jderry\n" "Language-Team: \n" @@ -1698,34 +1698,6 @@ msgid "" "head of the document. " msgstr "" -msgctxt "TidyUnknownCategory" -msgid "unknown category!" -msgstr "" - -msgctxt "TidyDiagnostics" -msgid "diagnostics" -msgstr "" - -msgctxt "TidyEncoding" -msgid "encoding" -msgstr "" - -msgctxt "TidyInternalCategory" -msgid "internal (private)" -msgstr "" - -msgctxt "TidyMarkup" -msgid "markup" -msgstr "" - -msgctxt "TidyMiscellaneous" -msgid "misc" -msgstr "" - -msgctxt "TidyPrettyPrint" -msgid "print" -msgstr "" - msgctxt "TidyInfo" msgid "Info: " msgstr "" diff --git a/localize/translations/tidy.pot b/localize/translations/tidy.pot index 2428107..48e6008 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-03 12:44:37\n" +"POT-Creation-Date: 2017-10-05 09:29:27\n" "Last-Translator: jderry\n" "Language-Team: \n" @@ -1698,34 +1698,6 @@ msgid "" "head of the document. " msgstr "" -msgctxt "TidyUnknownCategory" -msgid "unknown category!" -msgstr "" - -msgctxt "TidyDiagnostics" -msgid "diagnostics" -msgstr "" - -msgctxt "TidyEncoding" -msgid "encoding" -msgstr "" - -msgctxt "TidyInternalCategory" -msgid "internal (private)" -msgstr "" - -msgctxt "TidyMarkup" -msgid "markup" -msgstr "" - -msgctxt "TidyMiscellaneous" -msgid "misc" -msgstr "" - -msgctxt "TidyPrettyPrint" -msgid "print" -msgstr "" - msgctxt "TidyInfo" msgid "Info: " msgstr "" diff --git a/man/tidy1.xsl.in b/man/tidy1.xsl.in index 81bdd0f..0fbae79 100644 --- a/man/tidy1.xsl.in +++ b/man/tidy1.xsl.in @@ -253,47 +253,47 @@ There were errors. .SS Document Display options - display + TidyDisplay .SS Document In and Out options - document + TidyDocumentIO .SS File Input-Output options - file + TidyFileIO .SS Diagnostics options - diagnostics + TidyDiagnostics .SS Encoding options - encoding + TidyEncoding .SS Cleanup options - cleanup + TidyMarkupCleanup .SS Entities options - entities + TidyMarkupEntities .SS Repair options - repair + TidyMarkupRepair .SS Transformation options - transform + TidyMarkupXForm .SS Teaching Tidy options - teach + TidyMarkupTeach .SS Pretty Print options - print + TidyPrettyPrint diff --git a/src/language_en.h b/src/language_en.h index 2ca2b0e..f29f39f 100644 --- a/src/language_en.h +++ b/src/language_en.h @@ -1572,25 +1572,6 @@ static languageDefinition language_en = { whichPluralForm_en, { }, - /******************************************** - ** TidyConfigCategory enumeration - ** @remark enum source TidyConfigCategory - ********************************************/ - { TidyUnknownCategory, 0, "unknown category!" }, - { TidyDiagnostics, 0, "diagnostics" }, - { TidyDisplay, 0, "display" }, - { TidyDocumentIO, 0, "document" }, - { TidyEncoding, 0, "encoding" }, - { TidyFileIO, 0, "file" }, - { TidyInternalCategory, 0, "internal (private)" }, - { TidyMarkupCleanup, 0, "cleanup" }, - { TidyMarkupEntities, 0, "entities" }, - { TidyMarkupRepair, 0, "repair" }, - { TidyMarkupTeach, 0, "teach" }, - { TidyMarkupXForm, 0, "transform" }, - { TidyPrettyPrint, 0, "print" }, - - /******************************************** ** Message Severity Level ** @remark enum source TidyConfigCategory diff --git a/src/language_fr.h b/src/language_fr.h index b8861f2..1ab25e1 100644 --- a/src/language_fr.h +++ b/src/language_fr.h @@ -1,4 +1,4 @@ -#ifndef language_fr_h +#ifndef language_fr_h #define language_fr_h /* * language_fr.h @@ -28,7 +28,7 @@ * * Orginating PO file metadata: * PO_LAST_TRANSLATOR=jderry - * PO_REVISION_DATE=2017-10-03 12:44:37 + * PO_REVISION_DATE=2017-10-05 09:29:27 */ #ifdef _MSC_VER @@ -554,10 +554,6 @@ static languageDefinition language_fr = { whichPluralForm_fr, { "Cette option précise si Tidy doit utiliser l'analyseur XML plutôt que l'analyseur de correction " "d'erreur HTML." }, - { TidyUnknownCategory, 0, "catégorie inconnue!" }, - { TidyEncoding, 0, "encodage" }, - { TidyInternalCategory, 0, "interne (privée)" }, - { TidyPrettyPrint, 0, "affichage" }, { TidyInfo, 0, "Info:" }, { TidyWarning, 0, "Avertissement:" }, { TidyConfig, 0, "Config:" }, diff --git a/src/language_pt_br.h b/src/language_pt_br.h index 3ae2e7e..efc48cf 100644 --- a/src/language_pt_br.h +++ b/src/language_pt_br.h @@ -1,4 +1,4 @@ -#ifndef language_pt_br_h +#ifndef language_pt_br_h #define language_pt_br_h /* * language_pt_br.h @@ -28,7 +28,7 @@ * * Orginating PO file metadata: * PO_LAST_TRANSLATOR=jderry - * PO_REVISION_DATE=2017-10-03 12:44:37 + * PO_REVISION_DATE=2017-10-05 09:29:27 */ #ifdef _MSC_VER @@ -646,11 +646,6 @@ static languageDefinition language_pt_br = { whichPluralForm_pt_br, { "Esta opção especifica se o Tidy deve mover todas as tags de estilo para o " "cabeçalho do documento. " }, - { TidyUnknownCategory, 0, "categoria desconhecida!" }, - { TidyDiagnostics, 0, "diagnósticos" }, - { TidyEncoding, 0, "codificação" }, - { TidyInternalCategory, 0, "interna (privada)" }, - { TidyPrettyPrint, 0, "impressão" }, { TidyWarning, 0, "Acesso: " }, { TidyAccess, 0, "Acesso: " }, { TidyError, 0, "Erro: " },