Skip to content

Commit

Permalink
Add more message pluralization
Browse files Browse the repository at this point in the history
Even though we can't do much about the case with multiple plurals in
one sentence, we can fix the other cases.
  • Loading branch information
petere committed Jun 14, 2012
1 parent 8507c2f commit d933092
Showing 1 changed file with 10 additions and 9 deletions.
19 changes: 10 additions & 9 deletions src/backend/commands/dbcommands.c
Expand Up @@ -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 */
}

Expand Down

0 comments on commit d933092

Please sign in to comment.