From f73ca019cccd99697cbe50b11172651fbfd2e061 Mon Sep 17 00:00:00 2001 From: Jinjing <6427696+AmethystLiang@users.noreply.github.com> Date: Mon, 9 Nov 2026 19:28:28 -0800 Subject: [PATCH] fix: clarify account usage reset display --- .../status-bar/AccountSwitchList.tsx | 23 ++++++++- .../status-bar/InlineProviderUsage.tsx | 50 +++++++++---------- src/renderer/src/i18n/locales/de.json | 7 ++- src/renderer/src/i18n/locales/en.json | 7 ++- src/renderer/src/i18n/locales/es.json | 7 ++- src/renderer/src/i18n/locales/fr.json | 7 ++- src/renderer/src/i18n/locales/ja.json | 7 ++- src/renderer/src/i18n/locales/ko.json | 7 ++- src/renderer/src/i18n/locales/pt.json | 7 ++- src/renderer/src/i18n/locales/ru.json | 7 ++- src/renderer/src/i18n/locales/tr.json | 7 ++- src/renderer/src/i18n/locales/zh-Hant.json | 7 ++- src/renderer/src/i18n/locales/zh.json | 7 ++- 13 files changed, 111 insertions(+), 39 deletions(-) diff --git a/src/renderer/src/components/status-bar/AccountSwitchList.tsx b/src/renderer/src/components/status-bar/AccountSwitchList.tsx index b04f6a6c76f..cc3b8f6d0ac 100644 --- a/src/renderer/src/components/status-bar/AccountSwitchList.tsx +++ b/src/renderer/src/components/status-bar/AccountSwitchList.tsx @@ -6,6 +6,8 @@ import { DropdownMenuSeparator } from '@/components/ui/dropdown-menu' import { useTranslate } from '@/i18n/use-translate' +import { useAppStore } from '../../store' +import { normalizeUsagePercentageDisplay } from '../../../../shared/usage-percentage-display' export function AccountSwitchList({ heading, @@ -14,9 +16,28 @@ export function AccountSwitchList({ heading: string children: React.ReactNode }): React.JSX.Element { + const t = useTranslate() + const display = normalizeUsagePercentageDisplay( + useAppStore((state) => state.usagePercentageDisplay) + ) return (
- {heading} + + + {heading} + + + + {display === 'used' + ? t('auto.components.status.bar.AccountSwitchList.used', 'Used') + : t('auto.components.status.bar.AccountSwitchList.left', 'Left')} + + + {t('auto.components.status.bar.AccountSwitchList.reset', 'Reset')} + + + +
{children}
) diff --git a/src/renderer/src/components/status-bar/InlineProviderUsage.tsx b/src/renderer/src/components/status-bar/InlineProviderUsage.tsx index 758dbff20e0..77d8df2d7d8 100644 --- a/src/renderer/src/components/status-bar/InlineProviderUsage.tsx +++ b/src/renderer/src/components/status-bar/InlineProviderUsage.tsx @@ -12,10 +12,9 @@ import { useResetCountdownClock } from '@/hooks/useResetCountdownClock' import { barColor, clampUsedPercent } from './tooltip' import { formatWindowLabel } from '../../../../shared/rate-limit-window-label' import { formatResetDuration } from '../../../../shared/rate-limit-reset-format' -import { formatUsageLimitResetClock } from '../../../../shared/agent-session/failures/agent-session-usage-limit' -import { formatUsagePercentageLabel } from './usage-percentage-label' +import { formatBareUsagePercentage, formatUsagePercentageLabel } from './usage-percentage-label' import { getUsageRosterRowState } from './usage-roster-row-state' -import { useIntlLocale, useTranslate } from '@/i18n/use-translate' +import { useTranslate } from '@/i18n/use-translate' type InlineUsageWindow = { key: string; used: number; label: string; resetsAt: number | null } @@ -27,7 +26,6 @@ export function InlineUsageBars({ isFetching: boolean }): React.JSX.Element { const t = useTranslate() - const intlLocale = useIntlLocale() const display = normalizeUsagePercentageDisplay( useAppStore((state) => state.usagePercentageDisplay) ) @@ -89,30 +87,28 @@ export function InlineUsageBars({ ? window.resetsAt : null return ( -
-
-
- {/* Why: fill follows the selected percentage; color still signals consumption urgency. */} -
-
- - {formatUsagePercentageLabel(window.used, display, t)} {window.label} - - {/* Why: fixed width keeps the reset countdowns in one column across account rows. */} - - {resetsAt != null ? formatResetDuration(resetsAt - now) : null} - +
+ {window.label} +
+
- {resetsAt != null ? ( - - {t('auto.components.status.bar.InlineUsageBars.resetsAt', 'Resets {{when}}', { - when: formatUsageLimitResetClock(resetsAt, now, intlLocale) - })} - - ) : null} + + {formatBareUsagePercentage(window.used, display, t)} + + + {resetsAt != null ? formatResetDuration(resetsAt - now) : null} +
) })} diff --git a/src/renderer/src/i18n/locales/de.json b/src/renderer/src/i18n/locales/de.json index 27a1a47fdc4..acf76534726 100644 --- a/src/renderer/src/i18n/locales/de.json +++ b/src/renderer/src/i18n/locales/de.json @@ -5047,8 +5047,13 @@ "readAgo": "Ausgelesen {{time}}", "notRead": "Nutzung unbekannt: noch nicht ausgelesen" }, + "AccountSwitchList": { + "used": "Verbraucht", + "left": "Übrig", + "reset": "Zurücksetzung" + }, "InlineUsageBars": { - "resetsAt": "Zurücksetzung um {{when}}" + "resetsIn": "Zurücksetzung in {{duration}}" } } }, diff --git a/src/renderer/src/i18n/locales/en.json b/src/renderer/src/i18n/locales/en.json index 0188e5ac177..5ea64c2d57f 100644 --- a/src/renderer/src/i18n/locales/en.json +++ b/src/renderer/src/i18n/locales/en.json @@ -5433,8 +5433,13 @@ "readAgo": "Read {{time}}", "notRead": "Usage unknown: not read yet" }, + "AccountSwitchList": { + "used": "Used", + "left": "Left", + "reset": "Reset" + }, "InlineUsageBars": { - "resetsAt": "Resets {{when}}" + "resetsIn": "resets in {{duration}}" } } }, diff --git a/src/renderer/src/i18n/locales/es.json b/src/renderer/src/i18n/locales/es.json index 6d2e5b58793..d2e486ade0c 100644 --- a/src/renderer/src/i18n/locales/es.json +++ b/src/renderer/src/i18n/locales/es.json @@ -4595,8 +4595,13 @@ "readAgo": "Consultado {{time}}", "notRead": "Uso desconocido: aún no consultado" }, + "AccountSwitchList": { + "used": "Usado", + "left": "Restante", + "reset": "Restablecimiento" + }, "InlineUsageBars": { - "resetsAt": "Se restablece a las {{when}}" + "resetsIn": "se restablece en {{duration}}" } } }, diff --git a/src/renderer/src/i18n/locales/fr.json b/src/renderer/src/i18n/locales/fr.json index 0b31b53435a..e548f1759d6 100644 --- a/src/renderer/src/i18n/locales/fr.json +++ b/src/renderer/src/i18n/locales/fr.json @@ -4838,8 +4838,13 @@ "readAgo": "Relevé {{time}}", "notRead": "Utilisation inconnue : pas encore relevée" }, + "AccountSwitchList": { + "used": "Utilisé", + "left": "Restant", + "reset": "Réinitialisation" + }, "InlineUsageBars": { - "resetsAt": "Réinitialisation à {{when}}" + "resetsIn": "réinitialisation dans {{duration}}" } } }, diff --git a/src/renderer/src/i18n/locales/ja.json b/src/renderer/src/i18n/locales/ja.json index c4477e6f0a3..9c9cc8f4d74 100644 --- a/src/renderer/src/i18n/locales/ja.json +++ b/src/renderer/src/i18n/locales/ja.json @@ -4459,8 +4459,13 @@ "readAgo": "{{time}} に取得", "notRead": "使用量は不明:未取得" }, + "AccountSwitchList": { + "used": "使用済み", + "left": "残り", + "reset": "リセット" + }, "InlineUsageBars": { - "resetsAt": "{{when}} にリセット" + "resetsIn": "{{duration}}後にリセット" } } }, diff --git a/src/renderer/src/i18n/locales/ko.json b/src/renderer/src/i18n/locales/ko.json index 7249e947ec8..b56e4064687 100644 --- a/src/renderer/src/i18n/locales/ko.json +++ b/src/renderer/src/i18n/locales/ko.json @@ -4459,8 +4459,13 @@ "readAgo": "{{time}}에 조회", "notRead": "사용량을 알 수 없음: 아직 조회하지 않음" }, + "AccountSwitchList": { + "used": "사용량", + "left": "남음", + "reset": "초기화" + }, "InlineUsageBars": { - "resetsAt": "{{when}}에 초기화" + "resetsIn": "{{duration}} 후 초기화" } } }, diff --git a/src/renderer/src/i18n/locales/pt.json b/src/renderer/src/i18n/locales/pt.json index 5238a12bb0d..8c44666ea2a 100644 --- a/src/renderer/src/i18n/locales/pt.json +++ b/src/renderer/src/i18n/locales/pt.json @@ -3614,8 +3614,13 @@ "readAgo": "Lido {{time}}", "notRead": "Uso desconhecido: ainda não consultado" }, + "AccountSwitchList": { + "used": "Usado", + "left": "Restante", + "reset": "Redefinição" + }, "InlineUsageBars": { - "resetsAt": "Redefinição em {{when}}" + "resetsIn": "redefinição em {{duration}}" } } }, diff --git a/src/renderer/src/i18n/locales/ru.json b/src/renderer/src/i18n/locales/ru.json index ba2226b3e60..5d7ea990871 100644 --- a/src/renderer/src/i18n/locales/ru.json +++ b/src/renderer/src/i18n/locales/ru.json @@ -5235,8 +5235,13 @@ "readAgo": "Считано {{time}}", "notRead": "Использование неизвестно: данные ещё не считаны" }, + "AccountSwitchList": { + "used": "Использовано", + "left": "Осталось", + "reset": "Сброс" + }, "InlineUsageBars": { - "resetsAt": "Сброс: {{when}}" + "resetsIn": "сброс через {{duration}}" } } }, diff --git a/src/renderer/src/i18n/locales/tr.json b/src/renderer/src/i18n/locales/tr.json index 24351d89062..e9f8bdc1dc8 100644 --- a/src/renderer/src/i18n/locales/tr.json +++ b/src/renderer/src/i18n/locales/tr.json @@ -5031,8 +5031,13 @@ "readAgo": "Okunma zamanı: {{time}}", "notRead": "Kullanım bilinmiyor: henüz okunmadı" }, + "AccountSwitchList": { + "used": "Kullanılan", + "left": "Kalan", + "reset": "Sıfırlanma" + }, "InlineUsageBars": { - "resetsAt": "Sıfırlanma zamanı: {{when}}" + "resetsIn": "{{duration}} içinde sıfırlanır" } } }, diff --git a/src/renderer/src/i18n/locales/zh-Hant.json b/src/renderer/src/i18n/locales/zh-Hant.json index 7ee762fcc3f..307f2f4765d 100644 --- a/src/renderer/src/i18n/locales/zh-Hant.json +++ b/src/renderer/src/i18n/locales/zh-Hant.json @@ -4932,8 +4932,13 @@ "readAgo": "讀取於 {{time}}", "notRead": "用量未知:尚未讀取" }, + "AccountSwitchList": { + "used": "已用", + "left": "剩餘", + "reset": "重設" + }, "InlineUsageBars": { - "resetsAt": "將於 {{when}} 重設" + "resetsIn": "{{duration}}後重設" } } }, diff --git a/src/renderer/src/i18n/locales/zh.json b/src/renderer/src/i18n/locales/zh.json index e9601e53fb1..1ef22a1163d 100644 --- a/src/renderer/src/i18n/locales/zh.json +++ b/src/renderer/src/i18n/locales/zh.json @@ -4459,8 +4459,13 @@ "readAgo": "读取于 {{time}}", "notRead": "用量未知:尚未读取" }, + "AccountSwitchList": { + "used": "已用", + "left": "剩余", + "reset": "重置" + }, "InlineUsageBars": { - "resetsAt": "将在 {{when}} 重置" + "resetsIn": "{{duration}}后重置" } } },