Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update British Monarchs and Prime Ministers History files and Create a New Zealand Prime Ministers History File #4978

Merged
merged 17 commits into from
Sep 13, 2024

Conversation

RAMINCNZ
Copy link
Contributor

@RAMINCNZ RAMINCNZ commented Apr 9, 2024

A small start to my contributions to WebTrees..

These files have been operational on my site so hopefully will be ok to add to main..

My apologies if I have created errors in the process, haven't quite got my head round modifying files and Commits and Pulls.. I do hope I have it right at this point

Updated The Above files added one and modified ModuleService.php to include line for New Zealand Prime Ministers

Rick Malkin

New Zealand - Nu Tirani

Updated to include the death of HM Queen Elizabeth II and also added HM King Charles III
Added last two British Prime Ministers so file is now current
Premiers & Prime Ministers of New Zealand
Added new line to use the New Zealand Prime Ministers History File
Add the extra line to allow New Zealand Prime Ministers History File to work!
Edited and updated file to include Charles III as current Monarch
@arbor95
Copy link
Contributor

arbor95 commented Aug 13, 2024

What is the reason for not including this pull request?

@kiwi3685
Copy link
Contributor

What is the reason for not including this pull request?

I don't know Greg's reason (workload?), but I see a few possible issues:

  • British Prime Minister list is out of date now.
  • Use of nicknames. Is that required? If yes, I think they should be in escaped double-quotes, not single. I wouldn't use them myself. Notes might be better?.
  • Use of Nu Tirani as New Zealand's alternative/ Maori name is very controversial. Very rarely, if ever, seen or used. Most people would use Aotearoa. It might be useful in a Māori language version, combined with a full Māori translation file.

@fisharebest
Copy link
Owner

I don't know Greg's reason (workload?)

The Kings/Queens are fine - but I can't accept just part of a PR.

The new names are all inconsistent with existing ones - why Mary Elizabeth Truss, and not Alexander Boris dePfeffel Johnston?)

Maybe the full/legal names are OK for the NZ data?

Use of Nu Tirani as New Zealand's alternative/ Maori name is very controversial. Very rarely, if ever, seen or used. Most people would use Aotearoa.

This is a question for the New Zealanders to answer.

@RAMINCNZ
Copy link
Contributor Author

What is the reason for not including this pull request?

I don't know Greg's reason (workload?), but I see a few possible issues:

* British Prime Minister list is out of date now.

When I first added these files everything was current. It would not be that hard to update (my fault for not doing so earlier) as each new Prime Minister came into 'power'. And the current British PM list is by far more out of date than this one.

* Use of nicknames. Is that required? If yes, I think they should be in escaped double-quotes, not single. I wouldn't use them myself. Notes might be better?.

Nicknames are not required, however for those that do have them, as I understand, their nicknames were used publicly (in the Media etc) quite often. Notes might be a better way of providing the info. I have started adding notes to the Monarchs file.. It is pretty much a link to the individuals page on Wikipedia. I could if desired do this with the PMs files too..

* Use of Nu Tirani as New Zealand's alternative/ Maori name is very controversial. Very rarely, if ever, seen or used. Most people would use Aotearoa. It might be useful in a Māori language version, combined with a full Māori translation file.

It may be controversial. I can accept that. And for sure it can be removed. It is my personal choice to use Nu Tirani NOT Aotearoa..

I'm still new at this game and do not want to create 'issues' within the community..

Rick Malkin
New Zealand

@RAMINCNZ
Copy link
Contributor Author

RAMINCNZ commented Aug 25, 2024

I don't know Greg's reason (workload?)

The Kings/Queens are fine - but I can't accept just part of a PR.

The new names are all inconsistent with existing ones - why Mary Elizabeth Truss, and not Alexander Boris dePfeffel Johnston?)

Maybe the full/legal names are OK for the NZ data?

I cannot quite recall how I got 'full names' for those that have them. IT could have been from the Wikipedia pages. These could be standardised for consistency. I guess having full names might be consistent with how we our 'family data' could be deemed a standard. Worthy of debate..

Use of Nu Tirani as New Zealand's alternative/ Maori name is very controversial. Very rarely, if ever, seen or used. Most people would use Aotearoa.

This is a question for the New Zealanders to answer.

As stated in last reply it can be removed.. It is my personal preference..

Rick Malkin
New Zealand - Nu Tirani

P.S. I have not had any notifications of further comments made on this PR.. Hence slow response..

