From a99d9512ca12426600811d5cfe83e0b99178a985 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20Osland?= Date: Mon, 17 Jun 2024 10:59:40 +0200 Subject: [PATCH 1/8] Update no_municipalities.py The counties in norway was changed in 2024 update the list to reflect those changes. https://en.wikipedia.org/wiki/Counties_of_Norway#List_of_counties --- localflavor/no/no_municipalities.py | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/localflavor/no/no_municipalities.py b/localflavor/no/no_municipalities.py index 1053f9653..0891ed6d2 100644 --- a/localflavor/no/no_municipalities.py +++ b/localflavor/no/no_municipalities.py @@ -1,25 +1,21 @@ #: An alphabetical list of Norwegian municipalities (fylker) for #: use as `choices` in a formfield. MUNICIPALITY_CHOICES = ( + ('agder', 'Agder'), ('akershus', 'Akershus'), - ('austagder', 'Aust-Agder'), ('buskerud', 'Buskerud'), ('finnmark', 'Finnmark'), - ('hedmark', 'Hedmark'), - ('hordaland', 'Hordaland'), + ('innlandet', 'Innlandet'), ('janmayen', 'Jan Mayen'), ('moreogromsdal', 'Møre og Romsdal'), - ('nordtrondelag', 'Nord-Trøndelag'), ('nordland', 'Nordland'), - ('oppland', 'Oppland'), ('oslo', 'Oslo'), + ('ostfold', 'Østfold'), ('rogaland', 'Rogaland'), - ('sognogfjordane', 'Sogn og Fjordane'), ('svalbard', 'Svalbard'), - ('sortrondelag', 'Sør-Trøndelag'), ('telemark', 'Telemark'), ('troms', 'Troms'), - ('vestagder', 'Vest-Agder'), + ('trondelag', 'Trøndelag'), ('vestfold', 'Vestfold'), - ('ostfold', 'Østfold') + ('vestland', 'Vestland') ) From 80bb0edcedafdceee415fa75b8c9a4f6a9045fe6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20Osland?= Date: Mon, 17 Jun 2024 11:27:19 +0200 Subject: [PATCH 2/8] Add my name to list of authors --- docs/authors.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/authors.rst b/docs/authors.rst index 4e41ef554..f570feb93 100644 --- a/docs/authors.rst +++ b/docs/authors.rst @@ -62,6 +62,7 @@ Authors * Heri Priyatno * Honza Král * Horst Gutmann +* Håkon Osland * Igor Támara * Illia Volochii * Ivan Fisun From 3aada6d14b9da13654b0581ec4a6e7dec98d890c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20Osland?= Date: Mon, 17 Jun 2024 12:29:17 +0200 Subject: [PATCH 3/8] Update changelog.rst --- docs/changelog.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/changelog.rst b/docs/changelog.rst index 642acdd8a..7f4aed114 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -17,6 +17,7 @@ Modifications to existing flavors: - Fix Belarus passport field description punctuation (`gh-484 `_). - Change `Kiev` to `Kyiv` 🇺🇦 according to ISO_3166-2:UA +- Update list of Norwegian counties(fylker) `according to changes at the start of 2024 `_ Other changes: From fad39df415787e7cba7b50f2d3d9a6ae1d3a40ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20Osland?= Date: Mon, 17 Jun 2024 12:32:30 +0200 Subject: [PATCH 4/8] Update changelog.rst --- docs/changelog.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index 7f4aed114..8150a799b 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -17,7 +17,7 @@ Modifications to existing flavors: - Fix Belarus passport field description punctuation (`gh-484 `_). - Change `Kiev` to `Kyiv` 🇺🇦 according to ISO_3166-2:UA -- Update list of Norwegian counties(fylker) `according to changes at the start of 2024 `_ +- Update list of Norwegian counties(fylker) `according to changes at the start of 2024 `_ (`gh-509 `_) Other changes: From c73dd7bbbbfce2ae9d9d4901106734e06aa0b78b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20Osland?= Date: Mon, 17 Jun 2024 12:50:46 +0200 Subject: [PATCH 5/8] Fix test of municipality select --- tests/test_no.py | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/tests/test_no.py b/tests/test_no.py index a643141e2..10d219b8c 100644 --- a/tests/test_no.py +++ b/tests/test_no.py @@ -75,26 +75,22 @@ def test_NOMunicipalitySelect(self): with override('en'): f = NOMunicipalitySelect() out = '''''' self.assertHTMLEqual(f.render('municipalities', 'akershus'), out) From 5defd5dcb911470830c223e6935eccbadd2c5a0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20Osland?= Date: Mon, 17 Jun 2024 14:36:31 +0200 Subject: [PATCH 6/8] changelog to include a list of all the counties that were changed, and to what they are changed --- docs/changelog.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/changelog.rst b/docs/changelog.rst index 8150a799b..3f1ea101a 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -18,6 +18,7 @@ Modifications to existing flavors: (`gh-484 `_). - Change `Kiev` to `Kyiv` 🇺🇦 according to ISO_3166-2:UA - Update list of Norwegian counties(fylker) `according to changes at the start of 2024 `_ (`gh-509 `_) + The changed counties are as follows: austagder and vestagder has been removed and combined into agder. hordaland and sognogfjordane has been removed and combined into vestland. nordtrondelag and sortrondelag has been removed and combined into trondelag. hedmark and oppland has been removed and combined into innlandet Other changes: From 1ee51bb6e3f40f15bf36e2a615449aee3a01d700 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20Osland?= Date: Mon, 17 Jun 2024 14:41:54 +0200 Subject: [PATCH 7/8] Update formatting in changelog --- docs/changelog.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index 3f1ea101a..809c76237 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -17,8 +17,9 @@ Modifications to existing flavors: - Fix Belarus passport field description punctuation (`gh-484 `_). - Change `Kiev` to `Kyiv` 🇺🇦 according to ISO_3166-2:UA -- Update list of Norwegian counties(fylker) `according to changes at the start of 2024 `_ (`gh-509 `_) +- Update list of Norwegian counties(fylker) `according to changes at the start of 2024 `_ The changed counties are as follows: austagder and vestagder has been removed and combined into agder. hordaland and sognogfjordane has been removed and combined into vestland. nordtrondelag and sortrondelag has been removed and combined into trondelag. hedmark and oppland has been removed and combined into innlandet + (`gh-509 `_). Other changes: From c499ef4d1c7087122a3e12b1836a2f8860a20e35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20Osland?= Date: Wed, 26 Jun 2024 11:03:23 +0200 Subject: [PATCH 8/8] Fix test --- tests/test_no.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_no.py b/tests/test_no.py index 10d219b8c..3a1044684 100644 --- a/tests/test_no.py +++ b/tests/test_no.py @@ -93,4 +93,4 @@ def test_NOMunicipalitySelect(self): ''' - self.assertHTMLEqual(f.render('municipalities', 'akershus'), out) + self.assertHTMLEqual(f.render('municipalities', 'agder'), out)