mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-09-30 20:51:13 +02:00
Unify error messages
... for translatability purposes.
This commit is contained in:
parent
5c47049180
commit
0a999e1290
@ -856,7 +856,9 @@ WaitEventAdjustEpoll(WaitEventSet *set, WaitEvent *event, int action)
|
|||||||
if (rc < 0)
|
if (rc < 0)
|
||||||
ereport(ERROR,
|
ereport(ERROR,
|
||||||
(errcode_for_socket_access(),
|
(errcode_for_socket_access(),
|
||||||
errmsg("epoll_ctl() failed: %m")));
|
/* translator: %s is a syscall name, such as "poll()" */
|
||||||
|
errmsg("%s failed: %m",
|
||||||
|
"epoll_ctl()")));
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -1087,7 +1089,9 @@ WaitEventSetWaitBlock(WaitEventSet *set, int cur_timeout,
|
|||||||
waiting = false;
|
waiting = false;
|
||||||
ereport(ERROR,
|
ereport(ERROR,
|
||||||
(errcode_for_socket_access(),
|
(errcode_for_socket_access(),
|
||||||
errmsg("epoll_wait() failed: %m")));
|
/* translator: %s is a syscall name, such as "poll()" */
|
||||||
|
errmsg("%s failed: %m",
|
||||||
|
"epoll_wait()")));
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@ -1211,7 +1215,9 @@ WaitEventSetWaitBlock(WaitEventSet *set, int cur_timeout,
|
|||||||
waiting = false;
|
waiting = false;
|
||||||
ereport(ERROR,
|
ereport(ERROR,
|
||||||
(errcode_for_socket_access(),
|
(errcode_for_socket_access(),
|
||||||
errmsg("poll() failed: %m")));
|
/* translator: %s is a syscall name, such as "poll()" */
|
||||||
|
errmsg("%s failed: %m",
|
||||||
|
"poll()")));
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -181,7 +181,9 @@ pg_rotate_logfile(PG_FUNCTION_ARGS)
|
|||||||
ereport(ERROR,
|
ereport(ERROR,
|
||||||
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
|
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
|
||||||
(errmsg("must be superuser to rotate log files with adminpack 1.0"),
|
(errmsg("must be superuser to rotate log files with adminpack 1.0"),
|
||||||
errhint("Consider using pg_logfile_rotate(), which is part of core, instead."))));
|
/* translator: %s is a SQL function name */
|
||||||
|
errhint("Consider using %s, which is part of core, instead.",
|
||||||
|
"pg_logfile_rotate()"))));
|
||||||
|
|
||||||
if (!Logging_collector)
|
if (!Logging_collector)
|
||||||
{
|
{
|
||||||
|
@ -1566,7 +1566,8 @@ str_tolower(const char *buff, size_t nbytes, Oid collid)
|
|||||||
*/
|
*/
|
||||||
ereport(ERROR,
|
ereport(ERROR,
|
||||||
(errcode(ERRCODE_INDETERMINATE_COLLATION),
|
(errcode(ERRCODE_INDETERMINATE_COLLATION),
|
||||||
errmsg("could not determine which collation to use for lower() function"),
|
errmsg("could not determine which collation to use for %s function",
|
||||||
|
"lower()"),
|
||||||
errhint("Use the COLLATE clause to set the collation explicitly.")));
|
errhint("Use the COLLATE clause to set the collation explicitly.")));
|
||||||
}
|
}
|
||||||
mylocale = pg_newlocale_from_collation(collid);
|
mylocale = pg_newlocale_from_collation(collid);
|
||||||
@ -1688,7 +1689,8 @@ str_toupper(const char *buff, size_t nbytes, Oid collid)
|
|||||||
*/
|
*/
|
||||||
ereport(ERROR,
|
ereport(ERROR,
|
||||||
(errcode(ERRCODE_INDETERMINATE_COLLATION),
|
(errcode(ERRCODE_INDETERMINATE_COLLATION),
|
||||||
errmsg("could not determine which collation to use for upper() function"),
|
errmsg("could not determine which collation to use for %s function",
|
||||||
|
"upper()"),
|
||||||
errhint("Use the COLLATE clause to set the collation explicitly.")));
|
errhint("Use the COLLATE clause to set the collation explicitly.")));
|
||||||
}
|
}
|
||||||
mylocale = pg_newlocale_from_collation(collid);
|
mylocale = pg_newlocale_from_collation(collid);
|
||||||
@ -1811,7 +1813,8 @@ str_initcap(const char *buff, size_t nbytes, Oid collid)
|
|||||||
*/
|
*/
|
||||||
ereport(ERROR,
|
ereport(ERROR,
|
||||||
(errcode(ERRCODE_INDETERMINATE_COLLATION),
|
(errcode(ERRCODE_INDETERMINATE_COLLATION),
|
||||||
errmsg("could not determine which collation to use for initcap() function"),
|
errmsg("could not determine which collation to use for %s function",
|
||||||
|
"initcap()"),
|
||||||
errhint("Use the COLLATE clause to set the collation explicitly.")));
|
errhint("Use the COLLATE clause to set the collation explicitly.")));
|
||||||
}
|
}
|
||||||
mylocale = pg_newlocale_from_collation(collid);
|
mylocale = pg_newlocale_from_collation(collid);
|
||||||
|
@ -219,7 +219,9 @@ pg_read_file(PG_FUNCTION_ARGS)
|
|||||||
ereport(ERROR,
|
ereport(ERROR,
|
||||||
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
|
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
|
||||||
(errmsg("must be superuser to read files with adminpack 1.0"),
|
(errmsg("must be superuser to read files with adminpack 1.0"),
|
||||||
errhint("Consider using pg_file_read(), which is part of core, instead."))));
|
/* translator: %s is a SQL function name */
|
||||||
|
errhint("Consider using %s, which is part of core, instead.",
|
||||||
|
"pg_file_read()"))));
|
||||||
|
|
||||||
/* handle optional arguments */
|
/* handle optional arguments */
|
||||||
if (PG_NARGS() >= 3)
|
if (PG_NARGS() >= 3)
|
||||||
|
@ -2192,7 +2192,9 @@ json_build_object(PG_FUNCTION_ARGS)
|
|||||||
ereport(ERROR,
|
ereport(ERROR,
|
||||||
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
|
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
|
||||||
errmsg("argument list must have even number of elements"),
|
errmsg("argument list must have even number of elements"),
|
||||||
errhint("The arguments of json_build_object() must consist of alternating keys and values.")));
|
/* translator: %s is a SQL function name */
|
||||||
|
errhint("The arguments of %s must consist of alternating keys and values.",
|
||||||
|
"json_build_object()")));
|
||||||
|
|
||||||
result = makeStringInfo();
|
result = makeStringInfo();
|
||||||
|
|
||||||
|
@ -1155,7 +1155,9 @@ jsonb_build_object(PG_FUNCTION_ARGS)
|
|||||||
ereport(ERROR,
|
ereport(ERROR,
|
||||||
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
|
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
|
||||||
errmsg("argument list must have even number of elements"),
|
errmsg("argument list must have even number of elements"),
|
||||||
errhint("The arguments of jsonb_build_object() must consist of alternating keys and values.")));
|
/* translator: %s is a SQL function name */
|
||||||
|
errhint("The arguments of %s must consist of alternating keys and values.",
|
||||||
|
"jsonb_build_object()")));
|
||||||
|
|
||||||
memset(&result, 0, sizeof(JsonbInState));
|
memset(&result, 0, sizeof(JsonbInState));
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user