Skip to content

Commit 6817a36

Browse files
committed
chore: improve wording of sentences used in the UI
1 parent d864abb commit 6817a36

3 files changed

Lines changed: 17 additions & 22 deletions

File tree

src/main/java/com/github/lppedd/cc/configuration/CCMainConfigurableGui.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ private void finishUpComponents(
209209
defaultsPanel.setLayout(new GridLayoutManager(3, 1, JBUI.insetsLeft(INDENT), 0, 0));
210210
defaultsPanel.setBorder(
211211
IdeBorderFactory.createTitledBorder(
212-
CCBundle.get("cc.config.defaults"),
212+
CCBundle.get("cc.config.tokens"),
213213
false,
214214
JBUI.insetsTop(3)
215215
)

src/main/resources/messages/ConventionalCommitBundle.properties

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ action.cc.whatsnew.dialog.open.text = What's New in Conventional Commit
2323
cc.commitbuilder.title = Build Commit Message
2424
cc.commitbuilder.dialog.howTo.info = Completion is available on each field using {0}
2525
cc.commitbuilder.dialog.howTo.info.close = Don't show again
26-
cc.commitbuilder.dialog.howTo.error = Completion unavailable as no shortcut is configured
26+
cc.commitbuilder.dialog.howTo.error = Completion is unavailable as no shortcut is configured
2727
cc.commitbuilder.dialog.howTo.error.close = Hide
2828
cc.commitbuilder.dialog.type = &Type
2929
cc.commitbuilder.dialog.scope = &Scope
@@ -44,14 +44,14 @@ cc.commitbuilder.dialog.softWraps = Soft wraps are active ({0})
4444

4545
# First letter lowercase, as they'll get merged with 'cc.commitbuilder.dialog.softWraps'
4646
cc.commitbuilder.dialog.softWraps.all = shown always
47-
cc.commitbuilder.dialog.softWraps.currentLine = shown for current line only
47+
cc.commitbuilder.dialog.softWraps.currentLine = shown for the current line only
4848

4949
# Values used as accessible names or descriptions
5050
cc.commitbuilder.dialog.a11y.howToBanner = How to banner
5151
cc.commitbuilder.dialog.a11y.commitTokens = Commit tokens
5252
cc.commitbuilder.dialog.a11y.otherFooter = Other footer
5353
cc.commitbuilder.dialog.a11y.rememberValues = \
54-
Values will be remembered until a successful commit is made, \
54+
Values will be remembered until a successful commit is made \
5555
or until the IDE is closed
5656

5757
# Actions
@@ -66,7 +66,7 @@ cc.config.template = Template completion
6666
cc.config.enableLanguageSupport = Highlight syntax
6767
cc.config.prioritizeRecentlyUsed = Prioritize recently used tokens
6868
cc.config.autoInsertSpaceAfterColon = Automatically insert a space after the colon
69-
cc.config.defaults = Default tokens
69+
cc.config.tokens = Tokens
7070
cc.config.types = Types:
7171
cc.config.scopes = Scopes:
7272
cc.config.customFile = Custom file
@@ -81,17 +81,17 @@ cc.config.coAuthors.customFile.tooltip = \
8181
cc.config.coAuthors.customFile.dialog.title = Co-authors File
8282
cc.config.coAuthors.customFile.dialog.description = Select a writable .coauthors file
8383

84-
cc.config.defaults.exportToPath = Export built-in defaults to path\u2026
84+
cc.config.defaults.exportToPath = Export bundled tokens to path\u2026
8585
cc.config.defaults.exportToPath.completed = Export completed correctly
8686
cc.config.defaults.exportToPath.error = Could not write the file
8787
cc.config.defaults.customFile.tooltip = \
88-
Read default tokens from a custom JSON file. \
88+
Read commit message tokens from a custom JSON file. \
8989
Useful when sharing custom tokens between multiple projects, but could prevent versioning.
9090
cc.config.defaults.customFile.comment = \
91-
Absolute path of a .json file in the system that respects a \
92-
<a href="https://github.com/lppedd/idea-conventional-commit/blob/master/src/main/resources/defaults/conventionalcommit.schema.json">Schema</a>
91+
Absolute path to a JSON file that respects a \
92+
<a href="https://github.com/lppedd/idea-conventional-commit/blob/master/src/main/resources/defaults/conventionalcommit.schema.json">schema</a>
9393
cc.config.defaults.empty = No tokens defined
94-
cc.config.customFilePicker.disabled = Check "Custom default tokens" to enable the file picker
94+
cc.config.customFilePicker.disabled = Check "Custom file" to enable the file picker
9595
cc.config.customFilePicker.enabled = Pick a file
9696
cc.config.filePicker.error.empty = A file must be picked
9797
cc.config.filePicker.error.path = The file is not valid
@@ -108,7 +108,7 @@ cc.config.providers.subject.title = Subject providers:
108108
cc.config.providers.body.title = Body providers:
109109
cc.config.providers.footerType.title = Footer type providers:
110110
cc.config.providers.footerValue.title = Footer value providers:
111-
cc.config.providersPriority = Personalize the providers priority (higher in the list equals higher priority).
111+
cc.config.providersPriority = Customize providers priority (higher in the list equals higher priority).
112112
cc.config.fileDialog.title = Select File
113113
cc.config.fileDialog.description = Only JSON files are allowed
114114
cc.config.fileDialog.selectFile = Select File
@@ -122,7 +122,7 @@ cc.config.coAuthorsDialog.error = Co-author's names cannot be blank
122122
cc.config.coAuthorsDialog.saveError = Couldn''t save changes to file: {0}
123123

124124
cc.notification.group.name = Conventional Commit notifications
125-
cc.notifications.schema = Error reading custom defaults file: {0}. Using built-in tokens instead.
125+
cc.notifications.schema = Error reading the tokens JSON file: {0}. Using bundled tokens instead.
126126
cc.notifications.schema.seeLogs = see IDE logs
127127
cc.notifications.schema.validation = the file does not respect the JSON schema
128128

@@ -137,16 +137,14 @@ cc.inspection.nonStdMessage.replaceWs.label = Replace scope's middle spaces with
137137
cc.inspection.namingConvention.description = Conventional Commit: naming convention
138138
cc.inspection.namingConvention.text = Naming convention violation. Illegal characters used
139139
cc.inspection.namingConvention.comment = \
140-
Reports commit's <b>types</b> and <b>scopes</b> that do not follow \
141-
the specified regular expression patterns. \
140+
Reports commit <b>types</b> and <b>scopes</b> that do not follow \
141+
the specified regular expression patterns.<br/>\
142142
Use the fields provided below to specify the regular expressions (in <b>java.util.regex</b> format).
143143
cc.inspection.namingConvention.pattern.type.label = Type pattern:
144144
cc.inspection.namingConvention.pattern.scope.label = Scope pattern:
145145
cc.inspection.namingConvention.pattern.error = Bad regular expression pattern
146146

147-
# This is used in footer value context to "show more" co-authors by opening a dialog.
148-
# If you plan to test this, beware the master branch has some problems with completion
149-
# as of now so don't report an issue, I'm aware :P
147+
# This is used in the footer value context to "show more" co-authors by opening a dialog
150148
cc.completion.showMore = Show more
151149
cc.completion.noScope = No scope
152150
cc.completion.menu.filter.hideSelected = Hide selected

src/main/resources/messages/ConventionalCommitBundle_zh_CN.properties

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ cc.commitbuilder.dialog.a11y.otherFooter = \u5176\u4ED6\u811A\u6CE8
5353
cc.commitbuilder.dialog.a11y.rememberValues = \
5454
\u5185\u5BB9\u5C06\u88AB\u8BB0\u5FC6\u76F4\u5230\u6210\u529F\u63D0\u4EA4\u6216IDE\u88AB\u5173\u95ED\u3002
5555

56-
5756
# Actions
5857
action.cc.commitbuilder.dialog.open.text = \u521B\u5EFA\u63D0\u4EA4\u6D88\u606F
5958
action.cc.commitbuilder.dialog.nextError.text = \u4E0B\u4E00\u4E2A\u9AD8\u4EAE\u7684\u9519\u8BEF (\u5F39\u7A97)
@@ -66,7 +65,7 @@ cc.config.template = \u57FA\u4E8E\u6A21\u677F
6665
cc.config.enableLanguageSupport = \u8BED\u6CD5\u9AD8\u4EAE
6766
cc.config.prioritizeRecentlyUsed = \u6700\u8FD1\u7528\u8FC7\u7684\u4F18\u5148
6867
cc.config.autoInsertSpaceAfterColon = \u5728\u5192\u53F7\u540E\u81EA\u52A8\u63D2\u5165\u7A7A\u683C
69-
cc.config.defaults = \u9ED8\u8BA4\u914D\u7F6E
68+
cc.config.tokens = \u9ED8\u8BA4\u914D\u7F6E
7069
cc.config.types = \u7C7B\u578B\uFF1A
7170
cc.config.scopes = \u8303\u56F4\uFF1A
7271
cc.config.customFile = \u81EA\u5B9A\u4E49
@@ -140,9 +139,7 @@ cc.inspection.namingConvention.pattern.type.label = \u7C7B\u578B\u683C\u5F0F\uFF
140139
cc.inspection.namingConvention.pattern.scope.label = \u8303\u56F4\u683C\u5F0F\uFF1A
141140
cc.inspection.namingConvention.pattern.error = \u9519\u8BEF\u7684\u6B63\u5219\u8868\u8FBE\u5F0F
142141

143-
# This is used in footer value context to "show more" co-authors by opening a dialog.
144-
# If you plan to test this, beware the master branch has some problems with completion
145-
# as of now so don't report an issue, I'm aware :P
142+
# This is used in the footer value context to "show more" co-authors by opening a dialog
146143
cc.completion.showMore = \u66F4\u591A
147144
cc.completion.noScope = \u6CA1\u6709\u8303\u56F4
148145
cc.completion.menu.filter.hideSelected = \u9690\u85CF\u9009\u5B9A\u9879

0 commit comments

Comments
 (0)