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.

Sign up for GitHub

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

Jump to bottom

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

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5798b6f
Update BritishMonarchs.php
RAMINCNZ Apr 9, 2024
edfca20
Update BritishPrimeMinisters.php
RAMINCNZ Apr 9, 2024
91cd679
Create NewZealandPrimeMinisters.php
RAMINCNZ Apr 9, 2024
253e48f
Update ModuleService.php
RAMINCNZ Apr 10, 2024
fe0797d
Update ModuleService.php
RAMINCNZ Apr 10, 2024
8525a17
Merge branch 'fisharebest:main' into main
RAMINCNZ Apr 10, 2024
12b2447
Update BritishMonarchs.php
RAMINCNZ Apr 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion app/Module/BritishMonarchs.php
View file
Open in desktop
Expand Up @@ -108,7 +108,8 @@ public function historicEventsAll(): Collection
"1 EVEN George V\n2 TYPE British King\n2 DATE FROM 06 MAY 1910 TO 20 JAN 1936",
"1 EVEN Edward VII\n2 TYPE British King\n2 DATE FROM 20 JAN 1936 TO 11 DEC 1936",
"1 EVEN George VI\n2 TYPE British King\n2 DATE FROM 11 DEC 1936 TO 06 FEB 1952",
"1 EVEN Elizabeth II\n2 TYPE British Queen\n2 DATE FROM 06 FEB 1952",
"1 EVEN Elizabeth II\n2 TYPE British Queen\n2 DATE FROM 06 FEB 1952 TO 08 SEP 2022",
"1 EVEN Charles III\n2 TYPE British King\n2 DATE FROM 08 SEP 2022",
]);

default:
Expand Down
2 changes: 2 additions & 0 deletions app/Module/BritishPrimeMinisters.php
View file
Open in desktop
Expand Up @@ -135,6 +135,8 @@ public function historicEventsAll(): Collection
"1 EVEN David Cameron\n2 TYPE Prime Minister of the United Kingdom\n2 DATE FROM 11 MAY 2010 TO 13 JUL 2016",
"1 EVEN Theresa May\n2 TYPE Prime Minister of the United Kingdom\n2 DATE FROM 13 JUL 2016 TO 24 JUL 2019",
"1 EVEN Boris Johnson\n2 TYPE Prime Minister of the United Kingdom\n2 DATE FROM 24 JUL 2019",
"1 EVEN Mary Elizabeth 'Liz' Truss\n2 TYPE Prime Minister of the United Kingdom\n2 DATE FROM 06 SEP 2022 TO 25 OCT 2022",
"1 EVEN Rishi Sunak\n2 TYPE Prime Minister of the United Kingdom\n2 DATE FROM 25 OCT 2022\n2 NOTE Incumbent",
]);

default:
Expand Down
125 changes: 125 additions & 0 deletions app/Module/NewZealandPrimeMinisters.php
View file
Open in desktop
@@ -0,0 +1,125 @@
<?php

