commit f81633a22621f6a0c4a53468975edc1eeb62b4fc Author: Karsten Loesing karsten.loesing@gmx.net Date: Thu Aug 25 13:06:57 2011 +0200

Tweak list of country names. --- rserve/graphs.R | 2 +- src/org/torproject/ernie/web/Countries.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/rserve/graphs.R b/rserve/graphs.R index c6ba4fd..ffdbdd6 100644 --- a/rserve/graphs.R +++ b/rserve/graphs.R @@ -134,7 +134,7 @@ countrylist <- list( "lt" = "Lithuania", "lu" = "Luxembourg", "lv" = "Latvia", - "ly" = "Libyan Arab Jamahiriya", + "ly" = "Libya", "ma" = "Morocco", "mc" = "Monaco", "md" = "the Republic of Moldova", diff --git a/src/org/torproject/ernie/web/Countries.java b/src/org/torproject/ernie/web/Countries.java index 6829488..7149cfb 100644 --- a/src/org/torproject/ernie/web/Countries.java +++ b/src/org/torproject/ernie/web/Countries.java @@ -52,6 +52,7 @@ public class Countries { this.knownCountries.add("bn;Brunei Darussalam".split(";")); this.knownCountries.add("bg;Bulgaria".split(";")); this.knownCountries.add("bf;Burkina Faso".split(";")); + this.knownCountries.add("mm;Burma".split(";")); this.knownCountries.add("bi;Burundi".split(";")); this.knownCountries.add("kh;Cambodia".split(";")); this.knownCountries.add("cm;Cameroon".split(";")); @@ -147,7 +148,7 @@ public class Countries { this.knownCountries.add("lb;Lebanon".split(";")); this.knownCountries.add("ls;Lesotho".split(";")); this.knownCountries.add("lr;Liberia".split(";")); - this.knownCountries.add("ly;Libyan Arab Jamahiriya".split(";")); + this.knownCountries.add("ly;Libya".split(";")); this.knownCountries.add("li;Liechtenstein".split(";")); this.knownCountries.add("lt;Lithuania".split(";")); this.knownCountries.add("lu;Luxembourg".split(";"));