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/fr.ts
+3
View File
@@ -661,12 +661,15 @@ export const dict = {
'gitView.operation.abort': 'Avorter',
'gitView.operation.continue': 'Continuer',
'gitView.operation.inProgressTitle': '{operation} en cours',
'gitView.operation.inProgressTitleManyConflicts': '{operation} en cours : {count} conflits',
'gitView.operation.inProgressTitleOneConflict': '{operation} en cours : {count} conflit',
'gitView.operation.merge': 'Fusionner',
'gitView.operation.mergeInProgressWithHead': 'Fusion de {head}',
'gitView.operation.mergingMessage': 'Fusion : {message}',
'gitView.operation.rebase': 'Rebase',
'gitView.operation.rebaseInProgress': 'Rebase en cours',
'gitView.operation.rebasingOnto': 'Rebaser {headName} sur {onto}',
'gitView.operation.readyToContinueHint': 'Tous les conflits sont résolus. Poursuivez pour terminer l’opération.',
'gitView.operation.resolveConflictsHint': 'Résolvez les conflits, puis poursuivez l\'opération.',
'gitView.operation.resolveWithAi': 'Résoudre avec l\'IA',
'gitView.stash.confirmButton': 'Confirmer',