Re: quiz(6): update european countries
> On Jul 5, 2022, at 1:51 AM, Otto Moerbeek wrote: > > On Mon, Jul 04, 2022 at 05:44:33PM -0400, Daniel Dickman wrote: > >> >> >>> On Sun, 3 Jul 2022, Daniel Dickman wrote: >>> >>> On Sat, Jul 2, 2022 at 9:26 PM Ben Fuller wrote: I noticed Montenegro doesn't have an entry. Presumably this file hasn't been updated since before 2006! >>> >>> These files could use a big overhaul and are very dated. >>> >>> In the below, make sure to keep the file sorted. >>> >>> In the Europe file there are other issues. For example I think >>> Macedonia is now North Macedonia, etc. >>> >>> There are many issues in the other files. For example africa doesn't >>> have Eswatini, etc, etc. >>> >>> Do you want to take a stab at doing a bigger update of the 4 quiz >>> files? africa, america, europe, asia? >>> >> >> I had some time on my hand and took a stab on this. A few notes: >> >> Added multiple capitals for countries with more than one capital city that >> were missing these: >> - Eswatini >> - South Africa >> - Malaysia >> - Sri Lanka >> >> Removed duplicate entries: >> - Turkey: remove from europe, keep in asia >> - Georgia: remove from europe, keep in asia > > Both are debatable. Certainly Instanbul is in Europe. > Many view Georgia as European. Agree it’s debatable. Agree that politically they may be closer to Europe. But here I followed a geographical classification. > >> >> For the above I followed this wikipedia classification: >> https://en.wikipedia.org/wiki/List_of_sovereign_states_and_dependent_territories_by_continent > > Which list both Georgia and Turkey as European (and Turkey also as > Asian). The tables do, but there is also text in the article which says. “Transcontinental countries in Europe and Asia, classified as West Asian countries by the United Nations Statistics Division: Azerbaijan, Georgia, Kazakhstan, and Turkey (all but Kazakhstan are members of the Council of Europe).” And this is what I followed. We can keep the duplicates though. I don’t feel very strongly about this. > >> africa: >> - removed Dahomey as the the pre-1975 name for Benin; it's been close to >> 50 years since the rename. >> - updated Swaziland -> Eswatini. I left Swaziland since Eswatini rename >> happened in 2018. So going by the Benin example, seems like when we get >> closer to 50 years from the rename we can drop the old name >> - added "The" as an optional prefix for Gambia >> - removed "Republic of" from South Africa for consistency with other >> countries which don't generally include the formal prefix as part of the >> name. >> >> americas: >> - added many missing countries >> - added "The" as an optional prefix for Bahamas >> - added missing suffix of "City" from many capitals like Guatemala, >> Mexico, and Panama >> >> asia: >> - added many missing countries in Oceania (like New Zealand, Fiji, etc) >> - added UAE in addition to United Arab Emirates >> >> europe: >> - added Montenegro >> - added Vatican City >> - renamed Macedonia to North Macedonia >> - Yugoslavia -> Serbia >> >> I also looked at NetBSD a bit and noticed they added a lot of territories >> and their capitals, but I decided not to add those in this update. >> >> I also noticed NetBSD removed The Hague as a capital of The Netherlands, >> but I disagree with that. Maybe some of the Dutch folks on this mailing >> list can weigh in which is right. > > The Dutch constitiution defines Amsterdam as the capital. The Hague > only is the seat of gorvernment. Thanks for confirming.
Re: quiz(6): update european countries
On Mon, Jul 04, 2022 at 05:44:33PM -0400, Daniel Dickman wrote:
>
>
> On Sun, 3 Jul 2022, Daniel Dickman wrote:
>
> > On Sat, Jul 2, 2022 at 9:26 PM Ben Fuller wrote:
> > >
> > > I noticed Montenegro doesn't have an entry. Presumably this file hasn't
> > > been updated since before 2006!
> >
> > These files could use a big overhaul and are very dated.
> >
> > In the below, make sure to keep the file sorted.
> >
> > In the Europe file there are other issues. For example I think
> > Macedonia is now North Macedonia, etc.
> >
> > There are many issues in the other files. For example africa doesn't
> > have Eswatini, etc, etc.
> >
> > Do you want to take a stab at doing a bigger update of the 4 quiz
> > files? africa, america, europe, asia?
> >
>
> I had some time on my hand and took a stab on this. A few notes:
>
> Added multiple capitals for countries with more than one capital city that
> were missing these:
> - Eswatini
> - South Africa
> - Malaysia
> - Sri Lanka
>
> Removed duplicate entries:
> - Turkey: remove from europe, keep in asia
> - Georgia: remove from europe, keep in asia
Both are debatable. Certainly Instanbul is in Europe.
Many view Georgia as European.
>
> For the above I followed this wikipedia classification:
> https://en.wikipedia.org/wiki/List_of_sovereign_states_and_dependent_territories_by_continent
Which list both Georgia and Turkey as European (and Turkey also as
Asian).
> africa:
> - removed Dahomey as the the pre-1975 name for Benin; it's been close to
> 50 years since the rename.
> - updated Swaziland -> Eswatini. I left Swaziland since Eswatini rename
> happened in 2018. So going by the Benin example, seems like when we get
> closer to 50 years from the rename we can drop the old name
> - added "The" as an optional prefix for Gambia
> - removed "Republic of" from South Africa for consistency with other
> countries which don't generally include the formal prefix as part of the
> name.
>
> americas:
> - added many missing countries
> - added "The" as an optional prefix for Bahamas
> - added missing suffix of "City" from many capitals like Guatemala,
> Mexico, and Panama
>
> asia:
> - added many missing countries in Oceania (like New Zealand, Fiji, etc)
> - added UAE in addition to United Arab Emirates
>
> europe:
> - added Montenegro
> - added Vatican City
> - renamed Macedonia to North Macedonia
> - Yugoslavia -> Serbia
>
> I also looked at NetBSD a bit and noticed they added a lot of territories
> and their capitals, but I decided not to add those in this update.
>
> I also noticed NetBSD removed The Hague as a capital of The Netherlands,
> but I disagree with that. Maybe some of the Dutch folks on this mailing
> list can weigh in which is right.
The Dutch constitiution defines Amsterdam as the capital. The Hague
only is the seat of gorvernment.
-Otto
>
> anyone want to ok this update?
>
> Index: africa
> ===
> RCS file: /cvs/src/games/quiz/datfiles/africa,v
> retrieving revision 1.5
> diff -u -p -u -r1.5 africa
> --- africa2 Dec 2014 12:43:09 - 1.5
> +++ africa4 Jul 2022 21:34:34 -
> @@ -1,6 +1,6 @@
> Algeria:Alg[iers|er]
> Angola:Luanda
> -Benin|Dahomey:Porto[-| ]Novo
> +Benin:Porto[-| ]Novo
> Botswana:Gaborone
> Burkina Faso:Ouagadougou
> Burundi:Bujumbura
> @@ -16,9 +16,10 @@ Djibouti:Djibouti City
> Egypt:Cairo
> Equatorial Guinea:Malabo
> Eritrea:Asmara
> +Eswatini|Swaziland:Mbabane|Lobamba
> Ethiopia:Addis Ababa
> Gabon:Libreville
> -Gambia:Banjul
> +{The }Gambia:Banjul
> Ghana:Accra
> Guinea-Bissau:Bissau
> Guinea:Conakry
> @@ -42,10 +43,9 @@ Senegal:Dakar
> Seychelles:Victoria
> Sierra Leone:Freetown
> Somalia:Mogadishu
> -{Rep{ublic} of }South Africa:Pretoria
> +South Africa:Pretoria|Cape Town|Bloemfontein
> South Sudan:Juba
> Sudan:Khartoum
> -Swaziland:Mbabane
> Tanzania:Dodoma
> Togo:Lome
> Tunisia:Tunis
> Index: america
> ===
> RCS file: /cvs/src/games/quiz/datfiles/america,v
> retrieving revision 1.2
> diff -u -p -u -r1.2 america
> --- america 2 Dec 2014 12:43:09 - 1.2
> +++ america 4 Jul 2022 21:34:34 -
> @@ -1,6 +1,8 @@
> +Antigua and Barbuda:St. John's
> Argentina:Buenos Aires
> -Bahamas:Nassau
> +{The }Bahamas:Nassau
> Barbados:Bridgetown
> +Belize:Belmopan
> Bolivia:La Paz|Sucre
> Bra[z|s]il:Brasilia
> Canada:Ottawa
> @@ -8,19 +10,25 @@ Chile:Santiago
> Colombia:Bogota
> Costa Rica:San Jose
> Cuba:Ha[v|b]ana
> +Dominica:Roseau
> Dominican Republic:Santo Domingo
> Ecuador:Quito
> El Salvador:San Salvador
> -Guatemala:Guatemala
> +Greenland:Nuuk
> +Grenada:St. George's
> +Guatemala:Guatemala City
> Guyana:Georgetown
> -Haiti:Port au Prince
> +Haiti:Port[-| ]au[-| ]Prince
> Honduras:Tegucigalpa
> Jamaica:Kingston
> -Mexico:Mexico
> +Mexico:Mexico City
> Nicaragua:Managua
> -Panama:Panama
> +Panama:Panama
Re: quiz(6): update european countries
On Mon, Jul 4, 2022 at 8:09 PM Daniel Dickman wrote:
>
>
>
> > On Jul 4, 2022, at 8:07 PM, Ben Fuller wrote:
> >
> > On Mon, Jul 04, 2022 at 19:30:19 -0400, Daniel Dickman wrote:
> Maldive Islands:Male
> >>> A more common name is just "{The }Maldives".
> >>
> >> I don't think so. See this article:
> >> https://www.bbc.com/news/magazine-18233844
> >>
> >> which states:
> >>
> >> "...according to several authoritative sources, such as the CIA World
> >> Factbook, the Times Comprehensive Atlas of the World and the US Department
> >> of State, only two countries, The Bahamas and The Gambia, should
> >> officially be referred to with the article."
> >
> > That may be so, but for the purposes of a quiz game, if I am asked "of
> > what country is Male the capital", I would answer The Maldives, and
> > would be annoyed if that was marked incorrect because only "Maldive
> > Islands" is accepted. Also, the official name is "Republic of Maldives"
> > or just "Maldives". The point is that this is a game, not a precise
> > database.
>
>
> No you would answer “the Maldives” because it is a group of island. Not “The
> Maldives” (note the capital T) which is not the name of the country.
>
> I’m afraid I still don’t agree with you.
Rereading what you wrote, I agree the NetBSD approach is better than
our current approach of "Maldive Islands". So my local diff now has
the same as NetBSD:
Maldiv{e Island}s:Male
For the prefix "The" -- we also do not have "The United States of
America" or "The Sudan" or "The Philippines" and similar. So I don't
think the optional prefix "The" should be added except for the 2
official cases.
Re: quiz(6): update european countries
> On Jul 4, 2022, at 8:07 PM, Ben Fuller wrote:
>
> On Mon, Jul 04, 2022 at 19:30:19 -0400, Daniel Dickman wrote:
Maldive Islands:Male
>>> A more common name is just "{The }Maldives".
>>
>> I don't think so. See this article:
>> https://www.bbc.com/news/magazine-18233844
>>
>> which states:
>>
>> "...according to several authoritative sources, such as the CIA World
>> Factbook, the Times Comprehensive Atlas of the World and the US Department
>> of State, only two countries, The Bahamas and The Gambia, should
>> officially be referred to with the article."
>
> That may be so, but for the purposes of a quiz game, if I am asked "of
> what country is Male the capital", I would answer The Maldives, and
> would be annoyed if that was marked incorrect because only "Maldive
> Islands" is accepted. Also, the official name is "Republic of Maldives"
> or just "Maldives". The point is that this is a game, not a precise
> database.
No you would answer “the Maldives” because it is a group of island. Not “The
Maldives” (note the capital T) which is not the name of the country.
I’m afraid I still don’t agree with you.
Re: quiz(6): update european countries
On Mon, 4 Jul 2022, Ben Fuller wrote:
> On Mon, Jul 04, 2022 at 17:44:33 -0400, Daniel Dickman wrote:
> > I had some time on my hand and took a stab on this. A few notes:
>
> Ach, you beat me to sending a patch. I made almost exactly the same changes as
> you have. I've noted some of my thoughts below.
>
> > I also looked at NetBSD a bit and noticed they added a lot of territories
> > and their capitals, but I decided not to add those in this update.
>
> I wonder what their opinion on Kosovo was.
I've left out disputed areas in this update.
>
> > Maldive Islands:Male
>
> A more common name is just "{The }Maldives".
I don't think so. See this article:
https://www.bbc.com/news/magazine-18233844
which states:
"...according to several authoritative sources, such as the CIA World
Factbook, the Times Comprehensive Atlas of the World and the US Department
of State, only two countries, The Bahamas and The Gambia, should
officially be referred to with the article."
>
> > Netherlands|Holland:The Hague|'sGravenhage|den Haag|Amsterdam
>
> To the best of my knowledge, Amsterdam is the formal capital (perhaps it
> should come first in the alternatives) but for the purposes of a quiz
> game I think The Hague is also an acceptable answer.
Researching this more, I feel like I'm coming into agreement with the
NetBSD change after all about removing The Hague.
>
> > R[u|o]mania:Bucharest|Bucuresti
>
> Perhaps switch the order of [u|o] here so that Romania is printed (the
> more common spelling, I think)
I think it's right to make it Romania. Rumania is common in non-English
languages and my internet research leads me to believe that Romania is the
official anglicization preferred by the Romanian government (at least
according to their consulate web pages that I visited).
>
> > Ukraine:Kiev|Kyiv
> There's been some commotion about preferring the Ukrainian spelling Kyiv to
> the
> Russian Kiev.
>
Maybe let's leave for a separate commit as I want to steer clear of
contentious issues.
I do note this reference which I've read through:
https://en.wikipedia.org/wiki/KyivNotKiev
And again, I see the spelling as Kyiv on the English section of a .ua govt
site I visited.
Re: quiz(6): update european countries
On Mon, Jul 04, 2022 at 05:44:33PM -0400, Daniel Dickman wrote: > I also noticed NetBSD removed The Hague as a capital of The Netherlands, > but I disagree with that. Maybe some of the Dutch folks on this mailing > list can weigh in which is right. Amsterdam is the capital, The Hague is the seat of government. Similar to what Germany had for a while after the reunion with Bonn as seat of government and Berlin as capital. There are a couple of other examples like that. Joerg
Re: quiz(6): update european countries
On Sun, 3 Jul 2022, Daniel Dickman wrote:
> On Sat, Jul 2, 2022 at 9:26 PM Ben Fuller wrote:
> >
> > I noticed Montenegro doesn't have an entry. Presumably this file hasn't
> > been updated since before 2006!
>
> These files could use a big overhaul and are very dated.
>
> In the below, make sure to keep the file sorted.
>
> In the Europe file there are other issues. For example I think
> Macedonia is now North Macedonia, etc.
>
> There are many issues in the other files. For example africa doesn't
> have Eswatini, etc, etc.
>
> Do you want to take a stab at doing a bigger update of the 4 quiz
> files? africa, america, europe, asia?
>
I had some time on my hand and took a stab on this. A few notes:
Added multiple capitals for countries with more than one capital city that
were missing these:
- Eswatini
- South Africa
- Malaysia
- Sri Lanka
Removed duplicate entries:
- Turkey: remove from europe, keep in asia
- Georgia: remove from europe, keep in asia
For the above I followed this wikipedia classification:
https://en.wikipedia.org/wiki/List_of_sovereign_states_and_dependent_territories_by_continent
africa:
- removed Dahomey as the the pre-1975 name for Benin; it's been close to
50 years since the rename.
- updated Swaziland -> Eswatini. I left Swaziland since Eswatini rename
happened in 2018. So going by the Benin example, seems like when we get
closer to 50 years from the rename we can drop the old name
- added "The" as an optional prefix for Gambia
- removed "Republic of" from South Africa for consistency with other
countries which don't generally include the formal prefix as part of the
name.
americas:
- added many missing countries
- added "The" as an optional prefix for Bahamas
- added missing suffix of "City" from many capitals like Guatemala,
Mexico, and Panama
asia:
- added many missing countries in Oceania (like New Zealand, Fiji, etc)
- added UAE in addition to United Arab Emirates
europe:
- added Montenegro
- added Vatican City
- renamed Macedonia to North Macedonia
- Yugoslavia -> Serbia
I also looked at NetBSD a bit and noticed they added a lot of territories
and their capitals, but I decided not to add those in this update.
I also noticed NetBSD removed The Hague as a capital of The Netherlands,
but I disagree with that. Maybe some of the Dutch folks on this mailing
list can weigh in which is right.
anyone want to ok this update?
Index: africa
===
RCS file: /cvs/src/games/quiz/datfiles/africa,v
retrieving revision 1.5
diff -u -p -u -r1.5 africa
--- africa 2 Dec 2014 12:43:09 - 1.5
+++ africa 4 Jul 2022 21:34:34 -
@@ -1,6 +1,6 @@
Algeria:Alg[iers|er]
Angola:Luanda
-Benin|Dahomey:Porto[-| ]Novo
+Benin:Porto[-| ]Novo
Botswana:Gaborone
Burkina Faso:Ouagadougou
Burundi:Bujumbura
@@ -16,9 +16,10 @@ Djibouti:Djibouti City
Egypt:Cairo
Equatorial Guinea:Malabo
Eritrea:Asmara
+Eswatini|Swaziland:Mbabane|Lobamba
Ethiopia:Addis Ababa
Gabon:Libreville
-Gambia:Banjul
+{The }Gambia:Banjul
Ghana:Accra
Guinea-Bissau:Bissau
Guinea:Conakry
@@ -42,10 +43,9 @@ Senegal:Dakar
Seychelles:Victoria
Sierra Leone:Freetown
Somalia:Mogadishu
-{Rep{ublic} of }South Africa:Pretoria
+South Africa:Pretoria|Cape Town|Bloemfontein
South Sudan:Juba
Sudan:Khartoum
-Swaziland:Mbabane
Tanzania:Dodoma
Togo:Lome
Tunisia:Tunis
Index: america
===
RCS file: /cvs/src/games/quiz/datfiles/america,v
retrieving revision 1.2
diff -u -p -u -r1.2 america
--- america 2 Dec 2014 12:43:09 - 1.2
+++ america 4 Jul 2022 21:34:34 -
@@ -1,6 +1,8 @@
+Antigua and Barbuda:St. John's
Argentina:Buenos Aires
-Bahamas:Nassau
+{The }Bahamas:Nassau
Barbados:Bridgetown
+Belize:Belmopan
Bolivia:La Paz|Sucre
Bra[z|s]il:Brasilia
Canada:Ottawa
@@ -8,19 +10,25 @@ Chile:Santiago
Colombia:Bogota
Costa Rica:San Jose
Cuba:Ha[v|b]ana
+Dominica:Roseau
Dominican Republic:Santo Domingo
Ecuador:Quito
El Salvador:San Salvador
-Guatemala:Guatemala
+Greenland:Nuuk
+Grenada:St. George's
+Guatemala:Guatemala City
Guyana:Georgetown
-Haiti:Port au Prince
+Haiti:Port[-| ]au[-| ]Prince
Honduras:Tegucigalpa
Jamaica:Kingston
-Mexico:Mexico
+Mexico:Mexico City
Nicaragua:Managua
-Panama:Panama
+Panama:Panama City
Paraguay:Asuncion
Peru:Lima
+Saint Lucia:Castries
+Saint Vincent and the Grenadines:Kingstown
+Suriname:Paramaribo
Trinidad{ and Tobago}:Port of Spain
United States|US{A}:Washington
Uruguay:Montevideo
Index: asia
===
RCS file: /cvs/src/games/quiz/datfiles/asia,v
retrieving revision 1.5
diff -u -p -u -r1.5 asia
--- asia24 Nov 2014 06:31:50 - 1.5
+++ asia4 Jul 2022 21:34:34 -
@@ -10,6 +10,7 @@ Cambodia:P{h}nom Penh
China:Beijing|Peking
Cyprus:Nicosia
East Timor:Dili
+Fiji:Suva
Georgia:Tbilisi
India:New Delhi
Re: quiz(6): update european countries
On Sat, Jul 2, 2022 at 9:26 PM Ben Fuller wrote:
>
> I noticed Montenegro doesn't have an entry. Presumably this file hasn't
> been updated since before 2006!
These files could use a big overhaul and are very dated.
In the below, make sure to keep the file sorted.
In the Europe file there are other issues. For example I think
Macedonia is now North Macedonia, etc.
There are many issues in the other files. For example africa doesn't
have Eswatini, etc, etc.
Do you want to take a stab at doing a bigger update of the 4 quiz
files? africa, america, europe, asia?
>
> diff --git games/quiz/datfiles/europe games/quiz/datfiles/europe
> index 83af7320713..fec2746c3b2 100644
> --- games/quiz/datfiles/europe
> +++ games/quiz/datfiles/europe
> @@ -27,6 +27,7 @@ Luxembourg:Luxembourg
> Malta:Valletta
> Moldova:Chisinau|Kishinev
> Monaco:Monaco
> +Montenegro:Podgori[ca|tsa]
> Netherlands|Holland:The Hague|'sGravenhage|den Haag|Amsterdam
> Norway:Oslo
> Poland:Wars[aw|zawa]
> @@ -41,4 +42,4 @@ Sweden:Stockholm
> Switzerland:Bern{e}
> Turkey:Ankara
> Ukraine:Kiev|Kyiv
> -Yugoslavia:Belgrade|Beograd
> +Serbia:Belgrade|Beograd
>
