Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/app/commandRegistry.ts
Original file line number Diff line number Diff line change
Expand Up @@ -791,7 +791,7 @@ export const commandRegistry: AppCommand[] = [
keywords: ['help', 'about'],
enabled: true,
visibility: 'global',
defaultShortcut: { keys: ['Ctrl', 'Shift', 'B'], scope: 'global' },
defaultShortcut: { keys: [], scope: 'global' },
placements: ['command-palette', 'menu'],
action: { type: 'view-action', name: 'about' },
},
Expand Down
4 changes: 2 additions & 2 deletions src/app/statusBarPhrases.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,14 @@ describe('statusBarPhrases', () => {
})

it('formats text difference section phrases', () => {
expect(formatDifferenceCountPhrase(null, 'text-compare')).toBe('≠ -')
expect(formatDifferenceCountPhrase(null, 'text-compare')).toBe('Differences: —')
expect(formatDifferenceCountPhrase(1, 'text-compare')).toBe('≠ 1 difference section')
expect(formatDifferenceCountPhrase(3, 'text-merge')).toBe('≠ 3 difference sections')
expect(formatDifferenceCountPhrase(2, 'folder-compare')).toBe('Differences: 2')
expect(formatDifferenceCountPhrase(0, 'hex-compare')).toBe('≠ Same')
expect(formatDifferenceCountPhrase(3, 'hex-compare')).toBe('≠ Binary differences')
expect(isHexSessionStatusSource('hex-compare')).toBe(true)
expect(formatDifferenceCountPhrase(null, 'picture-compare')).toBe('≠ -')
expect(formatDifferenceCountPhrase(null, 'picture-compare')).toBe('Differences: —')
expect(formatDifferenceCountPhrase(0, 'picture-compare')).toBe('≠ Same')
expect(formatDifferenceCountPhrase(1, 'picture-compare')).toBe('≠ 1 pixel')
expect(formatDifferenceCountPhrase(4, 'picture-compare')).toBe('≠ 4 pixels')
Expand Down
4 changes: 2 additions & 2 deletions src/app/statusBarPhrases.ts
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ export function formatDifferenceCountPhrase(

if (isPictureSessionStatusSource(source)) {
if (differenceCount === null) {
return '≠ -'
return 'Differences: —'
}

if (differenceCount === 0) {
Expand All @@ -114,7 +114,7 @@ export function formatDifferenceCountPhrase(
}

if (differenceCount === null) {
return '≠ -'
return 'Differences: —'
}

if (differenceCount === 1) {
Expand Down
13 changes: 13 additions & 0 deletions src/components/workbench/PathMetaFooter.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,17 @@ describe('PathMetaFooter chip menus', () => {
)
wrapper.unmount()
})

it('hints when no path metadata is available', () => {
const wrapper = mountFooter({
stamp: null,
formatLabel: undefined,
encoding: undefined,
lineEnding: undefined,
})

expect(wrapper.attributes('title')).toContain('Choose a path')
expect(wrapper.text()).toContain('—')
wrapper.unmount()
})
})
1 change: 1 addition & 0 deletions src/components/workbench/PathMetaFooter.vue
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ onBeforeUnmount(() => {
data-path-meta-eol="capture-1to1-residual"
data-path-meta-gap="capture-1to1-residual"
:data-testid="testId"
:title="isMuted ? t('status.pathMetaEmptyHint') : undefined"
>
<template v-if="meta">
<span
Expand Down
13 changes: 8 additions & 5 deletions src/i18n/locales/de-DE.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export const deDE: LanguagePack = {
'command.planned': 'Geplant',
'command.previousDifference': 'Vorheriger Unterschied',
'command.ready': 'Verfügbar',
'command.searchPlaceholder': 'Suchbefehle',
'command.searchPlaceholder': 'Menüs und Befehle suchen',
'command.toggleTheme': 'Thema umschalten',
'command.toggleMinor': 'Nebensächliche umschalten',
'command.expandAll': 'Alle erweitern',
Expand Down Expand Up @@ -180,8 +180,8 @@ export const deDE: LanguagePack = {
'ui.hexCompare': 'Hex-Vergleich',
'ui.hexDetails': 'Hex-Details',
'ui.help': 'Helfen',
'ui.helpContents': 'Inhalt',
'ui.contextHelp': 'Kontexthilfe',
'ui.helpContents': 'Dokumentation',
'ui.contextHelp': 'Hilfe zu dieser Ansicht',
'ui.contextHelpTopic': 'Hilfe: {topic}',
'ui.about': 'Über Open Diff',
'ui.checkForUpdates': 'Nach Updates suchen',
Expand All @@ -192,8 +192,10 @@ export const deDE: LanguagePack = {
'ui.aboutTitle': 'Über Open Diff',
'ui.aboutVersion': 'Version {version}',
'ui.aboutLicense': 'Lizenziert unter Apache-2.0',
'ui.aboutHomepage': 'Projekt-Homepage',
'ui.aboutHomepage': 'Dokumentation & Homepage',
'ui.aboutClose': 'Schließen',
'ui.aboutHint':
'Open Diff vergleicht Dateien und Ordner. Guides unter Hilfe → Dokumentation, Fragen unter Support.',
'ui.updatesCheckOpened': 'Die Releases-Seite wurde zum Update-Check geöffnet.',
'ui.updatesCheckDisabled': 'Update-Prüfungen sind per Richtlinie deaktiviert.',
'status.alignWithApplied': '{source} mit {target} ausgerichtet',
Expand Down Expand Up @@ -492,7 +494,7 @@ export const deDE: LanguagePack = {
'status.unimportantDifference': 'Unwichtiger Unterschied',
'status.importantUnimportantCounts': '{important} wichtig, {unimportant} unwichtig',
'ui.conflict': 'Konflikt',
'status.differenceSectionUnknown': '≠ -',
'status.differenceSectionUnknown': 'Unterschiede: —',
'status.differenceSections': '≠ {count} Differenzabschnitte',
'status.differenceSection': '≠ {count} Differenzabschnitt',
'status.insertMode': 'Einfügen',
Expand All @@ -502,6 +504,7 @@ export const deDE: LanguagePack = {
'status.pathFileMetadataWithDetail': '{metadata} · {detail}',
'status.filesSelectedBytesWithDate': '{count} Datei(en) ausgewählt, {bytes} Bytes, {modified}',
'status.panePlaceholder': '—',
'status.pathMetaEmptyHint': 'Pfad wählen, um Größe und Datum zu sehen',
'status.readyIdle': 'Bereit',
'status.filesAndFoldersSelectedBytes':
'{files} Datei(en), {folders} Ordner ausgewählt, {bytes} Bytes',
Expand Down
13 changes: 8 additions & 5 deletions src/i18n/locales/en-US.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export const enUS: LanguagePack = {
'command.planned': 'Planned',
'command.previousDifference': 'Previous Difference',
'command.ready': 'Ready',
'command.searchPlaceholder': 'Search commands',
'command.searchPlaceholder': 'Search menus and commands',
'command.toggleTheme': 'Toggle Theme',
'command.toggleMinor': 'Toggle Minor',
'command.expandAll': 'Expand All',
Expand Down Expand Up @@ -203,8 +203,8 @@ export const enUS: LanguagePack = {
'ui.hexCompareInspector': 'Hex compare inspector',
'ui.hexDetails': 'Hex Details',
'ui.help': 'Help',
'ui.helpContents': 'Contents',
'ui.contextHelp': 'Context Help',
'ui.helpContents': 'Documentation',
'ui.contextHelp': 'Help for This View',
'ui.contextHelpTopic': 'Help: {topic}',
'ui.about': 'About Open Diff',
'ui.checkForUpdates': 'Check for Updates',
Expand All @@ -215,8 +215,10 @@ export const enUS: LanguagePack = {
'ui.aboutTitle': 'About Open Diff',
'ui.aboutVersion': 'Version {version}',
'ui.aboutLicense': 'Licensed under Apache-2.0',
'ui.aboutHomepage': 'Project homepage',
'ui.aboutHomepage': 'Documentation & homepage',
'ui.aboutClose': 'Close',
'ui.aboutHint':
'Open Diff compares files and folders. Use Help → Documentation for guides, or Support for questions.',
'ui.updatesCheckOpened': 'Opened the releases page to check for updates.',
'ui.updatesCheckDisabled': 'Update checks are disabled by policy.',
'status.alignWithApplied': 'Aligned {source} with {target}',
Expand Down Expand Up @@ -587,7 +589,7 @@ export const enUS: LanguagePack = {
'status.unimportantDifference': 'Unimportant Difference',
'status.importantUnimportantCounts': '{important} important, {unimportant} unimportant',
'ui.conflict': 'Conflict',
'status.differenceSectionUnknown': '≠ -',
'status.differenceSectionUnknown': 'Differences: —',
'status.differenceSections': '≠ {count} difference sections',
'status.differenceSection': '≠ {count} difference section',
'status.insertMode': 'Insert',
Expand All @@ -597,6 +599,7 @@ export const enUS: LanguagePack = {
'status.pathFileMetadataWithDetail': '{metadata} · {detail}',
'status.filesSelectedBytesWithDate': '{count} file(s) selected, {bytes} bytes, {modified}',
'status.panePlaceholder': '—',
'status.pathMetaEmptyHint': 'Choose a path to see size and date',
'status.readyIdle': 'Ready',
'status.filesAndFoldersSelectedBytes':
'{files} file(s), {folders} folder(s) selected, {bytes} bytes',
Expand Down
13 changes: 8 additions & 5 deletions src/i18n/locales/es-ES.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export const esES: LanguagePack = {
'command.planned': 'Planificado',
'command.previousDifference': 'Diferencia anterior',
'command.ready': 'Disponible',
'command.searchPlaceholder': 'Comandos de búsqueda',
'command.searchPlaceholder': 'Buscar menús y comandos',
'command.toggleTheme': 'Alternar tema',
'command.toggleMinor': 'Alternar menores',
'command.expandAll': 'Expandir todo',
Expand Down Expand Up @@ -176,8 +176,8 @@ export const esES: LanguagePack = {
'ui.hexCompare': 'Comparación hexadecimal',
'ui.hexDetails': 'Detalles hexagonales',
'ui.help': 'Ayuda',
'ui.helpContents': 'Contenido',
'ui.contextHelp': 'Ayuda contextual',
'ui.helpContents': 'Documentación',
'ui.contextHelp': 'Ayuda de esta vista',
'ui.contextHelpTopic': 'Ayuda: {topic}',
'ui.about': 'Acerca de Open Diff',
'ui.checkForUpdates': 'Buscar actualizaciones',
Expand All @@ -188,8 +188,10 @@ export const esES: LanguagePack = {
'ui.aboutTitle': 'Acerca de Open Diff',
'ui.aboutVersion': 'Versión {version}',
'ui.aboutLicense': 'Licencia Apache-2.0',
'ui.aboutHomepage': 'Página del proyecto',
'ui.aboutHomepage': 'Documentación e inicio',
'ui.aboutClose': 'Cerrar',
'ui.aboutHint':
'Open Diff compara archivos y carpetas. Guías en Ayuda → Documentación; preguntas en Soporte.',
'ui.updatesCheckOpened': 'Se abrió la página de versiones para buscar actualizaciones.',
'ui.updatesCheckDisabled':
'Las comprobaciones de actualización están deshabilitadas por directiva.',
Expand Down Expand Up @@ -486,7 +488,7 @@ export const esES: LanguagePack = {
'status.unimportantDifference': 'Diferencia no importante',
'status.importantUnimportantCounts': '{important} importantes, {unimportant} no importantes',
'ui.conflict': 'Conflicto',
'status.differenceSectionUnknown': '≠ -',
'status.differenceSectionUnknown': 'Diferencias: —',
'status.differenceSections': '≠ {count} secciones de diferencias',
'status.differenceSection': '≠ {count} sección de diferencias',
'status.insertMode': 'Insertar',
Expand All @@ -497,6 +499,7 @@ export const esES: LanguagePack = {
'status.filesSelectedBytesWithDate':
'{count} archivo(s) seleccionado(s), {bytes} bytes, {modified}',
'status.panePlaceholder': '—',
'status.pathMetaEmptyHint': 'Elija una ruta para ver tamaño y fecha',
'status.readyIdle': 'Listo',
'status.filesAndFoldersSelectedBytes':
'{files} archivo(s), {folders} carpeta(s) seleccionada(s), {bytes} bytes',
Expand Down
13 changes: 8 additions & 5 deletions src/i18n/locales/fr-FR.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export const frFR: LanguagePack = {
'command.planned': 'Prévu',
'command.previousDifference': 'Différence précédente',
'command.ready': 'Disponible',
'command.searchPlaceholder': 'Commandes de recherche',
'command.searchPlaceholder': 'Rechercher menus et commandes',
'command.toggleTheme': 'Basculer le thème',
'command.toggleMinor': 'Basculer mineur',
'command.expandAll': 'Tout développer',
Expand Down Expand Up @@ -177,8 +177,8 @@ export const frFR: LanguagePack = {
'ui.hexCompare': 'Comparaison hexadécimale',
'ui.hexDetails': "Détails de l'hexagone",
'ui.help': 'Aide',
'ui.helpContents': 'Sommaire',
'ui.contextHelp': 'Aide contextuelle',
'ui.helpContents': 'Documentation',
'ui.contextHelp': 'Aide pour cette vue',
'ui.contextHelpTopic': 'Aide : {topic}',
'ui.about': 'À propos d’Open Diff',
'ui.checkForUpdates': 'Rechercher des mises à jour',
Expand All @@ -189,8 +189,10 @@ export const frFR: LanguagePack = {
'ui.aboutTitle': 'À propos d’Open Diff',
'ui.aboutVersion': 'Version {version}',
'ui.aboutLicense': 'Sous licence Apache-2.0',
'ui.aboutHomepage': 'Page d’accueil du projet',
'ui.aboutHomepage': 'Documentation et page d’accueil',
'ui.aboutClose': 'Fermer',
'ui.aboutHint':
'Open Diff compare fichiers et dossiers. Guides : Aide → Documentation ; questions : Support.',
'ui.updatesCheckOpened': 'Page des versions ouverte pour vérifier les mises à jour.',
'ui.updatesCheckDisabled': 'Les vérifications de mise à jour sont désactivées par stratégie.',
'status.alignWithApplied': '{source} aligné avec {target}',
Expand Down Expand Up @@ -487,7 +489,7 @@ export const frFR: LanguagePack = {
'status.unimportantDifference': 'Différence peu importante',
'status.importantUnimportantCounts': '{important} importantes, {unimportant} peu importantes',
'ui.conflict': 'Conflit',
'status.differenceSectionUnknown': '≠ -',
'status.differenceSectionUnknown': 'Différences : —',
'status.differenceSections': '≠ {count} sections de différences',
'status.differenceSection': '≠ {count} section de différences',
'status.insertMode': 'Insertion',
Expand All @@ -498,6 +500,7 @@ export const frFR: LanguagePack = {
'status.filesSelectedBytesWithDate':
'{count} fichier(s) sélectionné(s), {bytes} octets, {modified}',
'status.panePlaceholder': '—',
'status.pathMetaEmptyHint': 'Choisissez un chemin pour voir taille et date',
'status.readyIdle': 'Prêt',
'status.filesAndFoldersSelectedBytes':
'{files} fichier(s), {folders} dossier(s) sélectionné(s), {bytes} octets',
Expand Down
13 changes: 8 additions & 5 deletions src/i18n/locales/ja-JP.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export const jaJP: LanguagePack = {
'command.planned': 'Planned',
'command.previousDifference': 'Previous Difference',
'command.ready': 'Ready',
'command.searchPlaceholder': 'Search commands',
'command.searchPlaceholder': 'メニューとコマンドを検索',
'command.toggleTheme': 'Toggle Theme',
'command.toggleMinor': 'マイナーを切替',
'command.expandAll': 'すべて展開',
Expand Down Expand Up @@ -201,8 +201,8 @@ export const jaJP: LanguagePack = {
'ui.hexCompareInspector': 'Hex compare inspector',
'ui.hexDetails': 'Hex Details',
'ui.help': 'Help',
'ui.helpContents': '目次',
'ui.contextHelp': 'コンテキスト ヘルプ',
'ui.helpContents': 'ドキュメント',
'ui.contextHelp': 'このビューのヘルプ',
'ui.contextHelpTopic': 'ヘルプ: {topic}',
'ui.about': 'Open Diff について',
'ui.checkForUpdates': '更新を確認',
Expand All @@ -213,8 +213,10 @@ export const jaJP: LanguagePack = {
'ui.aboutTitle': 'Open Diff について',
'ui.aboutVersion': 'バージョン {version}',
'ui.aboutLicense': 'Apache-2.0 ライセンス',
'ui.aboutHomepage': 'プロジェクトのホームページ',
'ui.aboutHomepage': 'ドキュメントとホームページ',
'ui.aboutClose': '閉じる',
'ui.aboutHint':
'Open Diff はファイルとフォルダーを比較します。ガイドはヘルプ → ドキュメント、質問はサポートへ。',
'ui.updatesCheckOpened': '更新確認のためリリースページを開きました。',
'ui.updatesCheckDisabled': 'ポリシーにより更新確認が無効です。',
'status.alignWithApplied': '{source} を {target} に整列しました',
Expand Down Expand Up @@ -584,7 +586,7 @@ export const jaJP: LanguagePack = {
'status.unimportantDifference': '重要でない差異',
'status.importantUnimportantCounts': '重要 {important}、重要でない {unimportant}',
'ui.conflict': '競合',
'status.differenceSectionUnknown': '≠ -',
'status.differenceSectionUnknown': '差分: —',
'status.differenceSections': '≠ {count} 差分セクション',
'status.differenceSection': '≠ {count} 差分セクション',
'status.insertMode': '挿入',
Expand All @@ -594,6 +596,7 @@ export const jaJP: LanguagePack = {
'status.pathFileMetadataWithDetail': '{metadata} · {detail}',
'status.filesSelectedBytesWithDate': '{count} 個のファイルを選択、{bytes} バイト、{modified}',
'status.panePlaceholder': '—',
'status.pathMetaEmptyHint': 'パスを選ぶとサイズと日付が表示されます',
'status.readyIdle': '準備完了',
'status.filesAndFoldersSelectedBytes':
'{files} 個のファイル、{folders} 個のフォルダーを選択、{bytes} バイト',
Expand Down
13 changes: 8 additions & 5 deletions src/i18n/locales/ko-KR.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export const koKR: LanguagePack = {
'command.planned': '예정',
'command.previousDifference': '이전 차이',
'command.ready': '사용 가능',
'command.searchPlaceholder': '검색 명령',
'command.searchPlaceholder': '메뉴와 명령 검색',
'command.toggleTheme': '테마 전환',
'command.toggleMinor': '부차 차이 전환',
'command.expandAll': '모두 펼치기',
Expand Down Expand Up @@ -172,8 +172,8 @@ export const koKR: LanguagePack = {
'ui.hexCompare': '16진수 비교',
'ui.hexDetails': '16진수 세부정보',
'ui.help': '돕다',
'ui.helpContents': '목차',
'ui.contextHelp': '상황별 도움말',
'ui.helpContents': '문서',
'ui.contextHelp': '이 보기 도움말',
'ui.contextHelpTopic': '도움말: {topic}',
'ui.about': 'Open Diff 정보',
'ui.checkForUpdates': '업데이트 확인',
Expand All @@ -184,8 +184,10 @@ export const koKR: LanguagePack = {
'ui.aboutTitle': 'Open Diff 정보',
'ui.aboutVersion': '버전 {version}',
'ui.aboutLicense': 'Apache-2.0 라이선스',
'ui.aboutHomepage': '프로젝트 홈페이지',
'ui.aboutHomepage': '문서 및 홈페이지',
'ui.aboutClose': '닫기',
'ui.aboutHint':
'Open Diff는 파일과 폴더를 비교합니다. 안내는 도움말 → 문서, 질문은 지원을 보세요.',
'ui.updatesCheckOpened': '업데이트 확인을 위해 릴리스 페이지를 열었습니다.',
'ui.updatesCheckDisabled': '정책에 의해 업데이트 확인이 비활성화되었습니다.',
'status.alignWithApplied': '{source}을(를) {target}과(와) 맞춤',
Expand Down Expand Up @@ -474,7 +476,7 @@ export const koKR: LanguagePack = {
'status.unimportantDifference': '중요하지 않은 차이',
'status.importantUnimportantCounts': '중요 {important}, 중요하지 않음 {unimportant}',
'ui.conflict': '충돌',
'status.differenceSectionUnknown': '≠ -',
'status.differenceSectionUnknown': '차이: —',
'status.differenceSections': '≠ {count}개 차이 구역',
'status.differenceSection': '≠ {count}개 차이 구역',
'status.insertMode': '삽입',
Expand All @@ -484,6 +486,7 @@ export const koKR: LanguagePack = {
'status.pathFileMetadataWithDetail': '{metadata} · {detail}',
'status.filesSelectedBytesWithDate': '파일 {count}개 선택, {bytes}바이트, {modified}',
'status.panePlaceholder': '—',
'status.pathMetaEmptyHint': '경로를 선택하면 크기와 날짜를 볼 수 있습니다',
'status.readyIdle': '준비됨',
'status.filesAndFoldersSelectedBytes': '파일 {files}개, 폴더 {folders}개 선택, {bytes}바이트',
'status.foldersSelected': '폴더 {count}개 선택',
Expand Down
Loading
Loading