refactoring of Hijri.pm
cleaned and loosened guard regex. use /x for clarity. added wikipedia links for Hijri and Gregorian calendars. updated output format to match other conversion goodies.master
parent
af02a51858
commit
2b254eaf76
|
@ -7,17 +7,38 @@ zci answer_type => "date";
|
|||
|
||||
triggers any => 'hijri', 'gregorian';
|
||||
|
||||
my $gregorian_calendar_wiki =
|
||||
'<a href = "https://en.wikipedia.org/wiki/Gregorian_calendar">Gregorian calendar</a>';
|
||||
my $hijri_calendar_wiki =
|
||||
'<a href="https://en.wikipedia.org/wiki/Hijri_calendar">Hijri calendar</a>';
|
||||
|
||||
handle query_lc => sub {
|
||||
|
||||
return unless my ($gd, $gm, $gy, $gh) = $_ =~ /^(\d{0,2})(?:\/|\,)(\d{0,2})(?:\/|\,)(\d{3,4})\s+(?:on\s+the|in)\s+(?:gregorian|hijri)\s+(?:calendar|date|time)\s+is\s+(?:on\s+the|in)\s+(gregorian|hijri)\s+(?:calendar|date|time)$/;
|
||||
last if($gd>31);
|
||||
last if($gm>12);
|
||||
my $hd;
|
||||
my $hm;
|
||||
my $hy;
|
||||
($hd, $hm, $hy) = g2h($gd, $gm, $gy) if ($gh eq 'hijri');
|
||||
($hd, $hm, $hy) = h2g($gd, $gm, $gy) if ($gh eq 'gregorian');
|
||||
return $hd . '/' . $hm . '/' . $hy;
|
||||
return unless my ($gd, $gm, $gy, $requested_calendar) = $_ =~
|
||||
/^
|
||||
(\d{0,2})(?:\/|,)(\d{0,2})(?:\/|,)(\d{3,4})\s+
|
||||
(?:
|
||||
(?:on\s+the)\s+
|
||||
(?:gregorian|hijri)\s+
|
||||
(?:calendar|date|time)\s+
|
||||
is\s+
|
||||
)?
|
||||
(?:
|
||||
(?:(?:in|on|to)(?:\s+the|in)?)\s+
|
||||
)?
|
||||
(gregorian|hijri)\s*
|
||||
(?:calendar|date|time|years|months|days)?
|
||||
$/x;
|
||||
return unless ($gd<31 and $gm<12);
|
||||
my ($hd, $hm, $hy) = $requested_calendar eq 'hijri' ?
|
||||
g2h($gd, $gm, $gy) : h2g($gd, $gm, $gy);
|
||||
my $input_date = "$gd/$gm/$gy";
|
||||
my $converted_date = "$hd/$hm/$hy";
|
||||
return "$input_date on the "
|
||||
. ($requested_calendar eq 'hijri' ?
|
||||
"$gregorian_calendar_wiki is $converted_date on the $hijri_calendar_wiki" :
|
||||
"$hijri_calendar_wiki is $converted_date on the $gregorian_calendar_wiki");
|
||||
|
||||
};
|
||||
|
||||
1;
|
||||
|
|
Loading…
Reference in New Issue