diff --git a/cgi/CRMS.pm b/cgi/CRMS.pm index 330d1108..d048d0b8 100755 --- a/cgi/CRMS.pm +++ b/cgi/CRMS.pm @@ -65,7 +65,7 @@ sub new return $self; } -our $VERSION = '8.5.15'; +our $VERSION = '8.5.16'; sub Version { return $VERSION; diff --git a/cgi/Project/Commonwealth.pm b/cgi/Project/Commonwealth.pm index 6abe6ab2..af3e0741 100644 --- a/cgi/Project/Commonwealth.pm +++ b/cgi/Project/Commonwealth.pm @@ -10,11 +10,10 @@ sub new return $class->SUPER::new(@_); } -# 2023 Commonwealth reactivation only for Canada my $CANDIDATE_COUNTRIES = { - # 'Australia' => 1, + 'Australia' => 1, 'Canada' => 1, - # 'United Kingdom' => 1 + 'United Kingdom' => 1 }; # ========== CANDIDACY ========== # @@ -67,7 +66,7 @@ sub year_range { my $year = shift || $self->{crms}->GetTheYear(); if ($country eq 'United Kingdom' || $country eq 'Australia') { - return [$year - 125, $year - 71] + return [$year - 124, $year - 83] } # Magic hardcoded 1971 based on regime changes, not rolling wall. return [$year - 125, 1971] if $country eq 'Canada'; diff --git a/t/Project/Commonwealth.t b/t/Project/Commonwealth.t index dfc92d1d..d3d4781a 100644 --- a/t/Project/Commonwealth.t +++ b/t/Project/Commonwealth.t @@ -25,8 +25,8 @@ ok(defined $proj); subtest 'Commonwealth::year_range' => sub { my $year = 2020; my $test_data = { - 'United Kingdom' => [1895, 1949], - 'Australia' => [1895, 1949], + 'United Kingdom' => [1896, 1937], + 'Australia' => [1896, 1937], 'Canada' => [1895, 1971], 'Undetermined' => [0, 0] };