From 55ce7df9de38ed5bee56ae0383475ee1051423ba Mon Sep 17 00:00:00 2001 From: SecPan Date: Wed, 8 Jul 2026 14:00:05 -0700 Subject: [PATCH] Port upstream heading insert menu labels --- third_party/muya/src/locales/de.ts | 14 +++++++------- third_party/muya/src/locales/en.ts | 14 +++++++------- third_party/muya/src/locales/es.ts | 14 +++++++------- third_party/muya/src/locales/fr.ts | 14 +++++++------- third_party/muya/src/locales/ja.ts | 14 +++++++------- third_party/muya/src/locales/ko.ts | 14 +++++++------- third_party/muya/src/locales/pt.ts | 14 +++++++------- third_party/muya/src/locales/tr.ts | 14 +++++++------- third_party/muya/src/locales/zh-CN.ts | 14 +++++++------- third_party/muya/src/locales/zh-TW.ts | 14 +++++++------- .../__tests__/search.spec.ts | 13 ++++++++++++- .../muya/src/ui/paragraphQuickInsertMenu/config.ts | 14 +++++++------- 12 files changed, 89 insertions(+), 78 deletions(-) diff --git a/third_party/muya/src/locales/de.ts b/third_party/muya/src/locales/de.ts index 1fc7829..49caad7 100644 --- a/third_party/muya/src/locales/de.ts +++ b/third_party/muya/src/locales/de.ts @@ -16,12 +16,12 @@ export const de = { 'Paragraph': 'Absatz', 'Horizontal Line': 'Horizontale Linie', 'Front Matter': 'Front Matter', - 'Header 1': 'Überschrift 1', - 'Header 2': 'Überschrift 2', - 'Header 3': 'Überschrift 3', - 'Header 4': 'Überschrift 4', - 'Header 5': 'Überschrift 5', - 'Header 6': 'Überschrift 6', + 'Heading 1': 'Überschrift 1', + 'Heading 2': 'Überschrift 2', + 'Heading 3': 'Überschrift 3', + 'Heading 4': 'Überschrift 4', + 'Heading 5': 'Überschrift 5', + 'Heading 6': 'Überschrift 6', 'Table Block': 'Tabelle', 'Display Math': 'Mathematische Formel', 'HTML Block': 'HTML-Block', @@ -34,7 +34,7 @@ export const de = { 'Mermaid': 'Mermaid', 'Plantuml': 'Plantuml', 'basic blocks': 'Grundblöcke', - 'headers': 'Überschriften', + 'headings': 'Überschriften', 'advanced blocks': 'Erweiterte Blöcke', 'list blocks': 'Listen', 'diagrams': 'Diagramme', diff --git a/third_party/muya/src/locales/en.ts b/third_party/muya/src/locales/en.ts index ed911ee..da15c70 100644 --- a/third_party/muya/src/locales/en.ts +++ b/third_party/muya/src/locales/en.ts @@ -16,12 +16,12 @@ export const en = { 'Paragraph': 'Paragraph', 'Horizontal Line': 'Horizontal Line', 'Front Matter': 'Front Matter', - 'Header 1': 'Header 1', - 'Header 2': 'Header 2', - 'Header 3': 'Header 3', - 'Header 4': 'Header 4', - 'Header 5': 'Header 5', - 'Header 6': 'Header 6', + 'Heading 1': 'Heading 1', + 'Heading 2': 'Heading 2', + 'Heading 3': 'Heading 3', + 'Heading 4': 'Heading 4', + 'Heading 5': 'Heading 5', + 'Heading 6': 'Heading 6', 'Table Block': 'Table Block', 'Display Math': 'Display Math', 'HTML Block': 'HTML Block', @@ -34,7 +34,7 @@ export const en = { 'Mermaid': 'Mermaid', 'Plantuml': 'Plantuml', 'basic blocks': 'basic blocks', - 'headers': 'headers', + 'headings': 'headings', 'advanced blocks': 'advanced blocks', 'list blocks': 'list blocks', 'diagrams': 'diagrams', diff --git a/third_party/muya/src/locales/es.ts b/third_party/muya/src/locales/es.ts index ea83bfc..1d1dd25 100644 --- a/third_party/muya/src/locales/es.ts +++ b/third_party/muya/src/locales/es.ts @@ -16,12 +16,12 @@ export const es = { 'Paragraph': 'Párrafo', 'Horizontal Line': 'Línea horizontal', 'Front Matter': 'Front Matter', - 'Header 1': 'Encabezado 1', - 'Header 2': 'Encabezado 2', - 'Header 3': 'Encabezado 3', - 'Header 4': 'Encabezado 4', - 'Header 5': 'Encabezado 5', - 'Header 6': 'Encabezado 6', + 'Heading 1': 'Encabezado 1', + 'Heading 2': 'Encabezado 2', + 'Heading 3': 'Encabezado 3', + 'Heading 4': 'Encabezado 4', + 'Heading 5': 'Encabezado 5', + 'Heading 6': 'Encabezado 6', 'Table Block': 'Tabla', 'Display Math': 'Fórmula matemática', 'HTML Block': 'Bloque HTML', @@ -34,7 +34,7 @@ export const es = { 'Mermaid': 'Mermaid', 'Plantuml': 'Plantuml', 'basic blocks': 'bloques básicos', - 'headers': 'encabezados', + 'headings': 'encabezados', 'advanced blocks': 'bloques avanzados', 'list blocks': 'listas', 'diagrams': 'diagramas', diff --git a/third_party/muya/src/locales/fr.ts b/third_party/muya/src/locales/fr.ts index ae21756..622b4cd 100644 --- a/third_party/muya/src/locales/fr.ts +++ b/third_party/muya/src/locales/fr.ts @@ -16,12 +16,12 @@ export const fr = { 'Paragraph': 'Paragraphe', 'Horizontal Line': 'Ligne horizontale', 'Front Matter': 'Front Matter', - 'Header 1': 'Titre 1', - 'Header 2': 'Titre 2', - 'Header 3': 'Titre 3', - 'Header 4': 'Titre 4', - 'Header 5': 'Titre 5', - 'Header 6': 'Titre 6', + 'Heading 1': 'Titre 1', + 'Heading 2': 'Titre 2', + 'Heading 3': 'Titre 3', + 'Heading 4': 'Titre 4', + 'Heading 5': 'Titre 5', + 'Heading 6': 'Titre 6', 'Table Block': 'Tableau', 'Display Math': 'Formule mathématique', 'HTML Block': 'Bloc HTML', @@ -34,7 +34,7 @@ export const fr = { 'Mermaid': 'Mermaid', 'Plantuml': 'Plantuml', 'basic blocks': 'blocs de base', - 'headers': 'titres', + 'headings': 'titres', 'advanced blocks': 'blocs avancés', 'list blocks': 'listes', 'diagrams': 'diagrammes', diff --git a/third_party/muya/src/locales/ja.ts b/third_party/muya/src/locales/ja.ts index b54a05e..3ece391 100644 --- a/third_party/muya/src/locales/ja.ts +++ b/third_party/muya/src/locales/ja.ts @@ -16,12 +16,12 @@ export const ja = { 'Paragraph': '一般段落', 'Horizontal Line': '水平分割線', 'Front Matter': '上部情報ブロック', - 'Header 1': 'タイトル 1', - 'Header 2': 'タイトル 2', - 'Header 3': 'タイトル 3', - 'Header 4': 'タイトル 4', - 'Header 5': 'タイトル 5', - 'Header 6': 'タイトル 6', + 'Heading 1': 'タイトル 1', + 'Heading 2': 'タイトル 2', + 'Heading 3': 'タイトル 3', + 'Heading 4': 'タイトル 4', + 'Heading 5': 'タイトル 5', + 'Heading 6': 'タイトル 6', 'Table Block': '表', 'Display Math': '数式', 'HTML Block': 'HTMLブロック', @@ -34,7 +34,7 @@ export const ja = { 'Mermaid': 'Mermaid', 'Plantuml': 'Plantuml', 'basic blocks': '基礎ブロック', - 'headers': 'タイトル', + 'headings': 'タイトル', 'advanced blocks': '高級ブロック', 'list blocks': 'リスト', 'diagrams': '図表', diff --git a/third_party/muya/src/locales/ko.ts b/third_party/muya/src/locales/ko.ts index 1d00123..51125fd 100644 --- a/third_party/muya/src/locales/ko.ts +++ b/third_party/muya/src/locales/ko.ts @@ -16,12 +16,12 @@ export const ko = { 'Paragraph': '단락', 'Horizontal Line': '수평선', 'Front Matter': '머리말 블록', - 'Header 1': '제목 1', - 'Header 2': '제목 2', - 'Header 3': '제목 3', - 'Header 4': '제목 4', - 'Header 5': '제목 5', - 'Header 6': '제목 6', + 'Heading 1': '제목 1', + 'Heading 2': '제목 2', + 'Heading 3': '제목 3', + 'Heading 4': '제목 4', + 'Heading 5': '제목 5', + 'Heading 6': '제목 6', 'Table Block': '표', 'Display Math': '수식', 'HTML Block': 'HTML 블록', @@ -34,7 +34,7 @@ export const ko = { 'Mermaid': 'Mermaid', 'Plantuml': 'Plantuml', 'basic blocks': '기본 블록', - 'headers': '제목', + 'headings': '제목', 'advanced blocks': '고급 블록', 'list blocks': '목록', 'diagrams': '다이어그램', diff --git a/third_party/muya/src/locales/pt.ts b/third_party/muya/src/locales/pt.ts index 9c2728b..bd54634 100644 --- a/third_party/muya/src/locales/pt.ts +++ b/third_party/muya/src/locales/pt.ts @@ -16,12 +16,12 @@ export const pt = { 'Paragraph': 'Parágrafo', 'Horizontal Line': 'Linha horizontal', 'Front Matter': 'Front Matter', - 'Header 1': 'Título 1', - 'Header 2': 'Título 2', - 'Header 3': 'Título 3', - 'Header 4': 'Título 4', - 'Header 5': 'Título 5', - 'Header 6': 'Título 6', + 'Heading 1': 'Título 1', + 'Heading 2': 'Título 2', + 'Heading 3': 'Título 3', + 'Heading 4': 'Título 4', + 'Heading 5': 'Título 5', + 'Heading 6': 'Título 6', 'Table Block': 'Tabela', 'Display Math': 'Fórmula matemática', 'HTML Block': 'Bloco HTML', @@ -34,7 +34,7 @@ export const pt = { 'Mermaid': 'Mermaid', 'Plantuml': 'Plantuml', 'basic blocks': 'blocos básicos', - 'headers': 'títulos', + 'headings': 'títulos', 'advanced blocks': 'blocos avançados', 'list blocks': 'listas', 'diagrams': 'diagramas', diff --git a/third_party/muya/src/locales/tr.ts b/third_party/muya/src/locales/tr.ts index 75ef60b..2772e6d 100644 --- a/third_party/muya/src/locales/tr.ts +++ b/third_party/muya/src/locales/tr.ts @@ -16,12 +16,12 @@ export const tr = { 'Paragraph': 'Paragraf', 'Horizontal Line': 'Yatay Çizgi', 'Front Matter': 'Ön Bilgi', - 'Header 1': 'Başlık 1', - 'Header 2': 'Başlık 2', - 'Header 3': 'Başlık 3', - 'Header 4': 'Başlık 4', - 'Header 5': 'Başlık 5', - 'Header 6': 'Başlık 6', + 'Heading 1': 'Başlık 1', + 'Heading 2': 'Başlık 2', + 'Heading 3': 'Başlık 3', + 'Heading 4': 'Başlık 4', + 'Heading 5': 'Başlık 5', + 'Heading 6': 'Başlık 6', 'Table Block': 'Tablo Bloğu', 'Display Math': 'Matematik Bloğu', 'HTML Block': 'HTML Bloğu', @@ -34,7 +34,7 @@ export const tr = { 'Mermaid': 'Mermaid', 'Plantuml': 'Plantuml', 'basic blocks': 'temel bloklar', - 'headers': 'başlıklar', + 'headings': 'başlıklar', 'advanced blocks': 'gelişmiş bloklar', 'list blocks': 'liste blokları', 'diagrams': 'diyagramlar', diff --git a/third_party/muya/src/locales/zh-CN.ts b/third_party/muya/src/locales/zh-CN.ts index d05b0fd..0111592 100644 --- a/third_party/muya/src/locales/zh-CN.ts +++ b/third_party/muya/src/locales/zh-CN.ts @@ -16,12 +16,12 @@ export const zhCN = { 'Paragraph': '普通段落', 'Horizontal Line': '水平分割线', 'Front Matter': '顶部信息块', - 'Header 1': '标题 1', - 'Header 2': '标题 2', - 'Header 3': '标题 3', - 'Header 4': '标题 4', - 'Header 5': '标题 5', - 'Header 6': '标题 6', + 'Heading 1': '标题 1', + 'Heading 2': '标题 2', + 'Heading 3': '标题 3', + 'Heading 4': '标题 4', + 'Heading 5': '标题 5', + 'Heading 6': '标题 6', 'Table Block': '表格', 'Display Math': '数学公式', 'HTML Block': 'HTML块', @@ -34,7 +34,7 @@ export const zhCN = { 'Mermaid': 'Mermaid', 'Plantuml': 'Plantuml', 'basic blocks': '基础块', - 'headers': '标题', + 'headings': '标题', 'advanced blocks': '高级块', 'list blocks': '列表', 'diagrams': '图表', diff --git a/third_party/muya/src/locales/zh-TW.ts b/third_party/muya/src/locales/zh-TW.ts index a2d5260..ea07c45 100644 --- a/third_party/muya/src/locales/zh-TW.ts +++ b/third_party/muya/src/locales/zh-TW.ts @@ -16,12 +16,12 @@ export const zhTW = { 'Paragraph': '一般段落', 'Horizontal Line': '水平分隔線', 'Front Matter': '頂部資訊區塊', - 'Header 1': '標題 1', - 'Header 2': '標題 2', - 'Header 3': '標題 3', - 'Header 4': '標題 4', - 'Header 5': '標題 5', - 'Header 6': '標題 6', + 'Heading 1': '標題 1', + 'Heading 2': '標題 2', + 'Heading 3': '標題 3', + 'Heading 4': '標題 4', + 'Heading 5': '標題 5', + 'Heading 6': '標題 6', 'Table Block': '表格', 'Display Math': '數學公式', 'HTML Block': 'HTML 區塊', @@ -34,7 +34,7 @@ export const zhTW = { 'Mermaid': 'Mermaid', 'Plantuml': 'Plantuml', 'basic blocks': '基礎區塊', - 'headers': '標題', + 'headings': '標題', 'advanced blocks': '進階區塊', 'list blocks': '清單', 'diagrams': '圖表', diff --git a/third_party/muya/src/ui/paragraphQuickInsertMenu/__tests__/search.spec.ts b/third_party/muya/src/ui/paragraphQuickInsertMenu/__tests__/search.spec.ts index 7b5c258..fcd7388 100644 --- a/third_party/muya/src/ui/paragraphQuickInsertMenu/__tests__/search.spec.ts +++ b/third_party/muya/src/ui/paragraphQuickInsertMenu/__tests__/search.spec.ts @@ -85,7 +85,7 @@ describe('paragraphQuickInsertMenu search() — zh-CN localized matching', () => const sectionNames = menu.renderData.map(d => d.name); expect(sectionNames).toEqual([ 'basic blocks', - 'headers', + 'headings', 'advanced blocks', 'list blocks', 'diagrams', @@ -99,6 +99,17 @@ describe('paragraphQuickInsertMenu search() — zh-CN localized matching', () => 'thematic-break', 'frontmatter', ]); + + // h1-h6 are "headings" in CommonMark, not "headers" (#3811). + const headings = menu.renderData.find(d => d.name === 'headings')!; + expect(headings.children.map(c => c.title)).toEqual([ + 'Heading 1', + 'Heading 2', + 'Heading 3', + 'Heading 4', + 'Heading 5', + 'Heading 6', + ]); }); it('search(localized fragment) keeps only sections whose i18nTitle matched', () => { diff --git a/third_party/muya/src/ui/paragraphQuickInsertMenu/config.ts b/third_party/muya/src/ui/paragraphQuickInsertMenu/config.ts index 41751f4..7d4d202 100644 --- a/third_party/muya/src/ui/paragraphQuickInsertMenu/config.ts +++ b/third_party/muya/src/ui/paragraphQuickInsertMenu/config.ts @@ -100,10 +100,10 @@ export const MENU_CONFIG: IQuickInsertMenuItem[] = [ ], }, { - name: 'headers', + name: 'headings', children: [ { - title: 'Header 1', + title: 'Heading 1', subTitle: '# Lorem Ipsum...', label: 'atx-heading 1', shortCut: `${COMMAND_KEY}+1`, @@ -116,7 +116,7 @@ export const MENU_CONFIG: IQuickInsertMenuItem[] = [ icon: header1Icon, }, { - title: 'Header 2', + title: 'Heading 2', subTitle: '## Lorem Ipsum...', label: 'atx-heading 2', shortCut: `${COMMAND_KEY}+2`, @@ -129,7 +129,7 @@ export const MENU_CONFIG: IQuickInsertMenuItem[] = [ icon: header2Icon, }, { - title: 'Header 3', + title: 'Heading 3', subTitle: '### Lorem Ipsum...', label: 'atx-heading 3', shortCut: `${COMMAND_KEY}+3`, @@ -142,7 +142,7 @@ export const MENU_CONFIG: IQuickInsertMenuItem[] = [ icon: header3Icon, }, { - title: 'Header 4', + title: 'Heading 4', subTitle: '#### Lorem Ipsum...', label: 'atx-heading 4', shortCut: `${COMMAND_KEY}+4`, @@ -155,7 +155,7 @@ export const MENU_CONFIG: IQuickInsertMenuItem[] = [ icon: header4Icon, }, { - title: 'Header 5', + title: 'Heading 5', subTitle: '##### Lorem Ipsum...', label: 'atx-heading 5', shortCut: `${COMMAND_KEY}+5`, @@ -168,7 +168,7 @@ export const MENU_CONFIG: IQuickInsertMenuItem[] = [ icon: header5Icon, }, { - title: 'Header 6', + title: 'Heading 6', subTitle: '###### Lorem Ipsum...', label: 'atx-heading 6', shortCut: `${COMMAND_KEY}+6`,