Skip to content

Commit

Permalink
chore: simplify strings for expand/collapse
Browse files Browse the repository at this point in the history
  • Loading branch information
chrisgurney committed Oct 14, 2024
1 parent 9e495ed commit acef51e
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 10 deletions.
6 changes: 2 additions & 4 deletions src/I18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,10 @@
},
"setting": {
"button-cancel": "Cancel",
"button-collapse-tooltip": "Collapse section",
"button-delete-tooltip": "Delete",
"button-drag-tooltip": "Drag to rearrange",
"button-expand-tooltip": "Expand section",
"button-help": "Help",
"button-help-tooltip": "Open the help window",
"button-learn-more": "Learn\u00A0more",
Expand Down Expand Up @@ -204,8 +206,6 @@
"label-empty-no-items": "No toolbar items.",
"button-add-break-tooltip": "Add a line break to the toolbar",
"button-add-separator-tooltip": "Add a separator to the toolbar",
"button-collapse-items-tooltip": "Collapse all items",
"button-expand-items-tooltip": "Expand all items",
"button-new-item": "+ Add toolbar item",
"button-new-item-tooltip": "Add a new item to the toolbar",
"option-item-empty-label": "No label set",
Expand Down Expand Up @@ -311,10 +311,8 @@
"name": "Toolbars",
"name-with-count": "Toolbars ({{count}})",
"description": "Define the toolbars you want to add to your notes.",
"button-collapse-tbars-tooltip": "Collapse all toolbars",
"button-duplicate-tbar-tooltip": "Duplicate",
"button-edit-tbar": "Edit",
"button-expand-tbars-tooltip": "Expand all toolbars",
"button-edit-tbar-tooltip": "Update this toolbar",
"button-more-tooltip": "More options",
"button-new-tbar": "+ New toolbar",
Expand Down
4 changes: 2 additions & 2 deletions src/Settings/UI/Modals/ToolbarSettingsModal.ts
Original file line number Diff line number Diff line change
Expand Up @@ -216,15 +216,15 @@ export default class ToolbarSettingsModal extends Modal {
itemsSetting
.addExtraButton((cb) => {
cb.setIcon('right-triangle')
.setTooltip(t('setting.items.button-collapse-items-tooltip'))
.setTooltip(t('setting.button-collapse-tooltip'))
.onClick(async () => {
let itemsContainer = settingsDiv.querySelector('.note-toolbar-setting-items-container');
if (itemsContainer) {
this.itemListOpen = !this.itemListOpen;
itemsContainer.setAttribute(SettingsAttr.Active, this.itemListOpen.toString());
let heading = itemsContainer.querySelector('.setting-item-heading .setting-item-name');
this.itemListOpen ? heading?.setText(t('setting.items.name')) : heading?.setText(t('setting.items.name-with-count', { count: this.toolbar.items.length }));
cb.setTooltip(this.itemListOpen ? t('setting.items.button-collapse-items-tooltip') : t('setting.items.button-expand-items-tooltip'));
cb.setTooltip(this.itemListOpen ? t('setting.button-collapse-tooltip') : t('setting.button-expand-tooltip'));
}
})
.extraSettingsEl.tabIndex = 0;
Expand Down
8 changes: 4 additions & 4 deletions src/Settings/UI/NoteToolbarSettingTab.ts
Original file line number Diff line number Diff line change
Expand Up @@ -150,15 +150,15 @@ export class NoteToolbarSettingTab extends PluginSettingTab {
toolbarListSetting
.addExtraButton((cb) => {
cb.setIcon('right-triangle')
.setTooltip(t('setting.toolbars.button-collapse-tbars-tooltip'))
.setTooltip(t('setting.button-collapse-tooltip'))
.onClick(async () => {
let itemsContainer = containerEl.querySelector('.note-toolbar-setting-items-container');
if (itemsContainer) {
this.itemListOpen = !this.itemListOpen;
itemsContainer.setAttribute('data-active', this.itemListOpen.toString());
let heading = itemsContainer.querySelector('.setting-item-info .setting-item-name');
this.itemListOpen ? heading?.setText(t('setting.toolbars.name')) : heading?.setText(t('setting.toolbars.name-with-count', { count: this.plugin.settings.toolbars.length }));
cb.setTooltip(this.itemListOpen ? t('setting.toolbars.button-collapse-tbars-tooltip') : t('setting.toolbars.button-expand-tbars-tooltip'));
cb.setTooltip(this.itemListOpen ? t('setting.button-collapse-tooltip') : t('setting.button-expand-tooltip'));
}
})
.extraSettingsEl.tabIndex = 0;
Expand Down Expand Up @@ -357,15 +357,15 @@ export class NoteToolbarSettingTab extends PluginSettingTab {
toolbarMapSetting
.addExtraButton((cb) => {
cb.setIcon('right-triangle')
.setTooltip("Collapse all mappings")
.setTooltip(t('setting.button-collapse-tooltip'))
.onClick(async () => {
let mappingsContainer = containerEl.querySelector('.note-toolbar-setting-mappings-container');
if (mappingsContainer) {
this.mappingListOpen = !this.mappingListOpen;
mappingsContainer.setAttribute('data-active', this.mappingListOpen.toString());
let heading = mappingsContainer.querySelector('.setting-item-info .setting-item-name');
this.mappingListOpen ? heading?.setText(t('setting.mappings.name')) : heading?.setText(t('setting.mappings.name-with-count', { count: this.plugin.settings.folderMappings.length }));
cb.setTooltip(this.mappingListOpen ? t('setting.mappings.button-collapse-tooltip') : t('setting.mappings.button-expand-tooltip'));
cb.setTooltip(this.mappingListOpen ? t('setting.button-collapse-tooltip') : t('setting.button-expand-tooltip'));
}
})
.extraSettingsEl.tabIndex = 0;
Expand Down

0 comments on commit acef51e

Please sign in to comment.