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

Commit1dd468c

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 parent8c17c86 commit1dd468c

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

‎src/backend/catalog/dependency.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1199,14 +1199,14 @@ reportDependentObjects(const ObjectAddresses *targetObjects,
11991199
(errcode(ERRCODE_DEPENDENT_OBJECTS_STILL_EXIST),
12001200
errmsg("cannot drop %s because other objects depend on it",
12011201
getObjectDescription(origObject)),
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
else
12061206
ereport(ERROR,
12071207
(errcode(ERRCODE_DEPENDENT_OBJECTS_STILL_EXIST),
12081208
errmsg("cannot drop desired object(s) because other objects depend on them"),
1209-
errdetail("%s",clientdetail.data),
1209+
errdetail_internal("%s",clientdetail.data),
12101210
errdetail_log("%s",logdetail.data),
12111211
errhint("Use DROP ... CASCADE to drop the dependent objects too.")));
12121212
}
@@ -1218,7 +1218,7 @@ reportDependentObjects(const ObjectAddresses *targetObjects,
12181218
"drop cascades to %d other objects",
12191219
numReportedClient+numNotReportedClient,
12201220
numReportedClient+numNotReportedClient),
1221-
errdetail("%s",clientdetail.data),
1221+
errdetail_internal("%s",clientdetail.data),
12221222
errdetail_log("%s",logdetail.data)));
12231223
}
12241224
elseif (numReportedClient==1)

‎src/backend/commands/user.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -567,7 +567,7 @@ AlterRole(AlterRoleStmt *stmt)
567567
Oidroleid;
568568

569569
check_rolespec_name(stmt->role,
570-
"Cannot alter reserved roles.");
570+
_("Cannot alter reserved roles."));
571571

572572
/* Extract options from the statement node tree */
573573
foreach(option,stmt->options)
@@ -922,7 +922,7 @@ AlterRoleSet(AlterRoleSetStmt *stmt)
922922
if (stmt->role)
923923
{
924924
check_rolespec_name(stmt->role,
925-
"Cannot alter reserved roles.");
925+
_("Cannot alter reserved roles."));
926926

927927
roletuple=get_rolespec_tuple(stmt->role);
928928
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
@@ -5308,7 +5308,7 @@ get_rolespec_name(const RoleSpec *role)
53085308

53095309
/*
53105310
* Given a RoleSpec, throw an error if the name is reserved, using detail_msg,
5311-
* if provided.
5311+
* if provided (which must be already translated).
53125312
*
53135313
* If node is NULL, no error is thrown. If detail_msg is NULL then no detail
53145314
* message is provided.
@@ -5329,7 +5329,7 @@ check_rolespec_name(const RoleSpec *role, const char *detail_msg)
53295329
(errcode(ERRCODE_RESERVED_NAME),
53305330
errmsg("role name \"%s\" is reserved",
53315331
role->rolename),
5332-
errdetail("%s",detail_msg)));
5332+
errdetail_internal("%s",detail_msg)));
53335333
else
53345334
ereport(ERROR,
53355335
(errcode(ERRCODE_RESERVED_NAME),

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

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

‎src/common/jsonapi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1050,7 +1050,7 @@ report_parse_error(JsonParseContext ctx, JsonLexContext *lex)
10501050
}
10511051

10521052
/*
1053-
* Constructa detail message for a JSON error.
1053+
* Constructan (already translated) detail message for a JSON error.
10541054
*/
10551055
char*
10561056
json_errdetail(JsonParseErrorTypeerror,JsonLexContext*lex)

0 commit comments

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