[tor-bugs] #4809 [Metrics Website]: use less political country names on metrics pages
Tor Bug Tracker & Wiki
torproject-admin at torproject.org
Thu Jan 5 17:54:16 UTC 2012
#4809: use less political country names on metrics pages
-----------------------------+----------------------------------------------
Reporter: arma | Owner: karsten
Type: defect | Status: new
Priority: normal | Milestone:
Component: Metrics Website | Version:
Keywords: | Parent:
Points: | Actualpoints:
-----------------------------+----------------------------------------------
Comment(by karsten):
Here are the changes when we use country names that Wikipedia tells us:
{{{
diff --git a/rserve/graphs.R b/rserve/graphs.R
index 886fabf..2900c02 100644
--- a/rserve/graphs.R
+++ b/rserve/graphs.R
@@ -27,7 +27,7 @@ countrylist <- list(
"bj" = "Benin",
"bl" = "Saint Bartelemey",
"bm" = "Bermuda",
- "bn" = "Brunei Darussalam",
+ "bn" = "Brunei",
"bo" = "Bolivia",
"br" = "Brazil",
"bs" = "the Bahamas",
@@ -42,7 +42,7 @@ countrylist <- list(
"cf" = "Central African Republic",
"cg" = "Congo",
"ch" = "Switzerland",
- "ci" = "Cote d'Ivoire",
+ "ci" = "Côte d'Ivoire",
"ck" = "the Cook Islands",
"cl" = "Chile",
"cm" = "Cameroon",
@@ -106,7 +106,7 @@ countrylist <- list(
"in" = "India",
"io" = "the British Indian Ocean Territory",
"iq" = "Iraq",
- "ir" = "the Islamic Republic of Iran",
+ "ir" = "Iran",
"is" = "Iceland",
"it" = "Italy",
"je" = "Jersey",
@@ -119,12 +119,12 @@ countrylist <- list(
"ki" = "Kiribati",
"km" = "Comoros",
"kn" = "Saint Kitts and Nevis",
- "kp" = "the Democratic People's Republic of Korea",
+ "kp" = "North Korea",
"kr" = "the Republic of Korea",
"kw" = "Kuwait",
"ky" = "the Cayman Islands",
"kz" = "Kazakhstan",
- "la" = "Lao People's Democratic Republic",
+ "la" = "Laos",
"lb" = "Lebanon",
"lc" = "Saint Lucia",
"li" = "Liechtenstein",
@@ -144,9 +144,9 @@ countrylist <- list(
"mh" = "the Marshall Islands",
"mk" = "Macedonia",
"ml" = "Mali",
- "mm" = "Myanmar",
+ "mm" = "Burma",
"mn" = "Mongolia",
- "mo" = "Macao",
+ "mo" = "Macau",
"mp" = "the Northern Mariana Islands",
"mq" = "Martinique",
"mr" = "Mauritania",
@@ -179,7 +179,7 @@ countrylist <- list(
"pk" = "Pakistan",
"pl" = "Poland",
"pm" = "Saint Pierre and Miquelon",
- "pn" = "Pitcairn",
+ "pn" = "the Pitcairn Islands",
"pr" = "Puerto Rico",
"ps" = "the Palestinian Territory",
"pt" = "Portugal",
@@ -189,7 +189,7 @@ countrylist <- list(
"re" = "Reunion",
"ro" = "Romania",
"rs" = "Serbia",
- "ru" = "the Russian Federation",
+ "ru" = "Russia",
"rw" = "Rwanda",
"sa" = "Saudi Arabia",
"sb" = "the Solomon Islands",
@@ -206,7 +206,7 @@ countrylist <- list(
"sn" = "Senegal",
"so" = "Somalia",
"sr" = "Suriname",
- "st" = "Sao Tome and Principe",
+ "st" = "São Tomé and Príncipe",
"sv" = "El Salvador",
"sy" = "the Syrian Arab Republic",
"sz" = "Swaziland",
@@ -217,7 +217,7 @@ countrylist <- list(
"th" = "Thailand",
"tj" = "Tajikistan",
"tk" = "Tokelau",
- "tl" = "Timor-Leste",
+ "tl" = "East Timor",
"tm" = "Turkmenistan",
"tn" = "Tunisia",
"to" = "Tonga",
@@ -232,7 +232,7 @@ countrylist <- list(
"us" = "the United States",
"uy" = "Uruguay",
"uz" = "Uzbekistan",
- "va" = "Vatican City State",
+ "va" = "Vatican City",
"vc" = "Saint Vincent and the Grenadines",
"ve" = "Venezuela",
"vg" = "the British Virgin Islands",
}}}
--
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/4809#comment:7>
Tor Bug Tracker & Wiki <https://trac.torproject.org/>
The Tor Project: anonymity online
More information about the tor-bugs
mailing list