agora inbox for [email protected]help / color / mirror / Atom feed
[PATCH v48 1/7] Make index_concurrently_create_copy more general 277+ messages / 2 participants [nested] [flat]
* [PATCH v48 1/7] Make index_concurrently_create_copy more general @ 2026-03-24 18:02 Álvaro Herrera <[email protected]> 0 siblings, 0 replies; 277+ messages in thread From: Álvaro Herrera @ 2026-03-24 18:02 UTC (permalink / raw) Add a 'boolean concurrent' option, and make it work for both cases. Also rename it to index_create_copy. This allows it to be reused for other purposes -- specifically, for REPACK CONCURRENTLY. With the CONCURRENTLY option, REPACK cannot simply swap the heap file and rebuild its indexes. Instead, it needs to build a separate set of indexes (including system catalog entries) *before* the actual swap, to reduce the time AccessExclusiveLock needs to be held for. This approach is different from what CREATE INDEX CONCURRENTLY does. Per a suggestion from Mihail Nikalayeu. Author: Antonin Houska <[email protected]> Discussion: https://postgr.es/m/41104.1754922120@localhost --- src/backend/catalog/index.c | 39 +++++++++++++++++++------------- src/backend/commands/indexcmds.c | 15 +++++++----- src/backend/nodes/makefuncs.c | 9 ++++---- src/include/catalog/index.h | 7 +++--- src/include/nodes/makefuncs.h | 4 +++- 5 files changed, 43 insertions(+), 31 deletions(-) diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c index 1ccfa687f05..b86ad73c626 100644 --- a/src/backend/catalog/index.c +++ b/src/backend/catalog/index.c @@ -1289,17 +1289,17 @@ index_create(Relation heapRelation, } /* - * index_concurrently_create_copy + * index_create_copy * - * Create concurrently an index based on the definition of the one provided by - * caller. The index is inserted into catalogs and needs to be built later - * on. This is called during concurrent reindex processing. + * Create an index based on the definition of the one provided by caller. The + * index is inserted into catalogs. If 'concurrently' is TRUE, it needs to be + * built later on; otherwise it's built immediately. * * "tablespaceOid" is the tablespace to use for this index. */ Oid -index_concurrently_create_copy(Relation heapRelation, Oid oldIndexId, - Oid tablespaceOid, const char *newName) +index_create_copy(Relation heapRelation, bool concurrently, + Oid oldIndexId, Oid tablespaceOid, const char *newName) { Relation indexRelation; IndexInfo *oldInfo, @@ -1318,6 +1318,7 @@ index_concurrently_create_copy(Relation heapRelation, Oid oldIndexId, List *indexColNames = NIL; List *indexExprs = NIL; List *indexPreds = NIL; + int flags = 0; indexRelation = index_open(oldIndexId, RowExclusiveLock); @@ -1328,7 +1329,7 @@ index_concurrently_create_copy(Relation heapRelation, Oid oldIndexId, * Concurrent build of an index with exclusion constraints is not * supported. */ - if (oldInfo->ii_ExclusionOps != NULL) + if (oldInfo->ii_ExclusionOps != NULL && concurrently) ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), errmsg("concurrent index creation for exclusion constraints is not supported"))); @@ -1384,9 +1385,7 @@ index_concurrently_create_copy(Relation heapRelation, Oid oldIndexId, } /* - * Build the index information for the new index. Note that rebuild of - * indexes with exclusion constraints is not supported, hence there is no - * need to fill all the ii_Exclusion* fields. + * Build the index information for the new index. */ newInfo = makeIndexInfo(oldInfo->ii_NumIndexAttrs, oldInfo->ii_NumIndexKeyAttrs, @@ -1395,10 +1394,13 @@ index_concurrently_create_copy(Relation heapRelation, Oid oldIndexId, indexPreds, oldInfo->ii_Unique, oldInfo->ii_NullsNotDistinct, - false, /* not ready for inserts */ - true, + !concurrently, /* isready */ + concurrently, /* concurrent */ indexRelation->rd_indam->amsummarizing, - oldInfo->ii_WithoutOverlaps); + oldInfo->ii_WithoutOverlaps, + oldInfo->ii_ExclusionOps, + oldInfo->ii_ExclusionProcs, + oldInfo->ii_ExclusionStrats); /* * Extract the list of column names and the column numbers for the new @@ -1436,6 +1438,9 @@ index_concurrently_create_copy(Relation heapRelation, Oid oldIndexId, stattargets[i].isnull = isnull; } + if (concurrently) + flags = INDEX_CREATE_SKIP_BUILD | INDEX_CREATE_CONCURRENT; + /* * Now create the new index. * @@ -1459,7 +1464,7 @@ index_concurrently_create_copy(Relation heapRelation, Oid oldIndexId, indcoloptions->values, stattargets, reloptionsDatum, - INDEX_CREATE_SKIP_BUILD | INDEX_CREATE_CONCURRENT, + flags, 0, true, /* allow table to be a system catalog? */ false, /* is_internal? */ @@ -2453,7 +2458,8 @@ BuildIndexInfo(Relation index) indexStruct->indisready, false, index->rd_indam->amsummarizing, - indexStruct->indisexclusion && indexStruct->indisunique); + indexStruct->indisexclusion && indexStruct->indisunique, + NULL, NULL, NULL); /* fill in attribute numbers */ for (i = 0; i < numAtts; i++) @@ -2513,7 +2519,8 @@ BuildDummyIndexInfo(Relation index) indexStruct->indisready, false, index->rd_indam->amsummarizing, - indexStruct->indisexclusion && indexStruct->indisunique); + indexStruct->indisexclusion && indexStruct->indisunique, + NULL, NULL, NULL); /* fill in attribute numbers */ for (i = 0; i < numAtts; i++) diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c index 373e8234794..4a2d21915b1 100644 --- a/src/backend/commands/indexcmds.c +++ b/src/backend/commands/indexcmds.c @@ -244,7 +244,8 @@ CheckIndexCompatible(Oid oldId, */ indexInfo = makeIndexInfo(numberOfAttributes, numberOfAttributes, accessMethodId, NIL, NIL, false, false, - false, false, amsummarizing, isWithoutOverlaps); + false, false, amsummarizing, isWithoutOverlaps, + NULL, NULL, NULL); typeIds = palloc_array(Oid, numberOfAttributes); collationIds = palloc_array(Oid, numberOfAttributes); opclassIds = palloc_array(Oid, numberOfAttributes); @@ -931,7 +932,8 @@ DefineIndex(ParseState *pstate, !concurrent, concurrent, amissummarizing, - stmt->iswithoutoverlaps); + stmt->iswithoutoverlaps, + NULL, NULL, NULL); typeIds = palloc_array(Oid, numberOfAttributes); collationIds = palloc_array(Oid, numberOfAttributes); @@ -3989,10 +3991,11 @@ ReindexRelationConcurrently(const ReindexStmt *stmt, Oid relationOid, const Rein tablespaceid = indexRel->rd_rel->reltablespace; /* Create new index definition based on given index */ - newIndexId = index_concurrently_create_copy(heapRel, - idx->indexId, - tablespaceid, - concurrentName); + newIndexId = index_create_copy(heapRel, + true, + idx->indexId, + tablespaceid, + concurrentName); /* * Now open the relation of the new index, a session-level lock is diff --git a/src/backend/nodes/makefuncs.c b/src/backend/nodes/makefuncs.c index 3cd35c5c457..8d23aa917e5 100644 --- a/src/backend/nodes/makefuncs.c +++ b/src/backend/nodes/makefuncs.c @@ -834,7 +834,8 @@ IndexInfo * makeIndexInfo(int numattrs, int numkeyattrs, Oid amoid, List *expressions, List *predicates, bool unique, bool nulls_not_distinct, bool isready, bool concurrent, bool summarizing, - bool withoutoverlaps) + bool withoutoverlaps, Oid *exclusion_ops, Oid *exclusion_procs, + uint16 *exclusion_strats) { IndexInfo *n = makeNode(IndexInfo); @@ -863,9 +864,9 @@ makeIndexInfo(int numattrs, int numkeyattrs, Oid amoid, List *expressions, n->ii_PredicateState = NULL; /* exclusion constraints */ - n->ii_ExclusionOps = NULL; - n->ii_ExclusionProcs = NULL; - n->ii_ExclusionStrats = NULL; + n->ii_ExclusionOps = exclusion_ops; + n->ii_ExclusionProcs = exclusion_procs; + n->ii_ExclusionStrats = exclusion_strats; /* speculative inserts */ n->ii_UniqueOps = NULL; diff --git a/src/include/catalog/index.h b/src/include/catalog/index.h index a38e95bc0eb..ed9e4c37d27 100644 --- a/src/include/catalog/index.h +++ b/src/include/catalog/index.h @@ -101,10 +101,9 @@ extern Oid index_create(Relation heapRelation, #define INDEX_CONSTR_CREATE_REMOVE_OLD_DEPS (1 << 4) #define INDEX_CONSTR_CREATE_WITHOUT_OVERLAPS (1 << 5) -extern Oid index_concurrently_create_copy(Relation heapRelation, - Oid oldIndexId, - Oid tablespaceOid, - const char *newName); +extern Oid index_create_copy(Relation heapRelation, bool concurrently, + Oid oldIndexId, Oid tablespaceOid, + const char *newName); extern void index_concurrently_build(Oid heapRelationId, Oid indexRelationId); diff --git a/src/include/nodes/makefuncs.h b/src/include/nodes/makefuncs.h index bf54d39feb0..40ec249a7a1 100644 --- a/src/include/nodes/makefuncs.h +++ b/src/include/nodes/makefuncs.h @@ -99,7 +99,9 @@ extern IndexInfo *makeIndexInfo(int numattrs, int numkeyattrs, Oid amoid, List *expressions, List *predicates, bool unique, bool nulls_not_distinct, bool isready, bool concurrent, - bool summarizing, bool withoutoverlaps); + bool summarizing, bool withoutoverlaps, + Oid *exclusion_ops, Oid *exclusion_procs, + uint16 *exclusion_strats); extern Node *makeStringConst(char *str, int location); extern DefElem *makeDefElem(char *name, Node *arg, int location); -- 2.47.3 --qfkt2ktdpcfeypib Content-Type: text/x-diff; charset=utf-8 Content-Disposition: attachment; filename="v48-0002-Give-options-parameter-to-table_delete-table_upd.patch" ^ permalink raw reply [nested|flat] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 277+ 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] 277+ messages in thread
end of thread, other threads:[~2026-07-03 06:06 UTC | newest] Thread overview: 277+ messages (download: mbox mbox.gz follow: Atom feed) -- links below jump to the message on this page -- 2026-03-24 18:02 [PATCH v48 1/7] Make index_concurrently_create_copy more general Álvaro Herrera <[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]> 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]> 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