BuzzbeeSCD/openchamber
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(git): clean up in-progress merge/rebase banner

Browse Source 
Use the real status-warning tokens (--status-warning-bg did not exist, so
the card rendered without a fill), drop the decorative icons, and fold the
conflict count into the title as a single full-message key per locale.
The operation description now wraps instead of truncating, and both the
conflict and ready-to-continue states share the same action layout.
This commit is contained in:
Bohdan Triapitsyn
2026-08-02 20:27:05 +03:00
parent 25e22f007a
commit 9d48d5d02b
12 changed files with 94 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/ui/src/lib/i18n/messages/es.ts
+3
View File
@@ -834,12 +834,15 @@ export const dict: Record<I18nKey, string> = {
"gitView.operation.abort": "Abortar",
"gitView.operation.continue": "Continuar",
"gitView.operation.inProgressTitle": "{operation} en progreso",
"gitView.operation.inProgressTitleManyConflicts": "{operation} en curso: {count} conflictos",
"gitView.operation.inProgressTitleOneConflict": "{operation} en curso: {count} conflicto",
"gitView.operation.merge": "Merge",
"gitView.operation.mergeInProgressWithHead": "Haciendo merge de {head}",
"gitView.operation.mergingMessage": "Haciendo merge: {message}",
"gitView.operation.rebase": "Rebase",
"gitView.operation.rebaseInProgress": "Rebase en progreso",
"gitView.operation.rebasingOnto": "Haciendo rebase de {headName} sobre {onto}",
"gitView.operation.readyToContinueHint": "Todos los conflictos están resueltos. Continúa para finalizar la operación.",
"gitView.operation.resolveConflictsHint": "Resuelve los conflictos y luego continúa la operación.",
"gitView.operation.resolveWithAi": "Resolver con IA",
"gitView.stash.confirmButton": "Guardar cambios y continuar",