@Saintes-Martin
Copy link

From my perspective, consistency is the most important issue. If we use Harold Wilson for example, then we should also use Boris Johnson. Those are the names they were recognised by, and unless they are your family members, there’s no need for more.

So long as it’s easy for any user to add or remove data from a ‘history file’ or ‘timeline’ perhaps we should not worry too much? For example, I have a British social history events listing, and if I come across an event which may have been of interest to people in my tree, I like to add that.

Updated PMs Names to that commonly used.

Added Notes with links to Wikipedia pages for each PM. Not all have been done, this is an example of what has been suggested.
Removed Nu - Tirani

Removed Full Names in preference to names commonly used.
Added Note Links for Queen Elizabeth II & Charles III as examples.

Can be updated as required.
@RAMINCNZ
Copy link
Contributor Author

I have updated NewZealandPrimeMinisters.php removing 'Nu Tirani' and updating names to commonly used in New Zealand.

Updated BritishPrimeMinisters.php PM names to commonly used and added NoteLinks to some PMs. Can be further updated as required.

Updated BritishMonarchs.php adding two Note links. One to Elizabeth II and one to Charles III as examples. Can be updated as required.

Rick M
New Zealand

Hopefully corrected Errors
@arbor95
Copy link
Contributor

arbor95 commented Aug 26, 2024

seems as if you only have to change tab-char and blank char in BritishMonarchs.php starting in the line with
........ "1 EVEN Charles III\n2 TYPE
thx for the updates

RAMINCNZ and others added 4 commits August 26, 2024 23:29
Hopefully resolved the format issue..

Thanks Franz
Either add wiki links to all entries or none of them.
Either add wiki links to all entries or none of them.
Add end date for Boris Johnson
Copy link

codecov bot commented Sep 13, 2024

Codecov Report

Attention: Patch coverage is 0% with 73 lines in your changes missing coverage. Please review.

Project coverage is 33.81%. Comparing base (5461de1) to head (91244a3).
Report is 91 commits behind head on main.

Files with missing lines Patch % Lines
app/Module/NewZealandPrimeMinisters.php 0.00% 67 Missing ⚠️
app/Module/BritishPrimeMinisters.php 0.00% 4 Missing ⚠️
app/Module/BritishMonarchs.php 0.00% 2 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##               main    #4978      +/-   ##
============================================
+ Coverage     33.78%   33.81%   +0.02%     
  Complexity    11405    11405              
============================================
  Files          1177     1179       +2     
  Lines         47513    47618     +105     
============================================
+ Hits          16053    16100      +47     
- Misses        31460    31518      +58     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Make consistent with other similar modules
Add to list of core modules
@fisharebest fisharebest merged commit 14974d9 into fisharebest:main Sep 13, 2024
13 of 14 checks passed
fisharebest added a commit that referenced this pull request Sep 13, 2024
…a New Zealand Prime Ministers History File (#4978)

* Update BritishMonarchs.php

Updated to include the death of HM Queen Elizabeth II and also added HM King Charles III

* Update BritishPrimeMinisters.php

Added last two British Prime Ministers so file is now current

* Create NewZealandPrimeMinisters.php

Premiers & Prime Ministers of New Zealand

* Update ModuleService.php

Added new line to use the New Zealand Prime Ministers History File

* Update ModuleService.php

Add the extra line to allow New Zealand Prime Ministers History File to work!

* Update BritishMonarchs.php

Edited and updated file to include Charles III as current Monarch

* Update BritishPrimeMinisters.php

Updated PMs Names to that commonly used.

Added Notes with links to Wikipedia pages for each PM. Not all have been done, this is an example of what has been suggested.

* Update NewZealandPrimeMinisters.php

Removed Nu - Tirani

Removed Full Names in preference to names commonly used.

* Update BritishMonarchs.php

Added Note Links for Queen Elizabeth II & Charles III as examples.

Can be updated as required.

* Update BritishMonarchs.php

Hopefully corrected Errors

* Update BritishMonarchs.php

Hopefully resolved the format issue..

Thanks Franz

* Update BritishMonarchs.php

Either add wiki links to all entries or none of them.

* Update BritishPrimeMinisters.php

Either add wiki links to all entries or none of them.

* Update BritishPrimeMinisters.php

Add end date for Boris Johnson

* Update NewZealandPrimeMinisters.php

Make consistent with other similar modules

* Update ModuleService.php

Add to list of core modules

---------

Co-authored-by: Greg Roach <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants