republicandate: invert sansculottide day+month string and epiphany
It make the string easier to use, as the day+month string helps more the user to see where he is in the romme year now.
This commit is contained in:
parent
97383d68f5
commit
c655ee5347
2 changed files with 5 additions and 5 deletions
|
@ -35,7 +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($testMois, date('j'), date('Y'));?><br />
|
<strong>gregoriantoromme :</strong> <?php echo gregoriantoromme($testMois, $testJour, $testAnnee);?><br />
|
||||||
<strong>gregorian2FrenchDateString :</strong> <?php echo gregorian2FrenchDateString($testMois, $testJour, $testAnnee);?><br />
|
<strong>gregorian2FrenchDateString :</strong> <?php echo gregorian2FrenchDateString($testMois, $testJour, $testAnnee);?><br />
|
||||||
<strong>gregorian2FrenchDateStringShort :</strong> <?php echo gregorian2FrenchDateStringShort($testMois, $testJour, $testAnnee);?><br />
|
<strong>gregorian2FrenchDateStringShort :</strong> <?php echo gregorian2FrenchDateStringShort($testMois, $testJour, $testAnnee);?><br />
|
||||||
|
|
||||||
|
|
|
@ -217,8 +217,8 @@ function gregorian2FrenchDateString($m,$d,$y) {
|
||||||
|
|
||||||
// If you are in a complentary day, show it the right way
|
// If you are in a complentary day, show it the right way
|
||||||
if ($dateArray[0]==13) {
|
if ($dateArray[0]==13) {
|
||||||
$dayMonthString = FrenchSansCullotidesNames($dateArray[1]) . ", ";
|
$dayMonthString = FrenchOrdinalNumber($dateArray[1]) . ", ";
|
||||||
$saintString = FrenchOrdinalNumber($dateArray[1]);
|
$saintString = FrenchSansCullotidesNames($dateArray[1]);
|
||||||
} else {
|
} else {
|
||||||
$dayMonthString = $dayname . ", " . $dateArray[1] . " " . $monthname . ", ";
|
$dayMonthString = $dayname . ", " . $dateArray[1] . " " . $monthname . ", ";
|
||||||
$saintString = FrenchSaintNames($dateArray[0],$dateArray[1]);
|
$saintString = FrenchSaintNames($dateArray[0],$dateArray[1]);
|
||||||
|
@ -240,8 +240,8 @@ function gregorian2FrenchDateStringShort($m,$d,$y) {
|
||||||
|
|
||||||
// If you are in a complentary day, show it the right way
|
// If you are in a complentary day, show it the right way
|
||||||
if ($dateArray[0]==13) {
|
if ($dateArray[0]==13) {
|
||||||
$dayMonthString = FrenchSansCullotidesNames($dateArray[1]) . ", ";
|
$dayMonthString = FrenchOrdinalNumber($dateArray[1]) . ", ";
|
||||||
$saintString = FrenchOrdinalNumber($dateArray[1]);
|
$saintString = FrenchSansCullotidesNames($dateArray[1]);
|
||||||
} else {
|
} else {
|
||||||
$dayMonthString = $dateArray[1] . " " . $monthname . ", ";
|
$dayMonthString = $dateArray[1] . " " . $monthname . ", ";
|
||||||
$saintString = FrenchSaintNames($dateArray[0],$dateArray[1]);
|
$saintString = FrenchSaintNames($dateArray[0],$dateArray[1]);
|
||||||
|
|
Loading…
Reference in a new issue