republicandate: add new array functions
Add array functions for different needs (from a romme_datestring, a julian day count or a gregorian date). Simplify functions that need said arrays.
This commit is contained in:
parent
9495bfdbf2
commit
1e8b0051fa
2 changed files with 39 additions and 21 deletions
|
@ -35,6 +35,7 @@ $testJulianday = gregoriantojd($testMois, $testJour, $testAnnee);
|
||||||
<h2>Test des différentes fonctions</h2>
|
<h2>Test des différentes fonctions</h2>
|
||||||
<p>
|
<p>
|
||||||
<strong>jdtoromme :</strong> <?php echo jdtoromme( $testJulianday );?> <br />
|
<strong>jdtoromme :</strong> <?php echo jdtoromme( $testJulianday );?> <br />
|
||||||
|
<strong>gregoriantoromme :</strong> <?php echo gregoriantoromme(date('n'), date('j'), date('Y'));?><br />
|
||||||
<strong>gregorian2FrenchDateString :</strong> <?php echo gregorian2FrenchDateString(date('n'), date('j'), date('Y'));?><br />
|
<strong>gregorian2FrenchDateString :</strong> <?php echo gregorian2FrenchDateString(date('n'), date('j'), date('Y'));?><br />
|
||||||
<strong>gregorian2FrenchDateStringShort :</strong> <?php echo gregorian2FrenchDateStringShort(date('n'), date('j'), date('Y'));?><br />
|
<strong>gregorian2FrenchDateStringShort :</strong> <?php echo gregorian2FrenchDateStringShort(date('n'), date('j'), date('Y'));?><br />
|
||||||
|
|
||||||
|
|
|
@ -86,21 +86,47 @@ function jdtoromme( $juliandaycount ) {
|
||||||
return $romme_date_string;
|
return $romme_date_string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function gregoriantoromme($m, $d, $y) {
|
||||||
|
$juliandaycount = gregoriantojd($m, $d, $y);
|
||||||
|
$romme_date_string = jdtoromme($juliandaycount);
|
||||||
|
|
||||||
|
return $romme_date_string;
|
||||||
|
}
|
||||||
|
|
||||||
|
function jdtoromme_getArray($juliandaycount) {
|
||||||
|
$romme_date_string = jdtoromme($juliandaycount);
|
||||||
|
|
||||||
|
$rommeArray = romme_getArray($romme_date_string);
|
||||||
|
|
||||||
|
return $rommeArray;
|
||||||
|
}
|
||||||
|
|
||||||
|
function gregoriantoromme_getArray($m, $d, $y) {
|
||||||
|
$romme_date_string = gregoriantoromme($m, $d, $y);
|
||||||
|
|
||||||
|
$rommeArray = romme_getArray($romme_date_string);
|
||||||
|
|
||||||
|
return $rommeArray;
|
||||||
|
}
|
||||||
|
|
||||||
|
function romme_getArray($romme_date_string) {
|
||||||
|
$rommeArray = explode("/", $romme_date_string);
|
||||||
|
|
||||||
|
return $rommeArray;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
function gregorian2FrenchDateArray($m, $d, $y)
|
function gregorian2FrenchDateArray($m, $d, $y)
|
||||||
{
|
{
|
||||||
$julian_date = gregoriantojd($m, $d, $y);
|
$rommeArray = gregoriantoromme_getArray($m, $d, $y);
|
||||||
$french = jdtoromme($julian_date);
|
|
||||||
if($french == "0/0/0")
|
|
||||||
return "" ;
|
|
||||||
$dateArray = explode("/", $french) ;
|
|
||||||
|
|
||||||
// get the month name
|
// get the month name
|
||||||
$monthname = FrenchMonthNames($dateArray[0]) ;
|
$monthname = FrenchMonthNames($rommeArray[0]) ;
|
||||||
|
|
||||||
/* convert the year number to roman digits (as most historians do and documents of the time did */
|
/* convert the year number to roman digits (as most historians do and documents of the time did */
|
||||||
$stryear = $dateArray[2];
|
$stryear = $rommeArray[2];
|
||||||
|
|
||||||
return array($monthname, $dateArray[1], $stryear ) ;
|
return array($monthname, $rommeArray[1], $stryear ) ;
|
||||||
}
|
}
|
||||||
|
|
||||||
function FrenchMonthNames($mo)
|
function FrenchMonthNames($mo)
|
||||||
|
@ -179,13 +205,8 @@ function FrenchOrdinalNumber($Day) {
|
||||||
}
|
}
|
||||||
|
|
||||||
function gregorian2FrenchDateString($m,$d,$y) {
|
function gregorian2FrenchDateString($m,$d,$y) {
|
||||||
$julian_date = gregoriantojd($m, $d, $y);
|
$dateArray = gregoriantoromme_getArray($m,$d,$y);
|
||||||
$french = jdtoromme($julian_date);
|
|
||||||
|
|
||||||
if($french == "0/0/0")
|
|
||||||
return "" ;
|
|
||||||
|
|
||||||
$dateArray = explode("/", $french) ;
|
|
||||||
$monthname = FrenchMonthNames($dateArray[0]) ;
|
$monthname = FrenchMonthNames($dateArray[0]) ;
|
||||||
$dayname = FrenchDayNames($dateArray[1]);
|
$dayname = FrenchDayNames($dateArray[1]);
|
||||||
|
|
||||||
|
@ -203,13 +224,9 @@ function gregorian2FrenchDateString($m,$d,$y) {
|
||||||
}
|
}
|
||||||
|
|
||||||
function gregorian2FrenchDateStringShort($m,$d,$y) {
|
function gregorian2FrenchDateStringShort($m,$d,$y) {
|
||||||
$julian_date = gregoriantojd($m, $d, $y);
|
$dateArray = gregoriantoromme_getArray($m,$d,$y);
|
||||||
$french = jdtoromme($julian_date);
|
|
||||||
if($french == "0/0/0")
|
|
||||||
return "" ;
|
|
||||||
|
|
||||||
$dateArray = explode("/", $french) ;
|
$monthname = FrenchMonthNames($dateArray[0]);
|
||||||
$monthname = FrenchMonthNames($dateArray[0]) ;
|
|
||||||
$dayname = FrenchDayNames($dateArray[1]);
|
$dayname = FrenchDayNames($dateArray[1]);
|
||||||
|
|
||||||
if ($dateArray[0]==13) {
|
if ($dateArray[0]==13) {
|
||||||
|
|
Loading…
Reference in a new issue