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

Commit84f8e40

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 parent5197630 commit84f8e40

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

‎src/backend/catalog/dependency.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1198,14 +1198,14 @@ reportDependentObjects(const ObjectAddresses *targetObjects,
11981198
(errcode(ERRCODE_DEPENDENT_OBJECTS_STILL_EXIST),
11991199
errmsg("cannot drop %s because other objects depend on it",
12001200
getObjectDescription(origObject)),
1201-
errdetail("%s",clientdetail.data),
1201+
errdetail_internal("%s",clientdetail.data),
12021202
errdetail_log("%s",logdetail.data),
12031203
errhint("Use DROP ... CASCADE to drop the dependent objects too.")));
12041204
else
12051205
ereport(ERROR,
12061206
(errcode(ERRCODE_DEPENDENT_OBJECTS_STILL_EXIST),
12071207
errmsg("cannot drop desired object(s) because other objects depend on them"),
1208-
errdetail("%s",clientdetail.data),
1208+
errdetail_internal("%s",clientdetail.data),
12091209
errdetail_log("%s",logdetail.data),
12101210
errhint("Use DROP ... CASCADE to drop the dependent objects too.")));
12111211
}
@@ -1217,7 +1217,7 @@ reportDependentObjects(const ObjectAddresses *targetObjects,
12171217
"drop cascades to %d other objects",
12181218
numReportedClient+numNotReportedClient,
12191219
numReportedClient+numNotReportedClient),
1220-
errdetail("%s",clientdetail.data),
1220+
errdetail_internal("%s",clientdetail.data),
12211221
errdetail_log("%s",logdetail.data)));
12221222
}
12231223
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
@@ -5323,7 +5323,7 @@ get_rolespec_name(const RoleSpec *role)
53235323

53245324
/*
53255325
* Given a RoleSpec, throw an error if the name is reserved, using detail_msg,
5326-
* if provided.
5326+
* if provided (which must be already translated).
53275327
*
53285328
* If node is NULL, no error is thrown. If detail_msg is NULL then no detail
53295329
* message is provided.
@@ -5344,7 +5344,7 @@ check_rolespec_name(const RoleSpec *role, const char *detail_msg)
53445344
(errcode(ERRCODE_RESERVED_NAME),
53455345
errmsg("role name \"%s\" is reserved",
53465346
role->rolename),
5347-
errdetail("%s",detail_msg)));
5347+
errdetail_internal("%s",detail_msg)));
53485348
else
53495349
ereport(ERROR,
53505350
(errcode(ERRCODE_RESERVED_NAME),

0 commit comments

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