diff --git a/src/components/Modals/TagsAndCategories/CreateCategoryDialog.vue b/src/components/Modals/TagsAndCategories/CreateNewCategoryDialog.vue similarity index 87% rename from src/components/Modals/TagsAndCategories/CreateCategoryDialog.vue rename to src/components/Modals/TagsAndCategories/CreateNewCategoryDialog.vue index b221f755..db5b3d18 100644 --- a/src/components/Modals/TagsAndCategories/CreateCategoryDialog.vue +++ b/src/components/Modals/TagsAndCategories/CreateNewCategoryDialog.vue @@ -16,15 +16,15 @@ :autofocus="!hasInitialCategory" :disabled="hasInitialCategory" /> - + - + {{ $t('create') }} - + {{ $t('edit') }} @@ -62,11 +62,8 @@ export default { nameRules() { return [v => !!v || this.$t('modals.newCategory.tipOnNoName')] }, - pathRules() { - return [v => !!v || this.$t('modals.newCategory.tipOnNoPath')] - }, isValid() { - return !!this.category.name && !!this.category.savePath + return !!this.category.name } }, created() { diff --git a/src/components/Modals/TagsAndCategories/CreateTagDialog.vue b/src/components/Modals/TagsAndCategories/CreateNewTagDialog.vue similarity index 98% rename from src/components/Modals/TagsAndCategories/CreateTagDialog.vue rename to src/components/Modals/TagsAndCategories/CreateNewTagDialog.vue index c5479d4a..71326b08 100644 --- a/src/components/Modals/TagsAndCategories/CreateTagDialog.vue +++ b/src/components/Modals/TagsAndCategories/CreateNewTagDialog.vue @@ -31,7 +31,7 @@ import qbit from '@/services/qbit' import { Modal } from '@/mixins' export default defineComponent({ - name: 'CreateTagDialog', + name: 'CreateNewTagDialog', mixins: [Modal], data() { return { diff --git a/src/components/Modals/TagsAndCategories/index.js b/src/components/Modals/TagsAndCategories/index.js index ae31ffee..8fde326a 100644 --- a/src/components/Modals/TagsAndCategories/index.js +++ b/src/components/Modals/TagsAndCategories/index.js @@ -1,4 +1,4 @@ -import CreateNewTagDialog from './CreateTagDialog.vue' -import CreateNewCategoryDialog from './CreateCategoryDialog.vue' +import CreateNewTagDialog from './CreateNewTagDialog.vue' +import CreateNewCategoryDialog from './CreateNewCategoryDialog.vue' export { CreateNewTagDialog, CreateNewCategoryDialog } diff --git a/src/components/Settings/Tabs/TagsAndCategories.vue b/src/components/Settings/Tabs/TagsAndCategories.vue index 443e68ba..3037a3e4 100644 --- a/src/components/Settings/Tabs/TagsAndCategories.vue +++ b/src/components/Settings/Tabs/TagsAndCategories.vue @@ -90,10 +90,10 @@ export default { this.$store.commit('FETCH_TAGS') }, createTag() { - this.createModal('CreateTagDialog') + this.createModal('CreateNewTagDialog') }, createCategory() { - this.createModal('CreateCategoryDialog') + this.createModal('CreateNewCategoryDialog') }, async deleteCategory(category) { await qbit.deleteCategory([category.name]) @@ -104,7 +104,7 @@ export default { this.$store.commit('FETCH_TAGS') }, editCategory(cat) { - this.createModal('CreateCategoryDialog', { initialCategory: cat }) + this.createModal('CreateNewCategoryDialog', { initialCategory: cat }) } } } diff --git a/src/lang/en.json b/src/lang/en.json index f549fdf2..9efd75e3 100644 --- a/src/lang/en.json +++ b/src/lang/en.json @@ -643,8 +643,7 @@ "newCategory": { "categoryName": "Category name", "Path": "Path", - "tipOnNoName": "Category name is required", - "tipOnNoPath": "Path is required" + "tipOnNoName": "Category name is required" }, "newTag": { "createNewTag": "Create New Tag", diff --git a/src/lang/fr.json b/src/lang/fr.json index 4b3a758a..a4dcee5d 100644 --- a/src/lang/fr.json +++ b/src/lang/fr.json @@ -351,8 +351,7 @@ "newCategory": { "categoryName": "Nom de la catégorie", "Path": "Chemin d'accès", - "tipOnNoName": "Le nom de la catégorie est obligatoire", - "tipOnNoPath": "Le chemin d'accès est obligatoire" + "tipOnNoName": "Le nom de la catégorie est obligatoire" }, "newTag": { "createNewTag": "Créer un nouveau tag", diff --git a/src/lang/id.json b/src/lang/id.json index 1b03561a..b374d69d 100644 --- a/src/lang/id.json +++ b/src/lang/id.json @@ -271,8 +271,7 @@ "newCategory": { "categoryName": "Nama kategori", "Path": "Path", - "tipOnNoName": "Nama kategori diperlukan", - "tipOnNoPath": "Path is required" + "tipOnNoName": "Nama kategori diperlukan" }, "newTag": { "createNewTag": "Buat Tag Baru", diff --git a/src/lang/ja.json b/src/lang/ja.json index df56e1ab..a32c1249 100644 --- a/src/lang/ja.json +++ b/src/lang/ja.json @@ -266,8 +266,7 @@ "newCategory": { "categoryName": "カテゴリ名", "Path": "パス", - "tipOnNoName": "カテゴリ名が必要です", - "tipOnNoPath": "パスが必要です" + "tipOnNoName": "カテゴリ名が必要です" }, "newTag": { "createNewTag": "タグを作成", diff --git a/src/lang/ru.json b/src/lang/ru.json index cc0c1202..202bf00c 100644 --- a/src/lang/ru.json +++ b/src/lang/ru.json @@ -608,8 +608,7 @@ "newCategory": { "categoryName": "Название категории", "Path": "Путь", - "tipOnNoName": "Требуется название категории", - "tipOnNoPath": "Нужный путь" + "tipOnNoName": "Требуется название категории" }, "newTag": { "createNewTag": "Создать новый тэг", diff --git a/src/lang/uk.json b/src/lang/uk.json index 9d4df232..a3b55093 100644 --- a/src/lang/uk.json +++ b/src/lang/uk.json @@ -608,8 +608,7 @@ "newCategory": { "categoryName": "Назва категорії", "Path": "Шлях", - "tipOnNoName": "Вкажіть назву категорії", - "tipOnNoPath": "Вкажіть шлях до теки" + "tipOnNoName": "Вкажіть назву категорії" }, "newTag": { "createNewTag": "Створити нову мітку", diff --git a/src/lang/vi.json b/src/lang/vi.json index f268f3b0..940d4983 100644 --- a/src/lang/vi.json +++ b/src/lang/vi.json @@ -334,8 +334,7 @@ "newCategory": { "categoryName": "Tên danh mục", "Path": "Nơi lưu", - "tipOnNoName": "Tên danh mục là bắt buộc", - "tipOnNoPath": "Nơi lưu là bắt buộc" + "tipOnNoName": "Tên danh mục là bắt buộc" }, "newTag": { "createNewTag": "Tạo thẻ mới", diff --git a/src/lang/zh-hans.json b/src/lang/zh-hans.json index 1e7ef25c..117c610c 100644 --- a/src/lang/zh-hans.json +++ b/src/lang/zh-hans.json @@ -637,8 +637,7 @@ "newCategory": { "categoryName": "分类名称", "Path": "路径", - "tipOnNoName": "分类名称是必须的", - "tipOnNoPath": "路径是必须的" + "tipOnNoName": "分类名称是必须的" }, "newTag": { "createNewTag": "新建标签", diff --git a/src/lang/zh-hant.json b/src/lang/zh-hant.json index a8ab3600..467a8865 100644 --- a/src/lang/zh-hant.json +++ b/src/lang/zh-hant.json @@ -643,8 +643,7 @@ "newCategory": { "categoryName": "分類名稱", "Path": "路徑", - "tipOnNoName": "必須填寫分類名稱", - "tipOnNoPath": "必須填寫路徑" + "tipOnNoName": "必須填寫分類名稱" }, "newTag": { "createNewTag": "新增標籤",