Skip to content

Wallos: Open-source, self-hostable personal subscription tracker. Visualize your recurring expenses, manage your budget, and save money.

feat: shorten date displayed on the list of subscriptions

Miguel Ribeiro68f1d4757737
diff --git a/endpoints/subscriptions/get.php b/endpoints/subscriptions/get.php
index 3422647..24e90ae 100644
--- a/endpoints/subscriptions/get.php
+++ b/endpoints/subscriptions/get.php
@@ -216,7 +216,7 @@ if (isset($_SESSION['loggedin']) && $_SESSION['loggedin'] === true) {
}
if (isset($print)) {
- printSubscriptions($print, $sort, $categories, $members, $i18n, $colorTheme, "../../", $settings['disabledToBottom'], $settings['mobileNavigation'], $settings['showSubscriptionProgress'], $currencies);
+ printSubscriptions($print, $sort, $categories, $members, $i18n, $colorTheme, "../../", $settings['disabledToBottom'], $settings['mobileNavigation'], $settings['showSubscriptionProgress'], $currencies, $lang);
}
if (count($subscriptions) == 0) {
diff --git a/includes/header.php b/includes/header.php
index 54e146c..c9748b6 100644
--- a/includes/header.php
+++ b/includes/header.php
@@ -222,23 +222,23 @@ $mobileNavigation = $settings['mobile_nav'] ? "mobile-navigation" : "";
<nav class="mobile-nav">
<a href="." class="nav-link <?= $subscriptionsClass ?>" title="<?= translate('subscriptions', $i18n) ?>">
<?php include "images/siteicons/svg/mobile-menu/home.php"; ?>
- Home
+ <?= translate('subscriptions', $i18n) ?>
</a>
<a href="calendar.php" class="nav-link <?= $calendarClass ?>" title="<?= translate('calendar', $i18n) ?>">
<?php include "images/siteicons/svg/mobile-menu/calendar.php"; ?>
- Calendar
+ <?= translate('calendar', $i18n) ?>
</a>
<a href="stats.php" class="nav-link <?= $statsClass ?>" title="<?= translate('stats', $i18n) ?>">
<?php include "images/siteicons/svg/mobile-menu/statistics.php"; ?>
- Statistics
+ <?= translate('stats', $i18n) ?>
</a>
<a href="settings.php" class="nav-link <?= $settingsClass ?>" title="<?= translate('settings', $i18n) ?>">
<?php include "images/siteicons/svg/mobile-menu/settings.php"; ?>
- Settings
+ <?= translate('settings', $i18n) ?>
</a>
<a href="profile.php" class="nav-link <?= $profileClass ?>" title="<?= translate('profile', $i18n) ?>">
<?php include "images/siteicons/svg/mobile-menu/profile.php"; ?>
- Profile
+ <?= translate('profile', $i18n) ?>
</a>
</nav>
<?php
diff --git a/includes/list_subscriptions.php b/includes/list_subscriptions.php
index ef8af73..c2709f3 100644
--- a/includes/list_subscriptions.php
+++ b/includes/list_subscriptions.php
@@ -98,7 +98,36 @@ function formatPrice($price, $currencyCode, $currencies)
return $formattedPrice;
}
-function printSubscriptions($subscriptions, $sort, $categories, $members, $i18n, $colorTheme, $imagePath, $disabledToBottom, $mobileNavigation, $showSubscriptionProgress, $currencies)
+function formatDate($date, $lang = 'en')
+{
+ $currentYear = date('Y');
+ $dateYear = date('Y', strtotime($date));
+
+ // 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
+ }
+
+ // Create an IntlDateFormatter instance for the specified language
+ $formatter = new IntlDateFormatter(
+ $lang,
+ IntlDateFormatter::SHORT,
+ IntlDateFormatter::NONE,
+ null,
+ null,
+ $dateFormat
+ );
+
+ // Format the date
+ $formattedDate = $formatter->format(new DateTime($date));
+
+ return $formattedDate;
+}
+
+function printSubscriptions($subscriptions, $sort, $categories, $members, $i18n, $colorTheme, $imagePath, $disabledToBottom, $mobileNavigation, $showSubscriptionProgress, $currencies, $lang)
{
if ($sort === "price") {
usort($subscriptions, function ($a, $b) {
@@ -220,10 +249,10 @@ function printSubscriptions($subscriptions, $sort, $categories, $members, $i18n,
?>
<?= $subscription['billing_cycle'] ?>
</span>
- <span class="next"><?= $subscription['next_payment'] ?></span>
+ <span class="next"><?= formatDate($subscription['next_payment'], $lang) ?></span>
<span class="price">
<span class="value">
- <?= formatPrice($subscription['price'], $subscription['currency_code'], $currencies ) ?>
+ <?= formatPrice($subscription['price'], $subscription['currency_code'], $currencies) ?>
<?php
if (isset($subscription['original_price']) && $subscription['original_price'] != $subscription['price']) {
?>
diff --git a/includes/version.php b/includes/version.php
index 983078d..4d571f5 100644
--- a/includes/version.php
+++ b/includes/version.php
@@ -1,3 +1,3 @@
<?php
-$version = "v2.49.1";
+$version = "v2.50.0";
?>
\ No newline at end of file
diff --git a/index.php b/index.php
index d953d06..70ec5e0 100644
--- a/index.php
+++ b/index.php
@@ -269,7 +269,7 @@ $headerClass = count($subscriptions) > 0 ? "main-actions" : "main-actions hidden
}
if (isset($print)) {
- printSubscriptions($print, $sort, $categories, $members, $i18n, $colorTheme, "", $settings['disabledToBottom'], $settings['mobileNavigation'], $settings['showSubscriptionProgress'], $currencies);
+ printSubscriptions($print, $sort, $categories, $members, $i18n, $colorTheme, "", $settings['disabledToBottom'], $settings['mobileNavigation'], $settings['showSubscriptionProgress'], $currencies, $lang);
}
$db->close();
diff --git a/styles/styles.css b/styles/styles.css
index 4cce772..555d328 100644
--- a/styles/styles.css
+++ b/styles/styles.css
@@ -599,6 +599,7 @@ button.mobile-action-renew {
.subscription .next {
flex-basis: 16%;
flex-grow: 1;
+ text-transform: capitalize;
}
.subscription .payment_method {
@@ -682,6 +683,9 @@ button.mobile-action-renew {
flex-basis: var(--logo-flex-basis);
font-size: 14px;
font-weight: normal;
+ max-height: 38px;
+ overflow: hidden;
+ align-items: baseline;
}
.subscription-secondary>.name {