Merge branch 'release/1.25.5'

This commit is contained in:
2024-02-17 10:36:40 +01:00
6 changed files with 8 additions and 5 deletions

View File

@@ -1,3 +1,5 @@
"use client";
import { PlusCircleIcon, HomeIcon } from "@heroicons/react/24/outline"; import { PlusCircleIcon, HomeIcon } from "@heroicons/react/24/outline";
import { YearMonth } from "../lib/db-types"; import { YearMonth } from "../lib/db-types";
import { formatYearMonth } from "../lib/format"; import { formatYearMonth } from "../lib/format";

View File

@@ -25,5 +25,6 @@ export const AddMonthButton:React.FC<AddMonthButtonProps> = ({ yearMonth }) => {
<span className="ml-1 mt-1 text-xs text-left leading-[1.2em]">{t("tooltip")}</span> <span className="ml-1 mt-1 text-xs text-left leading-[1.2em]">{t("tooltip")}</span>
</span> </span>
</Link> </Link>
</div>); </div>
);
} }

View File

@@ -38,7 +38,7 @@ export const LocationCard:FC<LocationCardProps> = ({location: { _id, name, yearM
{ {
monthlyExpense > 0 ? monthlyExpense > 0 ?
<p> <p>
{ t("payed-total") } <strong>${formatCurrency(monthlyExpense)}</strong> { t("payed-total-label") } <strong>${formatCurrency(monthlyExpense)}</strong>
</p> </p>
: null : null
} }

View File

@@ -9,7 +9,7 @@ networks:
services: services:
web-app: web-app:
image: utility-bills-tracker:1.25.4 image: utility-bills-tracker:1.25.5
networks: networks:
- traefik-network - traefik-network
- mongo-network - mongo-network

View File

@@ -53,7 +53,7 @@
"location-card": { "location-card": {
"edit-card-tooltip": "Edit realestate", "edit-card-tooltip": "Edit realestate",
"add-bill-button-tooltip": "Add a new bill", "add-bill-button-tooltip": "Add a new bill",
"payed-total": "Payed total:" "payed-total-label": "Payed total:"
}, },
"month-card": { "month-card": {
"payed-total-label": "Total monthly expenditure:" "payed-total-label": "Total monthly expenditure:"

View File

@@ -53,7 +53,7 @@
"location-card": { "location-card": {
"edit-card-tooltip": "Izmjeni nekretninu", "edit-card-tooltip": "Izmjeni nekretninu",
"add-bill-button-tooltip": "Dodaj novi račun", "add-bill-button-tooltip": "Dodaj novi račun",
"payed-total": "Ukupno plaćeno: <strong>{amount}</strong>" "payed-total-label": "Ukupno plaćeno:"
}, },
"month-card": { "month-card": {
"payed-total-label": "Ukupni mjesečni trošak:" "payed-total-label": "Ukupni mjesečni trošak:"