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

Commitc0c2a9b

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 parent5d6c5d0 commitc0c2a9b

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
@@ -991,14 +991,14 @@ reportDependentObjects(const ObjectAddresses *targetObjects,
991991
(errcode(ERRCODE_DEPENDENT_OBJECTS_STILL_EXIST),
992992
errmsg("cannot drop %s because other objects depend on it",
993993
getObjectDescription(origObject)),
994-
errdetail("%s",clientdetail.data),
994+
errdetail_internal("%s",clientdetail.data),
995995
errdetail_log("%s",logdetail.data),
996996
errhint("Use DROP ... CASCADE to drop the dependent objects too.")));
997997
else
998998
ereport(ERROR,
999999
(errcode(ERRCODE_DEPENDENT_OBJECTS_STILL_EXIST),
10001000
errmsg("cannot drop desired object(s) because other objects depend on them"),
1001-
errdetail("%s",clientdetail.data),
1001+
errdetail_internal("%s",clientdetail.data),
10021002
errdetail_log("%s",logdetail.data),
10031003
errhint("Use DROP ... CASCADE to drop the dependent objects too.")));
10041004
}
@@ -1010,7 +1010,7 @@ reportDependentObjects(const ObjectAddresses *targetObjects,
10101010
"drop cascades to %d other objects",
10111011
numReportedClient+numNotReportedClient,
10121012
numReportedClient+numNotReportedClient),
1013-
errdetail("%s",clientdetail.data),
1013+
errdetail_internal("%s",clientdetail.data),
10141014
errdetail_log("%s",logdetail.data)));
10151015
}
10161016
elseif (numReportedClient==1)

‎src/backend/commands/user.c

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

554554
check_rolespec_name(stmt->role,
555-
"Cannot alter reserved roles.");
555+
_("Cannot alter reserved roles."));
556556

557557
/* Extract options from the statement node tree */
558558
foreach(option,stmt->options)
@@ -906,7 +906,7 @@ AlterRoleSet(AlterRoleSetStmt *stmt)
906906
if (stmt->role)
907907
{
908908
check_rolespec_name(stmt->role,
909-
"Cannot alter reserved roles.");
909+
_("Cannot alter reserved roles."));
910910

911911
roletuple=get_rolespec_tuple(stmt->role);
912912
roleid=HeapTupleGetOid(roletuple);

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

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

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

0 commit comments

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