diff --git a/exemple.php b/exemple.php index 51ec4b6..ea0852c 100644 --- a/exemple.php +++ b/exemple.php @@ -58,8 +58,8 @@ $testJulianday = gregoriantojd($testMois, $testJour, $testAnnee);

Getting an automated string

- romme_completeString :
- romme_simplerString :
+ romme_getFormattedString :
+ romme_getFormattedStringComplete :
gregorian2FrenchDateString :
gregorian2FrenchDateStringShort :
diff --git a/romme-calendar.php b/romme-calendar.php index 010e917..17f40e9 100644 --- a/romme-calendar.php +++ b/romme-calendar.php @@ -353,7 +353,22 @@ function romme_getComplementaryDayName($romme_date_string) { */ -function romme_completeString($romme_date_string) { +function romme_getFormattedString($romme_date_string, $showDecadeDayName) { + // Convert a romme date string to a shorter romme date string + + // Start by getting the romme array + $dateArray = romme_getArray($romme_date_string); + + // Get the month and day names + $dayMonthString = repcal_getDayMonthNames($dateArray[0], $dateArray[1], $showDecadeDayName); + + // Create the string for the year + $yearString = "an " . $dateArray[2]; + + return $dayMonthString . ", " . $yearString; +} + +function romme_getFormattedStringComplete($romme_date_string) { // Convert a romme date string to a complete romme date string // Start by getting the romme array @@ -370,21 +385,6 @@ function romme_completeString($romme_date_string) { return $dayMonthString . ", " . $yearString . "
" . $saintString . ""; } -function romme_simplerString($romme_date_string) { - // Convert a romme date string to a shorter romme date string - - // Start by getting the romme array - $dateArray = romme_getArray($romme_date_string); - - // Get the month and day names - $dayMonthString = repcal_getDayMonthNames($dateArray[0], $dateArray[1], false); - - // Create the string for the year - $yearString = "an " . $dateArray[2]; - - return $dayMonthString . ", " . $yearString; -} - /* 4.2. Getting it from the gregorian date */