openclaw/oikos
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

fix: replace hardcoded Uhr suffix and use getLocale() in budget

Browse Source
This commit is contained in:
Ulas
2026-03-31 23:27:44 +02:00
parent 66a9bdfa44
commit 26a8434369
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/pages/budget.js
+2 -2
View File
@@ -8,7 +8,7 @@
import { api } from '/api.js'; import { api } from '/api.js';
import { openModal as openSharedModal, closeModal } from '/components/modal.js'; import { openModal as openSharedModal, closeModal } from '/components/modal.js';
import { stagger, vibrate } from '/utils/ux.js'; import { stagger, vibrate } from '/utils/ux.js';
import { t, formatDate } from '/i18n.js'; import { t, formatDate, getLocale } from '/i18n.js';
// -------------------------------------------------------- // --------------------------------------------------------
// Konstanten // Konstanten
@@ -34,7 +34,7 @@ const CATEGORY_LABELS = () => ({
function getMonthName(monthIndex) { function getMonthName(monthIndex) {
// monthIndex: 0-based (0=Januar, 11=Dezember) // monthIndex: 0-based (0=Januar, 11=Dezember)
const date = new Date(2000, monthIndex, 1); const date = new Date(2000, monthIndex, 1);
return new Intl.DateTimeFormat(document.documentElement.lang || 'de', { month: 'long' }).format(date); return new Intl.DateTimeFormat(getLocale(), { month: 'long' }).format(date);
} }
// -------------------------------------------------------- // --------------------------------------------------------
public/pages/calendar.js
+1 -1
View File
@@ -665,7 +665,7 @@ function showEventPopup(ev, anchor) {
const timeStr = ev.all_day const timeStr = ev.all_day
? t('calendar.allDay') ? t('calendar.allDay')
: formatDateTime(ev.start_datetime) : formatDateTime(ev.start_datetime)
+ (ev.end_datetime ? ` – ${formatTime(ev.end_datetime)} Uhr` : ''); + (ev.end_datetime ? ` – ${formatTime(ev.end_datetime)}${t('calendar.timeSuffix') ? ' ' + t('calendar.timeSuffix') : ''}`.trim() : '');
popup.innerHTML = ` popup.innerHTML = `
<div class="event-popup__color-bar" style="background-color:${escHtml(ev.color)};"></div> <div class="event-popup__color-bar" style="background-color:${escHtml(ev.color)};"></div>
public/pages/dashboard.js
+4 -2
View File
@@ -35,7 +35,8 @@ function formatDateTime(isoString) {
: formatDate(d); : formatDate(d);
const timeStr = formatTime(d); const timeStr = formatTime(d);
return `${dateStr}, ${timeStr} Uhr`; const suffix = t('calendar.timeSuffix');
return `${dateStr}, ${timeStr}${suffix ? ' ' + suffix : ''}`.trim();
} }
function formatDueDate(dateStr) { function formatDueDate(dateStr) {
@@ -191,7 +192,8 @@ function renderUpcomingEvents(events) {
const items = events.map((e) => { const items = events.map((e) => {
const d = new Date(e.start_datetime); const d = new Date(e.start_datetime);
const isToday = d.toDateString() === today; const isToday = d.toDateString() === today;
const timeStr = e.all_day ? t('dashboard.allDay') : formatTime(d) + ' Uhr'; const _suffix = t('calendar.timeSuffix');
const timeStr = e.all_day ? t('dashboard.allDay') : `${formatTime(d)}${_suffix ? ' ' + _suffix : ''}`.trim();
return ` return `
<div class="event-item" data-route="/calendar" role="button" tabindex="0"> <div class="event-item" data-route="/calendar" role="button" tabindex="0">
<div class="event-item__bar" style="background-color:${e.color || 'var(--color-accent)'}"></div> <div class="event-item__bar" style="background-color:${e.color || 'var(--color-accent)'}"></div>