dev/core#2027 Add/update to UK county list

[JKingsnorth]

See https://lab.civicrm.org/dev/core/-/issues/2027

[civibot]

(Standard links)

• If this is your first pull-request for CiviCRM, please browse CONTRIBUTING.md for information about the development and testing processes.
• If you are reviewing this pull-request, you may wish to consult the test sites and the Review Standards (long template, short template).

[eileenmcnaughton]

This doesn't need a test IHMO - it's mostly checking the changes seem right.

[seamuslee001]

@MikeyMJCO does this look right to you?

[seamuslee001]

Test fails relate and also @JKingsnorth should there be an update statement for the ones you are correcting rather than just inserting?

[eileenmcnaughton]

I think the previous line is missing a semi-colon, causing the test fails

[JKingsnorth]

@seamuslee001 the reason for not doing an update/delete on the changed ones is explained here: https://lab.civicrm.org/dev/core/-/issues/2027 (they're not geographically equivalent).

But really the 'renamed' ones should be added as part of the update still - so I'll make that change.

[JKingsnorth]

Added the renamed counties as part of the upgrade script. Please see https://lab.civicrm.org/dev/core/-/issues/2027 for comments and discussion.

[eileenmcnaughton]

@MikeyMJCO if you give this the thumbs up I will merge....

[homotechsual]

I do :-)

[seamuslee001]

@JKingsnorth can you rebase this please

[homotechsual]

I have one very minor gripe, Rhondda, Cynon, Taff the official usage is Rhondda Cynon Taf though I believe the comma separated non-Welsh taff spelling is the ISO one. I would prefer the correct/official usage. https://www.rctcbc.gov.uk/

[eileenmcnaughton]

argh @JKingsnorth it's stale again - sorry!

[JKingsnorth]

@eileenmcnaughton - Rebased! (pesky civicrm_generated.mysql...)

@MikeyMJCO - going back to what we were talking about 'standardising on the ISO list', yes it has the commas in the ISO list (https://www.iso.org/obp/ui/#iso:code:3166:GB) and it even has the commas in the 'Welsh language' version it supplies on that list as well, which is probably wrong!

I think, as with other areas, we should leave it with the ISO values to keep consistency? Even though this is counter-intuitive, when people actually know better than the standard.

(And maybe write to ISO and get them to change their standard :P)

p.s. I've learnt my lesson not to touch state_province in core ever again, there are bigger fish to fry :P

[homotechsual]

@eileenmcnaughton - Rebased! (pesky civicrm_generated.mysql...)

@MikeyMJCO - going back to what we were talking about 'standardising on the ISO list', yes it has the commas in the ISO list (https://www.iso.org/obp/ui/#iso:code:3166:GB) and it even has the commas in the 'Welsh language' version it supplies on that list as well, which is probably wrong!

I think, as with other areas, we should leave it with the ISO values to keep consistency? (And maybe write to ISO and get them to change their standard :P)

Sure, I'll poke the Data Management team at Welsh Government and get it on their radar.