diff --git a/lib/DDG/Goodie/AltCalendars.pm b/lib/DDG/Goodie/AltCalendars.pm index d9c36b4be..8b82a9f83 100755 --- a/lib/DDG/Goodie/AltCalendars.pm +++ b/lib/DDG/Goodie/AltCalendars.pm @@ -10,6 +10,8 @@ use JSON; with 'DDG::GoodieRole::NumberStyler'; my $number_regex = number_style_regex(); +my $base_wiki_link = "https://en.wikipedia.org/wiki/"; + my $definitions_json = share('definitions.json')->slurp(); my $year_definitions = decode_json($definitions_json); @@ -35,7 +37,7 @@ handle query_parts => sub { my $era_hash = $year_definitions->{$parent_era}; my $gregorian_year_started = $era_hash->{'gregorian_year_started'}; - my $wikipedia_link = $era_hash->{'wikipedia_link'}; + my $wiki_page = $era_hash->{'wikipedia_page'}; my $year = $gregorian_year_started + $era_year; my $era = DateTime->now->set_year($year)->era; @@ -52,7 +54,7 @@ handle query_parts => sub { }, meta => { sourceName => "Wikipedia", - sourceUrl => "$wikipedia_link" + sourceUrl => "$base_wiki_link$wiki_page" }, templates => { group => 'info', diff --git a/share/goodie/alt_calendars/definitions.json b/share/goodie/alt_calendars/definitions.json index 8d3ed5155..f3e1d5edb 100644 --- a/share/goodie/alt_calendars/definitions.json +++ b/share/goodie/alt_calendars/definitions.json @@ -1,58 +1,58 @@ { "meiji": { "gregorian_year_started": 1867, - "wikipedia_link": "https://en.wikipedia.org/wiki/Meiji_period" + "wikipedia_page": "Meiji_period" }, "taisho": { "gregorian_year_started": 1911, "aliases": ["taishou"], - "wikipedia_link": "https://en.wikipedia.org/wiki/Taisho_period" + "wikipedia_page": "Taisho_period" }, "showa": { "gregorian_year_started": 1925, "aliases": ["shouwa"], - "wikipedia_link": "https://en.wikipedia.org/wiki/Showa_period" + "wikipedia_page": "Showa_period" }, "heisei": { "gregorian_year_started": 1988, - "wikipedia_link": "https://en.wikipedia.org/wiki/Heisei_period" + "wikipedia_page": "Heisei_period" }, "juche": { "gregorian_year_started": 1911, - "wikipedia_link": "https://en.wikipedia.org/wiki/North_Korean_calendar" + "wikipedia_page": "North_Korean_calendar" }, "minguo": { "gregorian_year_started": 1911, - "wikipedia_link": "https://en.wikipedia.org/wiki/Minguo_calendar" + "wikipedia_page": "Minguo_calendar" }, "pisan": { "gregorian_year_started": -1, - "wikipedia_link": "https://en.wikipedia.org/wiki/Pisan_calendar" + "wikipedia_page": "Pisan_calendar" }, "bengali": { "gregorian_year_started": 593, "aliases": ["bangla"], - "wikipedia_link": "https://en.wikipedia.org/wiki/Bengali_calendar" + "wikipedia_page": "Bengali_calendar" }, "rumi": { "gregorian_year_started": 584, - "wikipedia_link": "https://en.wikipedia.org/wiki/Rumi_calendar" + "wikipedia_page": "Rumi_calendar" }, "suriyakhati": { "gregorian_year_started": -543, - "wikipedia_link": "https://en.wikipedia.org/wiki/Thai_solar_calendar" + "wikipedia_page": "Thai_solar_calendar" }, "saka": { "gregorian_year_started": 78, - "wikipedia_link": "https://en.wikipedia.org/wiki/Indian_national_calendar" + "wikipedia_page": "Indian_national_calendar" }, "discordian": { "gregorian_year_started": -1166, "aliases": ["erisian"], - "wikipedia_link": "https://en.wikipedia.org/wiki/Discordian_calendar" + "wikipedia_page": "Discordian_calendar" }, "nanakshahi": { "gregorian_year_started": 1468, - "wikipedia_link": "https://en.wikipedia.org/wiki/Nanakshahi_calendar" + "wikipedia_page": "Nanakshahi_calendar" } } \ No newline at end of file