From d933092e0ab55ed95615977e50963f969ac9793d Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Fri, 15 Jun 2012 02:01:00 +0300 Subject: [PATCH] Add more message pluralization Even though we can't do much about the case with multiple plurals in one sentence, we can fix the other cases. --- src/backend/commands/dbcommands.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c index b7224bde87..c9b80ad823 100644 --- a/src/backend/commands/dbcommands.c +++ b/src/backend/commands/dbcommands.c @@ -1804,20 +1804,21 @@ check_db_file_conflict(Oid db_id) static int errdetail_busy_db(int notherbackends, int npreparedxacts) { - /* - * We don't worry about singular versus plural here, since the English - * rules for that don't translate very well. But we can at least avoid - * the case of zero items. - */ if (notherbackends > 0 && npreparedxacts > 0) + /* We don't deal with singular versus plural here, since gettext + * doesn't support multiple plurals in one string. */ errdetail("There are %d other session(s) and %d prepared transaction(s) using the database.", notherbackends, npreparedxacts); else if (notherbackends > 0) - errdetail("There are %d other session(s) using the database.", - notherbackends); + errdetail_plural("There is %d other session using the database.", + "There are %d other sessions using the database.", + notherbackends, + notherbackends); else - errdetail("There are %d prepared transaction(s) using the database.", - npreparedxacts); + errdetail_plural("There is %d prepared transaction using the database.", + "There are %d prepared transactions using the database.", + npreparedxacts, + npreparedxacts); return 0; /* just to keep ereport macro happy */ }