Commitd933092

committed

Add more message pluralization

Even though we can't do much about the case with multiple plurals inone sentence, we can fix the other cases.

1 parent8507c2f commitd933092Copy full SHA for d933092

File tree

+10

-9

lines changed

+10

-9

lines changed

Lines changed: 10 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -1804,20 +1804,21 @@ check_db_file_conflict(Oid db_id)`
`1804`	`1804`	`staticint`
`1805`	`1805`	`errdetail_busy_db(intnotherbackends,intnpreparedxacts)`
`1806`	`1806`	`{`
`1807`		`-/*`
`1808`		`- * We don't worry about singular versus plural here, since the English`
`1809`		`- * rules for that don't translate very well. But we can at least avoid`
`1810`		`- * the case of zero items.`
`1811`		`- */`
`1812`	`1807`	`if (notherbackends>0&&npreparedxacts>0)`
	`1808`	`+/* We don't deal with singular versus plural here, since gettext`
	`1809`	`+ * doesn't support multiple plurals in one string. */`
`1813`	`1810`	`errdetail("There are %d other session(s) and %d prepared transaction(s) using the database.",`
`1814`	`1811`	`notherbackends,npreparedxacts);`
`1815`	`1812`	`elseif (notherbackends>0)`
`1816`		`-errdetail("There are %d other session(s) using the database.",`
`1817`		`-notherbackends);`
	`1813`	`+errdetail_plural("There is %d other session using the database.",`
	`1814`	`+"There are %d other sessions using the database.",`
	`1815`	`+notherbackends,`
	`1816`	`+notherbackends);`
`1818`	`1817`	`else`
`1819`		`-errdetail("There are %d prepared transaction(s) using the database.",`
`1820`		`-npreparedxacts);`
	`1818`	`+errdetail_plural("There is %d prepared transaction using the database.",`
	`1819`	`+"There are %d prepared transactions using the database.",`
	`1820`	`+npreparedxacts,`
	`1821`	`+npreparedxacts);`
`1821`	`1822`	`return0;/* just to keep ereport macro happy */`
`1822`	`1823`	`}`
`1823`	`1824`

Comments

(0)