coteditor/CotEditor
1
0
Fork 0
mirror of https://github.com/coteditor/CotEditor.git synced 2024-09-20 15:47:57 +03:00
Code Issues Projects Releases Wiki Activity

Improve UI text in syntax editor

Browse Source
This commit is contained in:
1024jp 2024-02-19 20:46:41 +09:00
parent a1b34bf3a5
commit 9282b5d22d
6 changed files with 70 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CotEditor/Sources/SyntaxCommentEditView.swift
View File

@ -53,7 +53,6 @@ private struct CommentDelimitersEditView: View {
HStack(alignment: .firstTextBaseline, spacing: 32) {
VStack(alignment: .leading) {
Text("Inline comment:", tableName: "SyntaxEdit", comment: "label")
.fontWeight(.medium)
Form {
TextField(String(localized: "Begin with:", table: "SyntaxEdit", comment: "label"),
text: $comment.inline ?? "", prompt: Self.placeholder)
@ -62,7 +61,6 @@ private struct CommentDelimitersEditView: View {
VStack(alignment: .leading) {
Text("Block comment:", tableName: "SyntaxEdit", comment: "label")
.fontWeight(.medium)
Form {
TextField(String(localized: "Begin with:", table: "SyntaxEdit", comment: "label"),
text: $comment.blockBegin ?? "", prompt: Self.placeholder)

2
CotEditor/Sources/SyntaxCompletionEditView.swift
View File

@ -41,7 +41,7 @@ struct SyntaxCompletionEditView: View {
var body: some View {
VStack(alignment: .leading) {
Text("If no word, the completion list will be generated from coloring settings.", tableName: "SyntaxEdit", comment: "message")
Text("If not specified, the completion list is generated based on the highlighting settings.", tableName: "SyntaxEdit", comment: "message")
.controlSize(.small)
Table($completions, selection: $selection) {

4
CotEditor/Sources/SyntaxEditView.swift
View File

@ -75,7 +75,7 @@ struct SyntaxEditView: View {
NavigationSplitView(columnVisibility: .constant(.all)) {
List(selection: $pane) {
Section(String(localized: "Highlight", table: "SyntaxEdit", comment: "section header in sidebar")) {
Section(String(localized: "Highlighting", table: "SyntaxEdit", comment: "section header in sidebar")) {
ForEach(Pane.terms, id: \.self) { pane in
Text(pane.label)
}
@ -103,7 +103,7 @@ struct SyntaxEditView: View {
TextField(text: $name, label: EmptyView.init)
.focused($isNameFieldFocused)
.fontWeight(.medium)
.frame(maxWidth: 160)
.frame(minWidth: 80, maxWidth: 160)
.onChange(of: self.name) { newValue in
self.validate(name: newValue)
}

4
CotEditor/Sources/SyntaxFileMappingEditView.swift
View File

@ -40,7 +40,7 @@ struct SyntaxFileMappingEditView: View {
GridRow {
EditTable($extensions) {
HStack {
Text("Extensions:", tableName: "SyntaxEdit", comment: "label")
Text("Extensions:", tableName: "SyntaxEdit", comment: "label for file extensions")
Text("(without dot)", tableName: "SyntaxEdit", comment: "additional label to “Extensions:”")
.fontWeight(.regular)
.foregroundStyle(.secondary)
@ -95,8 +95,6 @@ struct SyntaxFileMappingEditView: View {
VStack(alignment: .leading) {
self.label()
.fontWeight(.medium)
.padding(.bottom, -4)
List(selection: $selection) {
ForEach($items) {

11
CotEditor/Sources/SyntaxOutlineEditView.swift
View File

@ -41,7 +41,7 @@ struct SyntaxOutlineEditView: View {
var body: some View {
VStack(alignment: .leading) {
Text("Outline extraction rules", tableName: "SyntaxEdit", comment: "label")
Text("Outline extraction rules:", tableName: "SyntaxEdit", comment: "label")
Table($outlines, selection: $selection) {
TableColumn(String(localized: "IC", table: "SyntaxEdit", comment: "table column header (IC for Ignore Case)")) { item in
@ -116,17 +116,15 @@ struct SyntaxOutlineEditView: View {
}
private var prompt: String? {
private var prompt: String {
switch self.error {
case .noSelection:
String(localized: "No item selected", table: "SyntaxEdit", comment: "placeholder")
case .multipleSelection:
String(localized: "Multiple items selected", table: "SyntaxEdit", comment: "placeholder")
case .none where self.outline.template.isEmpty:
String(localized: "Entire match", table: "SyntaxEdit", comment: "placeholder")
case .none:
nil
String(localized: "Entire match", table: "SyntaxEdit", comment: "placeholder")
}
}
}
@ -145,7 +143,8 @@ enum SelectionError: Error {
#Preview {
@State var outlines: [SyntaxDefinition.Outline] = [
.init(pattern: "abc")
.init(pattern: "abc"),
.init(pattern: "def", ignoreCase: true, italic: true),
]
return SyntaxOutlineEditView(outlines: $outlines)

84
CotEditor/mul.lproj/SyntaxEdit.xcstrings
View File

@ -43,7 +43,7 @@
"ja" : {
"stringUnit" : {
"state" : "translated",
"value" : "（空白は一致した全文字列）"
"value" : "（空欄は一致した全文字列）"
}
},
"pt" : {
@ -846,6 +846,12 @@
"Definition" : {
"comment" : "section header in sidebar",
"localizations" : {
"de" : {
"stringUnit" : {
"state" : "translated",
"value" : "Definition"
}
},
"en-GB" : {
"stringUnit" : {
"state" : "translated",
@ -1216,10 +1222,30 @@
}
},
"Entire match" : {
"comment" : "placeholder"
"comment" : "placeholder",
"localizations" : {
"de" : {
"stringUnit" : {
"state" : "translated",
"value" : "Ganze Übereinstimmung"
}
},
"en-GB" : {
"stringUnit" : {
"state" : "translated",
"value" : "Entire match"
}
},
"ja" : {
"stringUnit" : {
"state" : "translated",
"value" : "一致した全文字列"
}
}
}
},
"Extensions:" : {
"comment" : "label",
"comment" : "label for file extensions",
"localizations" : {
"cs" : {
"stringUnit" : {
@ -1292,6 +1318,12 @@
"Features" : {
"comment" : "section header in sidebar",
"localizations" : {
"de" : {
"stringUnit" : {
"state" : "translated",
"value" : "Funktionen"
}
},
"en-GB" : {
"stringUnit" : {
"state" : "translated",
@ -1377,13 +1409,19 @@
}
}
},
"Highlight" : {
"Highlighting" : {
"comment" : "section header in sidebar",
"localizations" : {
"de" : {
"stringUnit" : {
"state" : "translated",
"value" : "Hervorhebung"
}
},
"en-GB" : {
"stringUnit" : {
"state" : "translated",
"value" : "Highlight"
"value" : "Highlighting"
}
},
"ja" : {
@ -1465,72 +1503,72 @@
}
}
},
"If no word, the completion list will be generated from coloring settings." : {
"If not specified, the completion list is generated based on the highlighting settings." : {
"comment" : "message",
"localizations" : {
"cs" : {
"stringUnit" : {
"state" : "translated",
"state" : "needs_review",
"value" : "Pokud není uvedeno žádné slovo, seznam dokončení se vygeneruje z nastavení barev."
}
},
"de" : {
"stringUnit" : {
"state" : "translated",
"value" : "Wenn leer, wird die Vervollständigungsliste aus den Einstellungen für das Hervorheben erzeugt."
"value" : "Wenn nichts angegeben ist, wird die Vervollständigungsliste aus den Einstellungen für das Hervorheben erstellt."
}
},
"en-GB" : {
"stringUnit" : {
"state" : "translated",
"value" : "If no word, the completion list is generated from coloring settings."
"value" : "If not specified, the completion list is generated based on the highlighting settings."
}
},
"es" : {
"stringUnit" : {
"state" : "translated",
"state" : "needs_review",
"value" : "Si no se encuentra la palabra, la lista final se generará de los ajustes de coloración."
}
},
"fr" : {
"stringUnit" : {
"state" : "translated",
"state" : "needs_review",
"value" : "Si cette liste est vide, la liste de complétion sera générée à partir de la définition de la coloration syntaxique."
}
},
"it" : {
"stringUnit" : {
"state" : "translated",
"state" : "needs_review",
"value" : "In assenza di parole, la lista di completamento verrà generata partendo dalle impostazioni di colorazione."
}
},
"ja" : {
"stringUnit" : {
"state" : "translated",
"value" : "設定がないときはカラーリング設定から補完リストが生成されます。"
"value" : "設定がないときはハイライト設定から補完リストが生成されます。"
}
},
"pt" : {
"stringUnit" : {
"state" : "translated",
"state" : "needs_review",
"value" : "Se em branco, a lista será gerada a partir dos ajustes de coloração."
}
},
"tr" : {
"stringUnit" : {
"state" : "translated",
"state" : "needs_review",
"value" : "Sözcük yoksa tamamlama listesi renklendirme listesinden çıkarılır."
}
},
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"state" : "needs_review",
"value" : "如果没有单词，补全列表将由高亮设置生成。"
}
},
"zh-Hant" : {
"stringUnit" : {
"state" : "translated",
"state" : "needs_review",
"value" : "如果沒有單字，補全列表將由高亮設定生成。"
}
}
@ -2220,25 +2258,25 @@
}
}
},
"Outline extraction rules" : {
"Outline extraction rules:" : {
"comment" : "label",
"localizations" : {
"de" : {
"stringUnit" : {
"state" : "translated",
"value" : "Extraktionsregeln der Gliederung"
"value" : "Extraktionsregeln der Gliederung:"
}
},
"en-GB" : {
"stringUnit" : {
"state" : "translated",
"value" : "Outline extraction rules"
"value" : "Outline extraction rules:"
}
},
"ja" : {
"stringUnit" : {
"state" : "translated",
"value" : "アウトライン抽出ルール"
"value" : "アウトライン抽出ルール:"
}
}
}
@ -2396,8 +2434,8 @@
},
"de" : {
"stringUnit" : {
"state" : "needs_review",
"value" : "Regulärer Ausdruck"
"state" : "translated",
"value" : "Muster des reguläreren Ausdrucks"
}
},
"en-GB" : {