From f736d64743cf15def08ffabfee6bcf959c9c175c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20D=C3=B6rre?= Date: Wed, 5 Nov 2014 10:16:20 +0100 Subject: [PATCH] FIX: a bug in evaluating sprintf-template-statments --- src/org/cacert/gigi/output/template/SprintfCommand.java | 2 +- tests/org/cacert/gigi/template/TestTemplate.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/org/cacert/gigi/output/template/SprintfCommand.java b/src/org/cacert/gigi/output/template/SprintfCommand.java index 2d174d31..17ef23a8 100644 --- a/src/org/cacert/gigi/output/template/SprintfCommand.java +++ b/src/org/cacert/gigi/output/template/SprintfCommand.java @@ -21,7 +21,7 @@ public final class SprintfCommand implements Outputable { @Override public void output(PrintWriter out, Language l, Map vars) { - String[] parts = l.getTranslation(text).split("%s"); + String[] parts = l.getTranslation(text).split("%s", -1); String[] myvars = store.toArray(new String[store.size()]); out.print(HTMLEncoder.encodeHTML(parts[0])); for (int j = 1; j < parts.length; j++) { diff --git a/tests/org/cacert/gigi/template/TestTemplate.java b/tests/org/cacert/gigi/template/TestTemplate.java index 19b8768d..50b1d693 100644 --- a/tests/org/cacert/gigi/template/TestTemplate.java +++ b/tests/org/cacert/gigi/template/TestTemplate.java @@ -56,6 +56,7 @@ public class TestTemplate { assertEquals("This val\"> val3<\" the val4> textl", testExecute(Language.getInstance(Locale.ENGLISH), vars, "l")); assertEquals("This blargh<>!, <>! textl", testExecute(Language.getInstance(Locale.ENGLISH), vars, "!\",!\"<>!\",This %s, %s text?>l")); + assertEquals("This blargh<>!, <>!l", testExecute(Language.getInstance(Locale.ENGLISH), vars, "!\",!\"<>!\",This %s, %s?>l")); } @Test -- 2.39.2