Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitd84a7b2

Browse files
committed
Change some errdetail() to errdetail_internal()
This prevents marking the argument string for translation for gettext,and it also prevents the given string (which is already translated) frombeing translated at runtime.Also, mark the strings used as arguments to check_rolespec_name fortranslation.Backpatch all the way back as appropriate. None of this is caught byany tests (necessarily so), so I verified it manually.
1 parent7188b9b commitd84a7b2

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

‎src/backend/catalog/dependency.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1192,14 +1192,14 @@ reportDependentObjects(const ObjectAddresses *targetObjects,
11921192
(errcode(ERRCODE_DEPENDENT_OBJECTS_STILL_EXIST),
11931193
errmsg("cannot drop %s because other objects depend on it",
11941194
getObjectDescription(origObject, false)),
1195-
errdetail("%s",clientdetail.data),
1195+
errdetail_internal("%s",clientdetail.data),
11961196
errdetail_log("%s",logdetail.data),
11971197
errhint("Use DROP ... CASCADE to drop the dependent objects too.")));
11981198
else
11991199
ereport(ERROR,
12001200
(errcode(ERRCODE_DEPENDENT_OBJECTS_STILL_EXIST),
12011201
errmsg("cannot drop desired object(s) because other objects depend on them"),
1202-
errdetail("%s",clientdetail.data),
1202+
errdetail_internal("%s",clientdetail.data),
12031203
errdetail_log("%s",logdetail.data),
12041204
errhint("Use DROP ... CASCADE to drop the dependent objects too.")));
12051205
}
@@ -1210,7 +1210,7 @@ reportDependentObjects(const ObjectAddresses *targetObjects,
12101210
"drop cascades to %d other objects",
12111211
numReportedClient+numNotReportedClient,
12121212
numReportedClient+numNotReportedClient),
1213-
errdetail("%s",clientdetail.data),
1213+
errdetail_internal("%s",clientdetail.data),
12141214
errdetail_log("%s",logdetail.data)));
12151215
}
12161216
elseif (numReportedClient==1)

‎src/backend/commands/publicationcmds.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -580,7 +580,7 @@ check_simple_rowfilter_expr_walker(Node *node, ParseState *pstate)
580580
ereport(ERROR,
581581
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
582582
errmsg("invalid publication WHERE expression"),
583-
errdetail("%s",errdetail_msg),
583+
errdetail_internal("%s",errdetail_msg),
584584
parser_errposition(pstate,exprLocation(node))));
585585

586586
returnexpression_tree_walker(node,check_simple_rowfilter_expr_walker,

‎src/backend/commands/user.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -576,7 +576,7 @@ AlterRole(ParseState *pstate, AlterRoleStmt *stmt)
576576
GrantRoleOptionspopt;
577577

578578
check_rolespec_name(stmt->role,
579-
"Cannot alter reserved roles.");
579+
_("Cannot alter reserved roles."));
580580

581581
/* Extract options from the statement node tree */
582582
foreach(option,stmt->options)
@@ -910,7 +910,7 @@ AlterRoleSet(AlterRoleSetStmt *stmt)
910910
if (stmt->role)
911911
{
912912
check_rolespec_name(stmt->role,
913-
"Cannot alter reserved roles.");
913+
_("Cannot alter reserved roles."));
914914

915915
roletuple=get_rolespec_tuple(stmt->role);
916916
roleform= (Form_pg_authid)GETSTRUCT(roletuple);

‎src/backend/utils/adt/acl.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5291,7 +5291,7 @@ get_rolespec_name(const RoleSpec *role)
52915291

52925292
/*
52935293
* Given a RoleSpec, throw an error if the name is reserved, using detail_msg,
5294-
* if provided.
5294+
* if provided (which must be already translated).
52955295
*
52965296
* If node is NULL, no error is thrown. If detail_msg is NULL then no detail
52975297
* message is provided.
@@ -5312,7 +5312,7 @@ check_rolespec_name(const RoleSpec *role, const char *detail_msg)
53125312
(errcode(ERRCODE_RESERVED_NAME),
53135313
errmsg("role name \"%s\" is reserved",
53145314
role->rolename),
5315-
errdetail("%s",detail_msg)));
5315+
errdetail_internal("%s",detail_msg)));
53165316
else
53175317
ereport(ERROR,
53185318
(errcode(ERRCODE_RESERVED_NAME),

‎src/backend/utils/adt/jsonfuncs.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -615,13 +615,13 @@ json_ereport_error(JsonParseErrorType error, JsonLexContext *lex)
615615
ereport(ERROR,
616616
(errcode(ERRCODE_UNTRANSLATABLE_CHARACTER),
617617
errmsg("unsupported Unicode escape sequence"),
618-
errdetail("%s",json_errdetail(error,lex)),
618+
errdetail_internal("%s",json_errdetail(error,lex)),
619619
report_json_context(lex)));
620620
else
621621
ereport(ERROR,
622622
(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
623623
errmsg("invalid input syntax for type %s","json"),
624-
errdetail("%s",json_errdetail(error,lex)),
624+
errdetail_internal("%s",json_errdetail(error,lex)),
625625
report_json_context(lex)));
626626
}
627627

‎src/common/jsonapi.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1079,11 +1079,11 @@ extract_token(JsonLexContext *lex)
10791079
}
10801080

10811081
/*
1082-
* Constructa detail message for a JSON error.
1082+
* Constructan (already translated) detail message for a JSON error.
10831083
*
10841084
* Note that the error message generated by this routine may not be
10851085
* palloc'd, making it unsafe for frontend code as there is no way to
1086-
* know if this can besafery pfree'd or not.
1086+
* know if this can besafely pfree'd or not.
10871087
*/
10881088
char*
10891089
json_errdetail(JsonParseErrorTypeerror,JsonLexContext*lex)

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp