commit 5c2b14e03294ffa00880d1b1e75da276aed2faa9 Author: Karsten Loesing karsten.loesing@gmx.net Date: Wed Jan 11 12:30:26 2012 +0100

Fix country names containing non-ASCII chars.

Fixes #4887. --- src/org/torproject/ernie/web/Countries.java | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/org/torproject/ernie/web/Countries.java b/src/org/torproject/ernie/web/Countries.java index 4411834..7b208c7 100644 --- a/src/org/torproject/ernie/web/Countries.java +++ b/src/org/torproject/ernie/web/Countries.java @@ -72,7 +72,7 @@ public class Countries { this.knownCountries.add("cg;Congo".split(";")); this.knownCountries.add("ck;Cook Islands".split(";")); this.knownCountries.add("cr;Costa Rica".split(";")); - this.knownCountries.add("ci;Côte d'Ivoire".split(";")); + this.knownCountries.add("ci:Côte d'Ivoire".split(":")); this.knownCountries.add("hr;Croatia".split(";")); this.knownCountries.add("cu;Cuba".split(";")); this.knownCountries.add("cy;Cyprus".split(";")); @@ -215,7 +215,8 @@ public class Countries { split(";")); this.knownCountries.add("ws;Samoa".split(";")); this.knownCountries.add("sm;San Marino".split(";")); - this.knownCountries.add("st;São Tomé and Príncipe".split(";")); + this.knownCountries.add("st:São Tomé and Príncipe". + split(":")); this.knownCountries.add("sa;Saudi Arabia".split(";")); this.knownCountries.add("sn;Senegal".split(";")); this.knownCountries.add("rs;Serbia".split(";"));