Index: trunk/src/org/openstreetmap/josm/gui/dialogs/DeleteFromRelationConfirmationDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/DeleteFromRelationConfirmationDialog.java (revision 8988)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/DeleteFromRelationConfirmationDialog.java (revision 8989)
@@ -107,17 +107,14 @@
int numObjectsToDelete = model.getNumObjectsToDelete();
int numParentRelations = model.getNumParentRelations();
+ final String msg1 = trn(
+ "Please confirm to remove {0} object.",
+ "Please confirm to remove {0} objects.",
+ numObjectsToDelete, numObjectsToDelete);
+ final String msg2 = trn(
+ "{0} relation is affected.",
+ "{0} relations are affected.",
+ numParentRelations, numParentRelations);
@I18n.QuirkyPluralString
- final String msg;
- if (numParentRelations == 1) {
- msg = trn(
- "Please confirm to remove {0} object from 1 relation.",
- "Please confirm to remove {0} objects from 1 relation.",
- numObjectsToDelete, numObjectsToDelete);
- } else {
- msg = trn(
- "Please confirm to remove {0} object from {1} relations.",
- "Please confirm to remove {0} objects from {1} relations.",
- numObjectsToDelete, numObjectsToDelete, numParentRelations);
- }
+ final String msg = "" + msg1 + " " + msg2 + "";
htmlPanel.getEditorPane().setText(msg);
invalidate();
Index: trunk/src/org/openstreetmap/josm/tools/I18n.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/I18n.java (revision 8988)
+++ trunk/src/org/openstreetmap/josm/tools/I18n.java (revision 8989)
@@ -42,4 +42,6 @@
* This annotates strings which do not permit a clean i18n. This is mostly due to strings
* containing two nouns which can occur in singular or plural form.
+ *
+ * No behaviour is associated with this annotation.
*/
@Retention(RetentionPolicy.SOURCE)