mirror/Wallos
1
0
Fork 0
mirror of https://github.com/ellite/Wallos.git synced 2026-04-30 03:55:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

merge improve date formatting with IntlDateFormatter fallback (#974)

Browse Source
This commit is contained in:
Mercury233
2026-04-28 00:38:55 +08:00
committed by GitHub
parent 4ec9b9b945
commit b2c565f74c
2 changed files with 48 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
includes/list_subscriptions.php
View File

@@ -110,20 +110,31 @@ function formatDate($date, $lang = 'en')
// Determine the date format based on whether the year matches the current year
$dateFormat = ($currentYear == $dateYear) ? 'MMM d' : 'MMM yyyy';
// Validate the locale and fallback to 'en' if unsupported
if (!in_array($lang, ResourceBundle::getLocales(''))) {
$lang = 'en'; // Fallback to English
}
// Try to create an IntlDateFormatter; if it fails, fallback to 'en'
try {
$formatter = new IntlDateFormatter(
$lang,
IntlDateFormatter::SHORT,
IntlDateFormatter::NONE,
null,
null,
$dateFormat
);
// Create an IntlDateFormatter instance for the specified language
$formatter = new IntlDateFormatter(
$lang,
IntlDateFormatter::SHORT,
IntlDateFormatter::NONE,
null,
null,
$dateFormat
);
if (!$formatter) {
throw new Exception('Failed to create IntlDateFormatter with language: ' . $lang);
}
} catch (Throwable $e) {
$lang = 'en'; // Fallback to English on error
$formatter = new IntlDateFormatter(
$lang,
IntlDateFormatter::SHORT,
IntlDateFormatter::NONE,
null,
null,
$dateFormat
);
}
// Format the date
$formattedDate = $formatter->format(new DateTime($date));

37
index.php
View File

@@ -32,20 +32,31 @@ function formatDate($date, $lang = 'en')
// Determine the date format based on whether the year matches the current year
$dateFormat = ($currentYear == $dateYear) ? 'MMM d' : 'MMM yyyy';
// Validate the locale and fallback to 'en' if unsupported
if (!in_array($lang, ResourceBundle::getLocales(''))) {
$lang = 'en'; // Fallback to English
}
// Try to create an IntlDateFormatter; if it fails, fallback to 'en'
try {
$formatter = new IntlDateFormatter(
$lang,
IntlDateFormatter::SHORT,
IntlDateFormatter::NONE,
null,
null,
$dateFormat
);
// Create an IntlDateFormatter instance for the specified language
$formatter = new IntlDateFormatter(
$lang,
IntlDateFormatter::SHORT,
IntlDateFormatter::NONE,
null,
null,
$dateFormat
);
if (!$formatter) {
throw new Exception('Failed to create IntlDateFormatter with language: ' . $lang);
}
} catch (Throwable $e) {
$lang = 'en'; // Fallback to English on error
$formatter = new IntlDateFormatter(
$lang,
IntlDateFormatter::SHORT,
IntlDateFormatter::NONE,
null,
null,
$dateFormat
);
}
// Format the date
$formattedDate = $formatter->format(new DateTime($date));