rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add missing gettext triggers 

Commit d6607016c7 moved all the jsonapi.c error messages into
token_error().  This needs to be added to the various nls.mk files
that use this.  Since that makes token_error() effectively a globally
known symbol, the name seems a bit too general, so rename to
json_token_error() for more clarity.
This commit is contained in:
Peter Eisentraut 2024-05-14 12:57:22 +02:00
parent 9eb54a258f
commit 3ddbac368c
4 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backend/nls.mk
View File

@ -14,6 +14,7 @@ GETTEXT_TRIGGERS = $(BACKEND_COMMON_GETTEXT_TRIGGERS) \
syncrep_yyerror \
report_invalid_record:2 \
ereport_startup_progress \
json_token_error:2 \
json_manifest_parse_failure:2 \
error_cb:2
GETTEXT_FLAGS = $(BACKEND_COMMON_GETTEXT_FLAGS) \
@ -23,6 +24,7 @@ GETTEXT_FLAGS = $(BACKEND_COMMON_GETTEXT_FLAGS) \
write_stderr:1:c-format \
report_invalid_record:2:c-format \
ereport_startup_progress:1:c-format \
json_token_error:2:c-format \
error_cb:2:c-format
gettext-files: generated-parser-sources generated-headers

2
src/bin/pg_combinebackup/nls.mk
View File

@ -11,7 +11,9 @@ GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) \
../../common/jsonapi.c \
../../common/parse_manifest.c
GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) \
json_token_error:2 \
json_manifest_parse_failure:2 \
error_cb:2
GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS) \
json_token_error:2:c-format \
error_cb:2:c-format

2
src/bin/pg_verifybackup/nls.mk
View File

@ -6,11 +6,13 @@ GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) \
../../common/jsonapi.c \
../../common/parse_manifest.c
GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) \
json_token_error:2 \
json_manifest_parse_failure:2 \
error_cb:2 \
report_backup_error:2 \
report_fatal_error
GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS) \
json_token_error:2:c-format \
error_cb:2:c-format \
report_backup_error:2:c-format \
report_fatal_error:1:c-format

24
src/common/jsonapi.c
View File

@ -2105,7 +2105,7 @@ json_errdetail(JsonParseErrorType error, JsonLexContext *lex)
* A helper for error messages that should print the current token. The
* format must contain exactly one %.*s specifier.
*/
#define token_error(lex, format) \
#define json_token_error(lex, format) \
appendStringInfo((lex)->errormsg, _(format), \
(int) ((lex)->token_terminator - (lex)->token_start), \
(lex)->token_start);
@ -2124,7 +2124,7 @@ json_errdetail(JsonParseErrorType error, JsonLexContext *lex)
case JSON_NESTING_TOO_DEEP:
return (_("JSON nested too deep, maximum permitted depth is 6400"));
case JSON_ESCAPING_INVALID:
token_error(lex, "Escape sequence \"\\%.*s\" is invalid.");
json_token_error(lex, "Escape sequence \"\\%.*s\" is invalid.");
break;
case JSON_ESCAPING_REQUIRED:
appendStringInfo(lex->errormsg,
@ -2132,33 +2132,33 @@ json_errdetail(JsonParseErrorType error, JsonLexContext *lex)
(unsigned char) *(lex->token_terminator));
break;
case JSON_EXPECTED_END:
token_error(lex, "Expected end of input, but found \"%.*s\".");
json_token_error(lex, "Expected end of input, but found \"%.*s\".");
break;
case JSON_EXPECTED_ARRAY_FIRST:
token_error(lex, "Expected array element or \"]\", but found \"%.*s\".");
json_token_error(lex, "Expected array element or \"]\", but found \"%.*s\".");
break;
case JSON_EXPECTED_ARRAY_NEXT:
token_error(lex, "Expected \",\" or \"]\", but found \"%.*s\".");
json_token_error(lex, "Expected \",\" or \"]\", but found \"%.*s\".");
break;
case JSON_EXPECTED_COLON:
token_error(lex, "Expected \":\", but found \"%.*s\".");
json_token_error(lex, "Expected \":\", but found \"%.*s\".");
break;
case JSON_EXPECTED_JSON:
token_error(lex, "Expected JSON value, but found \"%.*s\".");
json_token_error(lex, "Expected JSON value, but found \"%.*s\".");
break;
case JSON_EXPECTED_MORE:
return _("The input string ended unexpectedly.");
case JSON_EXPECTED_OBJECT_FIRST:
token_error(lex, "Expected string or \"}\", but found \"%.*s\".");
json_token_error(lex, "Expected string or \"}\", but found \"%.*s\".");
break;
case JSON_EXPECTED_OBJECT_NEXT:
token_error(lex, "Expected \",\" or \"}\", but found \"%.*s\".");
json_token_error(lex, "Expected \",\" or \"}\", but found \"%.*s\".");
break;
case JSON_EXPECTED_STRING:
token_error(lex, "Expected string, but found \"%.*s\".");
json_token_error(lex, "Expected string, but found \"%.*s\".");
break;
case JSON_INVALID_TOKEN:
token_error(lex, "Token \"%.*s\" is invalid.");
json_token_error(lex, "Token \"%.*s\" is invalid.");
break;
case JSON_UNICODE_CODE_POINT_ZERO:
return _("\\u0000 cannot be converted to text.");
@ -2189,7 +2189,7 @@ json_errdetail(JsonParseErrorType error, JsonLexContext *lex)
/* fall through to the error code after switch */
break;
}
#undef token_error
#undef json_token_error
/*
* We don't use a default: case, so that the compiler will warn about