database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-25 21:42:33 +03:00
Code

Improve translatability of some getObjectDescription() messages.

Browse Source 
Refactor some cases in getObjectDescription so that the translator has
more control over phrase order in the translated messages.  This doesn't
cause any changes in the English results.  (I was sorely tempted to
reorder "... belonging to role %s in schema %s" into "... in schema %s
belonging to role %s", but refrained.)

In principle we could back-patch this, but since translators have not
complained about these cases previously, it seems better not to thrash
the translatable strings in back branches.

Kyotaro Horiguchi, tweaked a bit by me

Discussion: https://postgr.es/m/20180522.182020.114074746.horiguchi.kyotaro@lab.ntt.co.jp
This commit is contained in:
Tom Lane 2018-05-24 13:20:16 -04:00
parent 1a31baf61e
commit 7c89eb750d
1 changed files with 73 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
src/backend/catalog/objectaddress.c
View File

@ -2778,6 +2778,7 @@ getObjectDescription(const ObjectAddress *object)
initStringInfo(&rel); initStringInfo(&rel);
getRelationDescription(&rel, con->conrelid); getRelationDescription(&rel, con->conrelid);
/* translator: second %s is, e.g., "table %s" */
appendStringInfo(&buffer, _("constraint %s on %s"), appendStringInfo(&buffer, _("constraint %s on %s"),
NameStr(con->conname), rel.data); NameStr(con->conname), rel.data);
pfree(rel.data); pfree(rel.data);
@ -3036,6 +3037,7 @@ getObjectDescription(const ObjectAddress *object)
SysScanDesc rcscan; SysScanDesc rcscan;
HeapTuple tup; HeapTuple tup;
Form_pg_rewrite rule; Form_pg_rewrite rule;
StringInfoData rel;
ruleDesc = heap_open(RewriteRelationId, AccessShareLock); ruleDesc = heap_open(RewriteRelationId, AccessShareLock);
@ -3052,13 +3054,15 @@ getObjectDescription(const ObjectAddress *object)
if (!HeapTupleIsValid(tup)) if (!HeapTupleIsValid(tup))
elog(ERROR, "could not find tuple for rule %u", elog(ERROR, "could not find tuple for rule %u",
object->objectId); object->objectId);
rule = (Form_pg_rewrite) GETSTRUCT(tup); rule = (Form_pg_rewrite) GETSTRUCT(tup);
appendStringInfo(&buffer, _("rule %s on "), initStringInfo(&rel);
NameStr(rule->rulename)); getRelationDescription(&rel, rule->ev_class);
getRelationDescription(&buffer, rule->ev_class);
/* translator: second %s is, e.g., "table %s" */
appendStringInfo(&buffer, _("rule %s on %s"),
NameStr(rule->rulename), rel.data);
pfree(rel.data);
systable_endscan(rcscan); systable_endscan(rcscan);
heap_close(ruleDesc, AccessShareLock); heap_close(ruleDesc, AccessShareLock);
break; break;
@ -3071,6 +3075,7 @@ getObjectDescription(const ObjectAddress *object)
SysScanDesc tgscan; SysScanDesc tgscan;
HeapTuple tup; HeapTuple tup;
Form_pg_trigger trig; Form_pg_trigger trig;
StringInfoData rel;
trigDesc = heap_open(TriggerRelationId, AccessShareLock); trigDesc = heap_open(TriggerRelationId, AccessShareLock);
@ -3087,13 +3092,15 @@ getObjectDescription(const ObjectAddress *object)
if (!HeapTupleIsValid(tup)) if (!HeapTupleIsValid(tup))
elog(ERROR, "could not find tuple for trigger %u", elog(ERROR, "could not find tuple for trigger %u",
object->objectId); object->objectId);
trig = (Form_pg_trigger) GETSTRUCT(tup); trig = (Form_pg_trigger) GETSTRUCT(tup);
appendStringInfo(&buffer, _("trigger %s on "), initStringInfo(&rel);
NameStr(trig->tgname)); getRelationDescription(&rel, trig->tgrelid);
getRelationDescription(&buffer, trig->tgrelid);
/* translator: second %s is, e.g., "table %s" */
appendStringInfo(&buffer, _("trigger %s on %s"),
NameStr(trig->tgname), rel.data);
pfree(rel.data);
systable_endscan(tgscan); systable_endscan(tgscan);
heap_close(trigDesc, AccessShareLock); heap_close(trigDesc, AccessShareLock);
break; break;
@ -3327,6 +3334,8 @@ getObjectDescription(const ObjectAddress *object)
SysScanDesc rcscan; SysScanDesc rcscan;
HeapTuple tup; HeapTuple tup;
Form_pg_default_acl defacl; Form_pg_default_acl defacl;
char *rolename;
char *nspname;
defaclrel = heap_open(DefaultAclRelationId, AccessShareLock); defaclrel = heap_open(DefaultAclRelationId, AccessShareLock);
@ -3346,48 +3355,74 @@ getObjectDescription(const ObjectAddress *object)
defacl = (Form_pg_default_acl) GETSTRUCT(tup); defacl = (Form_pg_default_acl) GETSTRUCT(tup);
rolename = GetUserNameFromId(defacl->defaclrole, false);
if (OidIsValid(defacl->defaclnamespace))
nspname = get_namespace_name(defacl->defaclnamespace);
else
nspname = NULL;
switch (defacl->defaclobjtype) switch (defacl->defaclobjtype)
{ {
case DEFACLOBJ_RELATION: case DEFACLOBJ_RELATION:
appendStringInfo(&buffer, if (nspname)
_("default privileges on new relations belonging to role %s"), appendStringInfo(&buffer,
GetUserNameFromId(defacl->defaclrole, false)); _("default privileges on new relations belonging to role %s in schema %s"),
rolename, nspname);
else
appendStringInfo(&buffer,
_("default privileges on new relations belonging to role %s"),
rolename);
break; break;
case DEFACLOBJ_SEQUENCE: case DEFACLOBJ_SEQUENCE:
appendStringInfo(&buffer, if (nspname)
_("default privileges on new sequences belonging to role %s"), appendStringInfo(&buffer,
GetUserNameFromId(defacl->defaclrole, false)); _("default privileges on new sequences belonging to role %s in schema %s"),
rolename, nspname);
else
appendStringInfo(&buffer,
_("default privileges on new sequences belonging to role %s"),
rolename);
break; break;
case DEFACLOBJ_FUNCTION: case DEFACLOBJ_FUNCTION:
appendStringInfo(&buffer, if (nspname)
_("default privileges on new functions belonging to role %s"), appendStringInfo(&buffer,
GetUserNameFromId(defacl->defaclrole, false)); _("default privileges on new functions belonging to role %s in schema %s"),
rolename, nspname);
else
appendStringInfo(&buffer,
_("default privileges on new functions belonging to role %s"),
rolename);
break; break;
case DEFACLOBJ_TYPE: case DEFACLOBJ_TYPE:
appendStringInfo(&buffer, if (nspname)
_("default privileges on new types belonging to role %s"), appendStringInfo(&buffer,
GetUserNameFromId(defacl->defaclrole, false)); _("default privileges on new types belonging to role %s in schema %s"),
rolename, nspname);
else
appendStringInfo(&buffer,
_("default privileges on new types belonging to role %s"),
rolename);
break; break;
case DEFACLOBJ_NAMESPACE: case DEFACLOBJ_NAMESPACE:
Assert(!nspname);
appendStringInfo(&buffer, appendStringInfo(&buffer,
_("default privileges on new schemas belonging to role %s"), _("default privileges on new schemas belonging to role %s"),
GetUserNameFromId(defacl->defaclrole, false)); rolename);
break; break;
default: default:
/* shouldn't get here */ /* shouldn't get here */
appendStringInfo(&buffer, if (nspname)
_("default privileges belonging to role %s"), appendStringInfo(&buffer,
GetUserNameFromId(defacl->defaclrole, false)); _("default privileges belonging to role %s in schema %s"),
rolename, nspname);
else
appendStringInfo(&buffer,
_("default privileges belonging to role %s"),
rolename);
break; break;
} }
if (OidIsValid(defacl->defaclnamespace))
{
appendStringInfo(&buffer,
_(" in schema %s"),
get_namespace_name(defacl->defaclnamespace));
}
systable_endscan(rcscan); systable_endscan(rcscan);
heap_close(defaclrel, AccessShareLock); heap_close(defaclrel, AccessShareLock);
break; break;
@ -3427,6 +3462,7 @@ getObjectDescription(const ObjectAddress *object)
SysScanDesc sscan; SysScanDesc sscan;
HeapTuple tuple; HeapTuple tuple;
Form_pg_policy form_policy; Form_pg_policy form_policy;
StringInfoData rel;
policy_rel = heap_open(PolicyRelationId, AccessShareLock); policy_rel = heap_open(PolicyRelationId, AccessShareLock);
@ -3443,13 +3479,15 @@ getObjectDescription(const ObjectAddress *object)
if (!HeapTupleIsValid(tuple)) if (!HeapTupleIsValid(tuple))
elog(ERROR, "could not find tuple for policy %u", elog(ERROR, "could not find tuple for policy %u",
object->objectId); object->objectId);
form_policy = (Form_pg_policy) GETSTRUCT(tuple); form_policy = (Form_pg_policy) GETSTRUCT(tuple);
appendStringInfo(&buffer, _("policy %s on "), initStringInfo(&rel);
NameStr(form_policy->polname)); getRelationDescription(&rel, form_policy->polrelid);
getRelationDescription(&buffer, form_policy->polrelid);
/* translator: second %s is, e.g., "table %s" */
appendStringInfo(&buffer, _("policy %s on %s"),
NameStr(form_policy->polname), rel.data);
pfree(rel.data);
systable_endscan(sscan); systable_endscan(sscan);
heap_close(policy_rel, AccessShareLock); heap_close(policy_rel, AccessShareLock);
break; break;