diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 551540f..d661858 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,13 +20,13 @@ jobs: with: node-version: "18" - - name: Generate changelog - id: changelog - uses: saadmk11/changelog-ci@v1.1.2 - with: - github_token: ${{ secrets.REPO_ACCESS_TOKEN }} - release_version: ${{ github.ref }} - changelog_filename: CHANGELOG.md +# - name: Generate changelog +# id: changelog +# uses: saadmk11/changelog-ci@v1.1.2 +# with: +# github_token: ${{ secrets.REPO_ACCESS_TOKEN }} +# release_version: ${{ github.ref }} +# changelog_filename: CHANGELOG.md - name: Build id: build diff --git a/README.md b/README.md index de4ae2d..277aa28 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,13 @@ - [x] Support edit for database details in plugin settings. 支持编辑数据库详情 ## Update +### 2.2.1 + +- improve the localisation for the custom properties setting. 改进自定义属性设置的本地化。 + +**Warning: the edit function for the custom properties is not perfect for now. You need to re-enter all the properties if you want to edit the properties.** + +**注意：自定义属性的编辑功能现在还不完善。如果你想编辑属性，你需要重新输入所有的属性。** ### 2.2.0 (Big Update) diff --git a/manifest.json b/manifest.json index 674e6c5..f0f2b74 100644 --- a/manifest.json +++ b/manifest.json @@ -1,7 +1,7 @@ { "id": "share-to-notionnext", "name": "Share to NotionNext", - "version": "2.2.0", + "version": "2.2.1", "minAppVersion": "0.0.1", "description": "Shares obsidian md file to notion with notion api for NotionNext web deploy, originally created by EasyChris/obsidian-to-notion.", "author": "EasyChris, jxpeng98", diff --git a/package.json b/package.json index 902019e..f5af5a8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "share-to-notionnext", - "version": "2.2.0", + "version": "2.2.1", "type": "module", "description": "Shares obsidian md file to notion with notion api for NotionNext web deploy, originally created by EasyChris/obsidian-to-notion.", "main": "main.js", diff --git a/src/lang/locale/en.ts b/src/lang/locale/en.ts index aaa3877..bc07529 100644 --- a/src/lang/locale/en.ts +++ b/src/lang/locale/en.ts @@ -65,4 +65,11 @@ export const en = { NotionCustomSettingHeader: "Notion Custom Database Settings", NotionCustomButton: "Notion Customised command switch", NotionCustomButtonDesc: "Open this option, Sync to Notion Customised Database command will be displayed in the command palette", + CustomPropertyName: "Property Name", + CustomPropertyFirstColumn: "Title Column", + CustomPropertyFirstColumnDesc: "The title of the page, must be the first property", + CustomProperty: "Property", + AddCustomProperty: "Add Custom Property", + AddNewProperty: "Add New Property", + AddNewPropertyDesc: "Add new property match with your notion database", } diff --git a/src/lang/locale/ja.ts b/src/lang/locale/ja.ts index ac48ae5..2c6d7e0 100644 --- a/src/lang/locale/ja.ts +++ b/src/lang/locale/ja.ts @@ -57,4 +57,11 @@ export const ja = { NotionCustomSettingHeader: "Notionカスタムデータベース設定", NotionCustomButton: "Notionカスタマイズコマンドの切り替え", NotionCustomButtonDesc: "このオプションを開くと、Notionカスタムデータベース同期コマンドがコマンドパレットに表示されます", + CustomPropertyName: "カスタムプロパティ名", + CustomPropertyFirstColumn: "最初の列のカスタムプロパティ名", + CustomPropertyFirstColumnDesc: "最初の列のカスタムプロパティ名を入力してください", + CustomProperty: "カスタムプロパティ", + AddCustomProperty: "カスタムプロパティを追加", + AddNewProperty: "新しいプロパティを追加", + AddNewPropertyDesc: "新しいプロパティを追加してください", }; diff --git a/src/lang/locale/zh.ts b/src/lang/locale/zh.ts index d049627..ea3656e 100644 --- a/src/lang/locale/zh.ts +++ b/src/lang/locale/zh.ts @@ -60,4 +60,11 @@ export const zh = { NotionCustomSettingHeader: "Notion 自定义数据库设置", NotionCustomButton: "Notion 自定义数据库同步命令开关", NotionCustomButtonDesc: "打开此选项，同步到自定义数据库命令将显示在命令面板中", + CustomPropertyName: "自定义属性名", + CustomPropertyFirstColumn: "第一列属性名", + CustomPropertyFirstColumnDesc: "第一列必须为标题属性名", + CustomProperty: "自定义属性", + AddCustomProperty: "添加自定义属性", + AddNewProperty: "添加新属性", + AddNewPropertyDesc: "添加一个和Notion数据库匹配的新属性", } diff --git a/src/ui/CustomModal.ts b/src/ui/CustomModal.ts index 3d5593f..b7d3dfa 100644 --- a/src/ui/CustomModal.ts +++ b/src/ui/CustomModal.ts @@ -1,6 +1,7 @@ import {App, Modal, Setting} from "obsidian"; import ObsidianSyncNotionPlugin from "../main"; import {ObsidianSettingTab} from "./settingTabs"; +import {i18nConfig} from "../lang/I18n"; export class CustomModal extends Modal { propertyLines: Setting[] = []; // Store all property line settings @@ -20,8 +21,8 @@ export class CustomModal extends Modal { if (propertyIndex === 0) { propertyLine - .setName("Title") - .setDesc("The title of the page, must be the first property") + .setName(i18nConfig.CustomPropertyFirstColumn) + .setDesc(i18nConfig.CustomPropertyFirstColumnDesc) propertyLine.addText((text) => { text @@ -45,11 +46,11 @@ export class CustomModal extends Modal { ) } else { propertyLine - .setName("Property " + (propertyIndex)) + .setName(i18nConfig.CustomProperty + (propertyIndex)) propertyLine.addText((text) => { text - .setPlaceholder("Property name") + .setPlaceholder(i18nConfig.CustomPropertyName) .setValue("") .onChange(async (value) => { this.properties[propertyIndex].customName = value; // Update the customValue of the specific property @@ -104,7 +105,7 @@ export class CustomModal extends Modal { display(): void { this.containerEl.addClass("custom-modal"); - this.titleEl.setText("Add Custom Property"); + this.titleEl.setText(i18nConfig.AddCustomProperty); let {contentEl} = this; contentEl.empty(); @@ -112,8 +113,8 @@ export class CustomModal extends Modal { const customDiv = contentEl.createDiv("custom-div"); new Setting(customDiv) - .setName("Add new property") - .setDesc("Add new property match with your notion database") + .setName(i18nConfig.AddNewProperty) + .setDesc(i18nConfig.AddNewPropertyDesc) .addButton((button) => { return button .setTooltip("Add")