agora inbox for [email protected]help / color / mirror / Atom feed
[PATCH v34 04/11] Add Incremental View Maintenance support to pg_dump 124+ messages / 2 participants [nested] [flat]
* [PATCH v34 04/11] Add Incremental View Maintenance support to pg_dump @ 2020-11-11 08:01 Yugo Nagata <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Yugo Nagata @ 2020-11-11 08:01 UTC (permalink / raw) Support CREATE INCREMENTAL MATERIALIZED VIEW syntax. --- src/bin/pg_dump/pg_dump.c | 18 +++++++++++++++--- src/bin/pg_dump/pg_dump.h | 2 ++ src/bin/pg_dump/t/002_pg_dump.pl | 18 ++++++++++++++++++ 3 files changed, 35 insertions(+), 3 deletions(-) diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c index b8b1888bd3..dedb91c5f0 100644 --- a/src/bin/pg_dump/pg_dump.c +++ b/src/bin/pg_dump/pg_dump.c @@ -6722,6 +6722,7 @@ getTables(Archive *fout, int *numTables) int i_relacl; int i_acldefault; int i_ispartition; + int i_isivm; /* * Find all the tables and table-like objects. @@ -6824,10 +6825,17 @@ getTables(Archive *fout, int *numTables) if (fout->remoteVersion >= 100000) appendPQExpBufferStr(query, - "c.relispartition AS ispartition "); + "c.relispartition AS ispartition, "); else appendPQExpBufferStr(query, - "false AS ispartition "); + "false AS ispartition, "); + + if (fout->remoteVersion >= 180000) + appendPQExpBufferStr(query, + "c.relisivm AS isivm "); + else + appendPQExpBufferStr(query, + "false AS isivm "); /* * Left join to pg_depend to pick up dependency info linking sequences to @@ -6936,6 +6944,7 @@ getTables(Archive *fout, int *numTables) i_relacl = PQfnumber(res, "relacl"); i_acldefault = PQfnumber(res, "acldefault"); i_ispartition = PQfnumber(res, "ispartition"); + i_isivm = PQfnumber(res, "isivm"); if (dopt->lockWaitTimeout) { @@ -7015,6 +7024,7 @@ getTables(Archive *fout, int *numTables) tblinfo[i].amname = pg_strdup(PQgetvalue(res, i, i_amname)); tblinfo[i].is_identity_sequence = (strcmp(PQgetvalue(res, i, i_is_identity_sequence), "t") == 0); tblinfo[i].ispartition = (strcmp(PQgetvalue(res, i, i_ispartition), "t") == 0); + tblinfo[i].isivm = (strcmp(PQgetvalue(res, i, i_isivm), "t") == 0); /* other fields were zeroed above */ @@ -15812,9 +15822,11 @@ dumpTableSchema(Archive *fout, const TableInfo *tbinfo) binary_upgrade_set_pg_class_oids(fout, q, tbinfo->dobj.catId.oid); - appendPQExpBuffer(q, "CREATE %s%s %s", + appendPQExpBuffer(q, "CREATE %s%s%s %s", tbinfo->relpersistence == RELPERSISTENCE_UNLOGGED ? "UNLOGGED " : "", + tbinfo->relkind == RELKIND_MATVIEW && tbinfo->isivm ? + "INCREMENTAL " : "", reltypename, qualrelname); diff --git a/src/bin/pg_dump/pg_dump.h b/src/bin/pg_dump/pg_dump.h index 4b2e5870a9..87df430a71 100644 --- a/src/bin/pg_dump/pg_dump.h +++ b/src/bin/pg_dump/pg_dump.h @@ -325,6 +325,8 @@ typedef struct _tableInfo int numParents; /* number of (immediate) parent tables */ struct _tableInfo **parents; /* TableInfos of immediate parents */ + bool isivm; /* is incrementally maintainable materialized view? */ + /* * These fields are computed only if we decide the table is interesting * (it's either a table to dump, or a direct parent of a dumpable table). diff --git a/src/bin/pg_dump/t/002_pg_dump.pl b/src/bin/pg_dump/t/002_pg_dump.pl index d3dd8784d6..62fc9b5bc4 100644 --- a/src/bin/pg_dump/t/002_pg_dump.pl +++ b/src/bin/pg_dump/t/002_pg_dump.pl @@ -2785,6 +2785,24 @@ my %tests = ( }, }, + 'CREATE MATERIALIZED VIEW matview_ivm' => { + create_order => 21, + create_sql => 'CREATE INCREMENTAL MATERIALIZED VIEW dump_test.matview_ivm (col1) AS + SELECT col1 FROM dump_test.test_table;', + regexp => qr/^ + \QCREATE INCREMENTAL MATERIALIZED VIEW dump_test.matview_ivm AS\E + \n\s+\QSELECT col1\E + \n\s+\QFROM dump_test.test_table\E + \n\s+\QWITH NO DATA;\E + /xm, + like => + { %full_runs, %dump_test_schema_runs, section_pre_data => 1, }, + unlike => { + exclude_dump_test_schema => 1, + only_dump_measurement => 1, + }, + }, + 'CREATE POLICY p1 ON test_table' => { create_order => 22, create_sql => 'CREATE POLICY p1 ON dump_test.test_table -- 2.34.1 --Multipart=_Thu__11_Jul_2024_13_23_57_+0900_hKsU2G3a3BgS2FFs Content-Type: text/x-diff; name="v34-0003-Allow-to-prolong-life-span-of-transition-tables-.patch" Content-Disposition: attachment; filename="v34-0003-Allow-to-prolong-life-span-of-transition-tables-.patch" Content-Transfer-Encoding: 7bit ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 124+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 124+ messages in thread
end of thread, other threads:[~2026-07-03 06:06 UTC | newest] Thread overview: 124+ messages (download: mbox mbox.gz follow: Atom feed) -- links below jump to the message on this page -- 2020-11-11 08:01 [PATCH v34 04/11] Add Incremental View Maintenance support to pg_dump Yugo Nagata <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]>
This inbox is served by agora; see mirroring instructions for how to clone and mirror all data and code used for this inbox