rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor Windows error message for easier translation 

In the error messages referring to the user right "Lock pages in
memory", this is a term from the Windows OS, so it should be
translated in accordance with the OS localization.  Refactor the error
messages so this is easier and clearer.  Also fix the capitalization
to match the existing capitalization in the OS.
This commit is contained in:
Peter Eisentraut 2021-02-04 13:31:13 +01:00
parent 5128483d06
commit 3c78e0569c
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/src/sgml/config.sgml
View File

@ -1593,14 +1593,14 @@ include_dir 'conf.d'
<para>
Huge pages are known as large pages on Windows. To use them, you need to
assign the user right Lock Pages in Memory to the Windows user account
assign the user right <quote>Lock pages in memory</quote> to the Windows user account
that runs <productname>PostgreSQL</productname>.
You can use Windows Group Policy tool (gpedit.msc) to assign the user right
Lock Pages in Memory.
<quote>Lock pages in memory</quote>.
To start the database server on the command prompt as a standalone process,
not as a Windows service, the command prompt must be run as an administrator or
User Access Control (UAC) must be disabled. When the UAC is enabled, the normal
command prompt revokes the user right Lock Pages in Memory when started.
command prompt revokes the user right <quote>Lock pages in memory</quote> when started.
</para>
<para>

16
src/backend/port/win32_shmem.c
View File

@ -141,7 +141,10 @@ EnableLockPagesPrivilege(int elevel)
if (!OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, &hToken))
{
ereport(elevel,
(errmsg("could not enable Lock Pages in Memory user right: error code %lu", GetLastError()),
(errmsg("could not enable user right \"%s\": error code %lu",
/* translator: This is a term from Windows and should be translated to match the Windows localization. */
_("Lock pages in memory"),
GetLastError()),
errdetail("Failed system call was %s.", "OpenProcessToken")));
return FALSE;
}
@ -149,7 +152,7 @@ EnableLockPagesPrivilege(int elevel)
if (!LookupPrivilegeValue(NULL, SE_LOCK_MEMORY_NAME, &luid))
{
ereport(elevel,
(errmsg("could not enable Lock Pages in Memory user right: error code %lu", GetLastError()),
(errmsg("could not enable user right \"%s\": error code %lu", _("Lock pages in memory"), GetLastError()),
errdetail("Failed system call was %s.", "LookupPrivilegeValue")));
CloseHandle(hToken);
return FALSE;
@ -161,7 +164,7 @@ EnableLockPagesPrivilege(int elevel)
if (!AdjustTokenPrivileges(hToken, FALSE, &tp, 0, NULL, NULL))
{
ereport(elevel,
(errmsg("could not enable Lock Pages in Memory user right: error code %lu", GetLastError()),
(errmsg("could not enable user right \"%s\": error code %lu", _("Lock pages in memory"), GetLastError()),
errdetail("Failed system call was %s.", "AdjustTokenPrivileges")));
CloseHandle(hToken);
return FALSE;
@ -172,11 +175,12 @@ EnableLockPagesPrivilege(int elevel)
if (GetLastError() == ERROR_NOT_ALL_ASSIGNED)
ereport(elevel,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
errmsg("could not enable Lock Pages in Memory user right"),
errhint("Assign Lock Pages in Memory user right to the Windows user account which runs PostgreSQL.")));
errmsg("could not enable user right \"%s\"", _("Lock pages in memory")),
errhint("Assign user right \"%s\" to the Windows user account which runs PostgreSQL.",
_("Lock pages in memory"))));
else
ereport(elevel,
(errmsg("could not enable Lock Pages in Memory user right: error code %lu", GetLastError()),
(errmsg("could not enable user right \"%s\": error code %lu", _("Lock pages in memory"), GetLastError()),
errdetail("Failed system call was %s.", "AdjustTokenPrivileges")));
CloseHandle(hToken);
return FALSE;