From 929575afb4256af7a254da364fe5aad25d7b7b3e Mon Sep 17 00:00:00 2001 From: Jim Derry Date: Mon, 20 Mar 2017 12:20:51 -0400 Subject: [PATCH] Picklist enums should all start at zero for external LibTidy user compatibility. Restore the new custom-tags enum to this state, and add separate string keys. Updated PO's to reflect; no change to headers. --- include/tidyenum.h | 12 +++++++++--- localize/translations/language_en_gb.po | 10 +++++----- localize/translations/language_es.po | 10 +++++----- localize/translations/language_es_mx.po | 10 +++++----- localize/translations/language_fr.po | 10 +++++----- localize/translations/language_zh_cn.po | 10 +++++----- localize/translations/tidy.pot | 10 +++++----- src/language_en.h | 8 ++++---- src/message.c | 17 ++++++++++++++++- 9 files changed, 59 insertions(+), 38 deletions(-) diff --git a/include/tidyenum.h b/include/tidyenum.h index 7304c2e..c5569b7 100644 --- a/include/tidyenum.h +++ b/include/tidyenum.h @@ -199,11 +199,12 @@ typedef enum /** Integer values used by ParseUseCustomTags. These are used throughout * LibTidy to indicate the how Tidy treats custom tags, and also have - * associated localized strings to describe them. + * associated localized strings to describe them in tidyMessagesMisc in + * the form MEMBER_STRING, e.g., TIDYCUSTOMBLOCKLEVEL_STRING */ typedef enum { - TidyCustomNo = 300, + TidyCustomNo, TidyCustomBlocklevel, TidyCustomEmpty, TidyCustomInline, @@ -983,7 +984,12 @@ typedef enum FN(STRING_HTML_PROPRIETARY) /* `HTML Proprietary`/ */ \ FN(STRING_MISSING_MALFORMED) /* For `missing or malformed argument for option: %s`. */ \ FN(STRING_NO_SYSID) /* `No system identifier in emitted doctype`. */ \ - FN(STRING_UNKNOWN_OPTION) /* For retrieving a string `unknown option: %s`. */ + FN(STRING_UNKNOWN_OPTION) /* For retrieving a string `unknown option: %s`. */ \ + FN(TIDYCUSTOMNO_STRING) \ + FN(TIDYCUSTOMBLOCKLEVEL_STRING) \ + FN(TIDYCUSTOMEMPTY_STRING) \ + FN(TIDYCUSTOMINLINE_STRING) \ + FN(TIDYCUSTOMPRE_STRING) \ /* accessibility module contributions */ #define FOREACH_MSG_ACCESS(FN) \ diff --git a/localize/translations/language_en_gb.po b/localize/translations/language_en_gb.po index ee38a86..d74f50c 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-03-19 13:23:38\n" +"PO-Revision-Date: 2017-03-20 12:20:02\n" "Last-Translator: jderry\n" "Language-Team: \n" @@ -677,19 +677,19 @@ msgctxt "CUSTOM_TAG_DETECTED" msgid "detected autonomous custom tag %s; will treat as %s" msgstr "" -msgctxt "TidyCustomBlocklevel" +msgctxt "TIDYCUSTOMBLOCKLEVEL_STRING" msgid "block level" msgstr "" -msgctxt "TidyCustomEmpty" +msgctxt "TIDYCUSTOMEMPTY_STRING" msgid "empty" msgstr "" -msgctxt "TidyCustomInline" +msgctxt "TIDYCUSTOMINLINE_STRING" msgid "inline" msgstr "" -msgctxt "TidyCustomPre" +msgctxt "TIDYCUSTOMPRE_STRING" msgid "pre" msgstr "" diff --git a/localize/translations/language_es.po b/localize/translations/language_es.po index d512d79..0b6097e 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-03-19 13:23:38\n" +"PO-Revision-Date: 2017-03-20 12:20:02\n" "Last-Translator: jderry\n" "Language-Team: \n" @@ -673,19 +673,19 @@ msgctxt "CUSTOM_TAG_DETECTED" msgid "detected autonomous custom tag %s; will treat as %s" msgstr "" -msgctxt "TidyCustomBlocklevel" +msgctxt "TIDYCUSTOMBLOCKLEVEL_STRING" msgid "block level" msgstr "" -msgctxt "TidyCustomEmpty" +msgctxt "TIDYCUSTOMEMPTY_STRING" msgid "empty" msgstr "" -msgctxt "TidyCustomInline" +msgctxt "TIDYCUSTOMINLINE_STRING" msgid "inline" msgstr "" -msgctxt "TidyCustomPre" +msgctxt "TIDYCUSTOMPRE_STRING" msgid "pre" msgstr "" diff --git a/localize/translations/language_es_mx.po b/localize/translations/language_es_mx.po index 1373d0f..dba206c 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-03-19 13:23:38\n" +"PO-Revision-Date: 2017-03-20 12:20:02\n" "Last-Translator: jderry\n" "Language-Team: \n" @@ -673,19 +673,19 @@ msgctxt "CUSTOM_TAG_DETECTED" msgid "detected autonomous custom tag %s; will treat as %s" msgstr "" -msgctxt "TidyCustomBlocklevel" +msgctxt "TIDYCUSTOMBLOCKLEVEL_STRING" msgid "block level" msgstr "" -msgctxt "TidyCustomEmpty" +msgctxt "TIDYCUSTOMEMPTY_STRING" msgid "empty" msgstr "" -msgctxt "TidyCustomInline" +msgctxt "TIDYCUSTOMINLINE_STRING" msgid "inline" msgstr "" -msgctxt "TidyCustomPre" +msgctxt "TIDYCUSTOMPRE_STRING" msgid "pre" msgstr "" diff --git a/localize/translations/language_fr.po b/localize/translations/language_fr.po index d7079b7..3273d32 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-03-19 13:23:38\n" +"PO-Revision-Date: 2017-03-20 12:20:02\n" "Last-Translator: jderry\n" "Language-Team: \n" @@ -810,19 +810,19 @@ msgctxt "CUSTOM_TAG_DETECTED" msgid "detected autonomous custom tag %s; will treat as %s" msgstr "" -msgctxt "TidyCustomBlocklevel" +msgctxt "TIDYCUSTOMBLOCKLEVEL_STRING" msgid "block level" msgstr "" -msgctxt "TidyCustomEmpty" +msgctxt "TIDYCUSTOMEMPTY_STRING" msgid "empty" msgstr "" -msgctxt "TidyCustomInline" +msgctxt "TIDYCUSTOMINLINE_STRING" msgid "inline" msgstr "" -msgctxt "TidyCustomPre" +msgctxt "TIDYCUSTOMPRE_STRING" msgid "pre" msgstr "" diff --git a/localize/translations/language_zh_cn.po b/localize/translations/language_zh_cn.po index 0a97447..0f51e72 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-03-19 13:23:38\n" +"PO-Revision-Date: 2017-03-20 12:20:02\n" "Last-Translator: jderry\n" "Language-Team: \n" @@ -667,19 +667,19 @@ msgctxt "CUSTOM_TAG_DETECTED" msgid "detected autonomous custom tag %s; will treat as %s" msgstr "" -msgctxt "TidyCustomBlocklevel" +msgctxt "TIDYCUSTOMBLOCKLEVEL_STRING" msgid "block level" msgstr "" -msgctxt "TidyCustomEmpty" +msgctxt "TIDYCUSTOMEMPTY_STRING" msgid "empty" msgstr "" -msgctxt "TidyCustomInline" +msgctxt "TIDYCUSTOMINLINE_STRING" msgid "inline" msgstr "" -msgctxt "TidyCustomPre" +msgctxt "TIDYCUSTOMPRE_STRING" msgid "pre" msgstr "" diff --git a/localize/translations/tidy.pot b/localize/translations/tidy.pot index 0a29b58..7409904 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-03-19 13:23:38\n" +"POT-Creation-Date: 2017-03-20 12:20:02\n" "Last-Translator: jderry\n" "Language-Team: \n" @@ -669,19 +669,19 @@ msgctxt "CUSTOM_TAG_DETECTED" msgid "detected autonomous custom tag %s; will treat as %s" msgstr "" -msgctxt "TidyCustomBlocklevel" +msgctxt "TIDYCUSTOMBLOCKLEVEL_STRING" msgid "block level" msgstr "" -msgctxt "TidyCustomEmpty" +msgctxt "TIDYCUSTOMEMPTY_STRING" msgid "empty" msgstr "" -msgctxt "TidyCustomInline" +msgctxt "TIDYCUSTOMINLINE_STRING" msgid "inline" msgstr "" -msgctxt "TidyCustomPre" +msgctxt "TIDYCUSTOMPRE_STRING" msgid "pre" msgstr "" diff --git a/src/language_en.h b/src/language_en.h index 50239d9..d9e2a97 100644 --- a/src/language_en.h +++ b/src/language_en.h @@ -386,10 +386,10 @@ static languageDefinition language_en = { whichPluralForm_en, { { TRIM_EMPTY_ELEMENT, 0, "trimming empty %s" }, /* Notice */ { REPLACING_ELEMENT, 0, "replacing %s with %s" }, /* Notice */ { CUSTOM_TAG_DETECTED, 0, "detected autonomous custom tag %s; will treat as %s" }, /* Notice */ - { TidyCustomBlocklevel, 0, "block level" }, - { TidyCustomEmpty, 0, "empty" }, - { TidyCustomInline, 0, "inline" }, - { TidyCustomPre, 0, "pre" }, + { TIDYCUSTOMBLOCKLEVEL_STRING, 0, "block level" }, + { TIDYCUSTOMEMPTY_STRING, 0, "empty" }, + { TIDYCUSTOMINLINE_STRING, 0, "inline" }, + { TIDYCUSTOMPRE_STRING, 0, "pre" }, /* ReportError */ { COERCE_TO_ENDTAG, 0, "<%s> is probably intended as " }, /* Error */ diff --git a/src/message.c b/src/message.c index 0ce2d54..5c562ba 100755 --- a/src/message.c +++ b/src/message.c @@ -230,7 +230,22 @@ void TY_(ReportNotice)(TidyDocImpl* doc, Node *element, Node *node, uint code) case CUSTOM_TAG_DETECTED: TagToString(element, elemdesc, sizeof(elemdesc)); - tagtype = tidyLocalizedString( cfg( doc, TidyUseCustomTags ) ); + + switch ( cfg( doc, TidyUseCustomTags ) ) + { + case TidyCustomBlocklevel: + tagtype = tidyLocalizedString( TIDYCUSTOMBLOCKLEVEL_STRING ); + break; + case TidyCustomEmpty: + tagtype = tidyLocalizedString( TIDYCUSTOMEMPTY_STRING ); + break; + case TidyCustomInline: + tagtype = tidyLocalizedString( TIDYCUSTOMINLINE_STRING ); + break; + case TidyCustomPre: + tagtype = tidyLocalizedString( TIDYCUSTOMPRE_STRING ); + break; + } message = TY_(tidyMessageCreateWithNode)(doc, element, code, TidyInfo, elemdesc, tagtype ); break; }