see #18864 - I18n.format: fix strings containing apostrophe U+0027

simon04 · simon04 · commit bf2191fc4a1e · 2020-03-06T22:53:35.000Z
git-svn-id: https://josm.openstreetmap.de/svn/trunk@16049 0c6e7542-c601-0410-84e7-c038aed88b3b
diff --git a/src/org/openstreetmap/josm/tools/I18n.java b/src/org/openstreetmap/josm/tools/I18n.java
@@ -156,7 +156,7 @@ private enum PluralMode {
             "name:(\\p{Lower}{2,3})(?:[-_](?i:(" + String.join("|", HIRAGANA, KATAKANA, LATIN, PINYIN, ROMAJI) + ")))?");
 
     private static String format(String text, Object... objects) {
-        if (objects.length == 0) {
+        if (objects.length == 0 && !text.contains("'")) {
             return text;
         }
         try {

Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ private enum PluralMode {`
`156`	`156`	`"name:(\\p{Lower}{2,3})(?:[-_](?i:(" + String.join("\|", HIRAGANA, KATAKANA, LATIN, PINYIN, ROMAJI) + ")))?");`
`157`	`157`
`158`	`158`	`private static String format(String text, Object... objects) {`
`159`		`- if (objects.length == 0) {`
	`159`	`+ if (objects.length == 0 && !text.contains("'")) {`
`160`	`160`	`return text;`
`161`	`161`	`}`
`162`	`162`	`try {`