/**
* webtrees: online genealogy
* Copyright (C) 2023 webtrees development team
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/

declare(strict_types=1);

namespace Fisharebest\Webtrees\Module;

use Fisharebest\Webtrees\I18N;
use Illuminate\Support\Collection;

/**
* Class NewZealandPrimeMinisters
*/
class NewZealandPrimeMinisters extends AbstractModule implements ModuleHistoricEventsInterface
{
use ModuleHistoricEventsTrait;

/**
* How should this module be identified in the control panel, etc.?
*
* @return string
*/
public function title(): string
{
return 'New Zealand - Nu Tirani Premiers / Prime Ministers';
}

/**
* Should this module be enabled when it is first installed?
*
* @return bool
*/
public function isEnabledByDefault(): bool
{
return false;
}

/**
* All events provided by this module.
*
* @return Collection<int,string>
*/
public function historicEventsAll(): Collection
{
switch (I18N::languageTag()) {
case 'en-AU':
case 'en-GB':
case 'en-US':
return new Collection([
"1 EVEN Henry Sewell\n2 TYPE Premier of New Zealand - Nu Tirani\n2 DATE FROM 07 MAY 1856 TO 20 MAY 1856",
"1 EVEN William Fox\n2 TYPE Premier of New Zealand - Nu Tirani\n2 DATE FROM 20 MAY 1856 TO 02 JUN 1856",
"1 EVEN Edward Stafford\n2 TYPE Premier of New Zealand - Nu Tirani\n2 DATE FROM 02 JUN 1856 TO 12 JUL 1861",
"1 EVEN William Fox\n2 TYPE Premier of New Zealand - Nu Tirani\n2 DATE FROM 12 JUL 1861 TO 06 AUG 1862",
"1 EVEN Alfred Domett\n2 TYPE Premier of New Zealand - Nu Tirani\n2 DATE FROM 06 AUG 1862 TO 30 OCT 1863",
"1 EVEN Frederick Whitaker\n2 TYPE Premier of New Zealand - Nu Tirani\n2 DATE FROM 30 OCT 1863 TO 24 NOV 1864",
"1 EVEN Frederick Weld\n2 TYPE Premier of New Zealand - Nu Tirani\n2 DATE FROM 24 NOV 1864 TO 16 OCT 1865",
"1 EVEN Edward Stafford\n2 TYPE Premier of New Zealand - Nu Tirani\n2 DATE FROM 16 OCT 1865 TO 28 JUN 1869",
"1 EVEN William Fox \n2 TYPE Premier of New Zealand - Nu Tirani\n2 DATE FROM 28 JUN 1869 TO 10 SEP 1872",
"1 EVEN Edward Stafford\n2 TYPE Premier of New Zealand - Nu Tirani\n2 DATE FROM 10 SEP 1872 TO 11 OCT 1872",
"1 EVEN George Waterhouse\n2 TYPE Premier of New Zealand - Nu Tirani\n2 DATE FROM 11 OCT 1872 TO 03 MAR 1873",
"1 EVEN William Fox\n2 TYPE Premier of New Zealand - Nu Tirani\n2 DATE FROM 03 MAR 1873 TO 08 APR 1873",
"1 EVEN Julius Vogel\n2 TYPE Premier of New Zealand - Nu Tirani\n2 DATE FROM 08 APR 1873 TO 06 JUL 1875",
"1 EVEN Daniel Pollen\n2 TYPE Premier of New Zealand - Nu Tirani\n2 DATE FROM 06 JUL 1875 TO 15 FEB 1876",
"1 EVEN Julius Vogel\n2 TYPE Premier of New Zealand - Nu Tirani\n2 DATE FROM 15 FEB 1876 TO 01 SEP 1876",
"1 EVEN Harry Atkinson\n2 TYPE Premier of New Zealand - Nu Tirani\n2 DATE FROM 01 SEP 1876 TO 13 OCT 1877",
"1 EVEN Sir George Grey\n2 TYPE Premier of New Zealand - Nu Tirani\n2 DATE FROM 13 OCT 1877 TO 08 OCT 1879",
"1 EVEN John Hall\n2 TYPE Premier of New Zealand - Nu Tirani\n2 DATE FROM 08 OCT 1879 TO 21 APR 1882",
"1 EVEN Frederick Whitaker\n2 TYPE Premier of New Zealand - Nu Tirani\n2 DATE FROM 21 APR 1882 TO 25 SEP 1883",
"1 EVEN Harry Atkinson\n2 TYPE Premier of New Zealand - Nu Tirani\n2 DATE FROM 25 SEP 1883 TO 16 AUG 1883",
"1 EVEN Sir Robert Stout\n2 TYPE Premier of New Zealand - Nu Tirani\n2 DATE FROM 16 AUG 1884 TO 28 AUG 1884",
"1 EVEN Harry Atkinson\n2 TYPE Premier of New Zealand - Nu Tirani\n2 DATE FROM 28 AUG 1884 TO 03 SEP 1884",
"1 EVEN Sir Robert Stout\n2 TYPE Premier of New Zealand - Nu Tirani\n2 DATE FROM 03 SEP 1884 TO 08 OCT 1887",
"1 EVEN Harry Atkinson\n2 TYPE Premier of New Zealand - Nu Tirani\n2 DATE FROM 08 OCT 1887 TO 21 JAN 1891",
"1 EVEN John Ballance\n2 TYPE Premier of New Zealand - Nu Tirani\n2 DATE FROM 24 JAN 1891 TO 27 APR 1893",
"1 EVEN Richard Seddon, Last \n2 TYPE Premier of New Zealand - Nu Tirani\n2 DATE FROM 01 MAY 1893 TO 10 JUN 1906",
"1 EVEN William Hall-Jones, Liberal Party, NZ's First PM\n2 TYPE Prime Minister of New Zealand - Nu Tirani\n2 DATE FROM 21 JUN 1906 TO 06 AUG 1906",
"1 EVEN Sir Joseph Ward, Liberal; United Party\n2 TYPE Prime Minister of New Zealand - Nu Tirani\n2 DATE FROM 06 AUG 1906 TO 12 MAR 1912",
"1 EVEN Thomas Mackenzie, Liberal Party\n2 TYPE Prime Minister of New Zealand - Nu Tirani\n2 DATE FROM 28 MAR 1912 TO 10 JUL 1912",
"1 EVEN William Massey, Reform Party\n2 TYPE Prime Minister of New Zealand - Nu Tirani\n2 DATE FROM 10 JUL 1912 TO 10 MAY 1925",
"1 EVEN Sir Francis Henry Dillon Bell, Reform Party\n2 TYPE Prime Minister of New Zealand - Nu Tirani\n2 DATE FROM 14 MAY 1925 TO 30 MAY 1925",
"1 EVEN Gordon Coates, Reform Party\n2 TYPE Prime Minister of New Zealand - Nu Tirani\n2 DATE FROM 30 MAY 1925 TO 10 DEC 1928",
"1 EVEN George Forbes, United; Coalition Party\n2 TYPE Prime Minister of New Zealand - Nu Tirani\n2 DATE FROM 10 DEC 1928 TO 28 MAY 1930",
"1 EVEN Sir Joseph Ward, Liberal; United Party\n2 TYPE Prime Minister of New Zealand - Nu Tirani\n2 DATE FROM 28 MAY 1930 TO 06 DEC 1935",
"1 EVEN Michael Joseph Savage, First Labour Party PM\n2 TYPE Prime Minister of New Zealand - Nu Tirani\n2 DATE FROM 06 DEC 1935 TO 27 MAR 1940",
"1 EVEN Peter Fraser, Labour Party\n2 TYPE Prime Minister of New Zealand - Nu Tirani\n2 DATE FROM 27 MAR 1940 TO 13 DEC 1949",
"1 EVEN Sidney Holland, National\n2 TYPE Prime Minister of New Zealand - Nu Tirani\n2 DATE FROM 13 DEC 1949 TO 20 SEP 1957",
"1 EVEN Keith Holyoake, National Party\n2 TYPE Prime Minister of New Zealand - Nu Tirani\n2 DATE FROM 20 SEP 1957 TO 12 DEC 1957",
"1 EVEN Walter Nash, Labour Party\n2 TYPE Prime Minister of New Zealand - Nu Tirani\n2 DATE FROM 12 DEC 1957 TO 12 DEC 1960",
"1 EVEN Keith Holyoake\n2 TYPE Prime Minister of New Zealand - Nu Tirani\n2 DATE FROM 12 DEC 1960 TO 07 FEB 1972",
"1 EVEN John 'Jack' Marshall, National Party\n2 TYPE Prime Minister of New Zealand - Nu Tirani\n2 DATE FROM 07 FEB 1972 TO 08 DEC 1972",
"1 EVEN Norman Kirk, Affectionately known as 'Big Norm'. Labour Party\n2 TYPE Prime Minister of New Zealand - Nu Tirani\n2 DATE FROM 08 DEC 1972 TO 31 AUG 1974",
"1 EVEN Wallace Edward 'Bill' Rowling, Labour Party\n2 TYPE Prime Minister of New Zealand - Nu Tirani\n2 DATE FROM 06 SEP 1974 TO 12 DEC 1975",
"1 EVEN Robert David 'Rob' Muldoon, National Party\n2 TYPE Prime Minister of New Zealand - Nu Tirani\n2 DATE FROM 12 DEC 1975 TO 26 JUL 1984",
"1 EVEN David Russell Lange, Labour Party\n2 TYPE Prime Minister of New Zealand - Nu Tirani\n2 DATE FROM 26 JUL 1984 TO 08 AUG 1989",
"1 EVEN Geoffrey Winston Palmer, Labour Party\n2 TYPE Prime Minister of New Zealand - Nu Tirani\n2 DATE FROM 08 AUG 1989 TO 04 SEP 1990",
"1 EVEN Michael Kenneth 'Mike' Moore, Labour Party\n2 TYPE Prime Minister of New Zealand - Nu Tirani\n2 DATE FROM 04 SEP 1990 TO 02 NOV 1990",
"1 EVEN James Brendan 'Jim' Bolger, National Party\n2 TYPE Prime Minister of New Zealand - Nu Tirani\n2 DATE FROM 02 NOV 1990 TO 08 DEC 1997",
"1 EVEN Jennifer Mary 'Jenny' Shipley, National Party, NZ's First Female PM\n2 TYPE Prime Minister of New Zealand - Nu Tirani\n2 DATE FROM 08 DEC 1997 TO 05 DEC 1999",
"1 EVEN Helen Clark, Labour Party, NZ's First Elected Female PM\n2 TYPE Prime Minister of New Zealand - Nu Tirani\n2 DATE FROM 05 DEC 1999 TO 19 NOV 2008",
"1 EVEN John Key, National Party\n2 TYPE Prime Minister of New Zealand - Nu Tirani\n2 DATE FROM 19 NOV 2008 TO 12 DEC 2016",
"1 EVEN Simon William 'Bill' English, National Party\n2 TYPE Prime Minister of New Zealand - Nu Tirani\n2 DATE FROM 12 DEC 2016 TO 26 OCT 2017",
"1 EVEN Jacinda Ardern, Labour Party\n2 TYPE Prime Minister of New Zealand - Nu Tirani\n2 DATE FROM 26 OCT 2017 TO 25 JAN 2023",
"1 EVEN Christopher John 'Chris' Hipkins, Labour Party\n2 TYPE Prime Minister of New Zealand - Nu Tirani\n2 DATE FROM 25 JAN 2023 TO 14 OCT 2023",
"1 EVEN Christopher 'Chris' Luxon, National Party\n2 TYPE Prime Minister of New Zealand - Nu Tirani\n2 DATE FROM 14 OCT 2023",
]);

default:
return new Collection();
}
}
}
1 change: 1 addition & 0 deletions app/Services/ModuleService.php
View file
Open in desktop
Expand Up @@ -206,6 +206,7 @@
use Fisharebest\Webtrees\Module\ModuleSidebarInterface;
use Fisharebest\Webtrees\Module\ModuleTabInterface;
use Fisharebest\Webtrees\Module\ModuleThemeInterface;
use Fisharebest\Webtrees\Module\NewZealandPrimeMinisters;
use Fisharebest\Webtrees\Module\NoteListModule;
use Fisharebest\Webtrees\Module\NotesTabModule;
use Fisharebest\Webtrees\Module\OccupationReportModule;
Expand Down