Skip to content

Commit

Permalink
feat: localizable dialog title for enter section title (misskey-dev#1…
Browse files Browse the repository at this point in the history
…4401)

* feat: localizable dialog title for enter section title

* refactor: define `getPageBlockList` in separated file and import instead of provide/inject
  • Loading branch information
anatawa12 authored and LemonDouble committed Aug 19, 2024
1 parent ab2547b commit e4ddbb7
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 13 deletions.
4 changes: 4 additions & 0 deletions locales/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8986,6 +8986,10 @@ export interface Locale extends ILocale {
* ブロックを追加
*/
"chooseBlock": string;
/**
* セクションタイトルを入力
*/
"enterSectionTitle": string;
/**
* 種類を選択
*/
Expand Down
1 change: 1 addition & 0 deletions locales/ja-JP.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2371,6 +2371,7 @@ _pages:
eyeCatchingImageSet: "アイキャッチ画像を設定"
eyeCatchingImageRemove: "アイキャッチ画像を削除"
chooseBlock: "ブロックを追加"
enterSectionTitle: "セクションタイトルを入力"
selectType: "種類を選択"
contentBlocks: "コンテンツ"
inputBlocks: "入力"
Expand Down
15 changes: 15 additions & 0 deletions packages/frontend/src/pages/page-editor/common.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/

import { i18n } from '@/i18n.js';

export function getPageBlockList() {
return [
{ value: 'section', text: i18n.ts._pages.blocks.section },
{ value: 'text', text: i18n.ts._pages.blocks.text },
{ value: 'image', text: i18n.ts._pages.blocks.image },
{ value: 'note', text: i18n.ts._pages.blocks.note },
];
}
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import * as os from '@/os.js';
import { i18n } from '@/i18n.js';
import { deepClone } from '@/scripts/clone.js';
import MkButton from '@/components/MkButton.vue';
import { getPageBlockList } from '@/pages/page-editor/common.js';

const XBlocks = defineAsyncComponent(() => import('../page-editor.blocks.vue'));

Expand All @@ -53,11 +54,9 @@ watch(children, () => {
deep: true,
});

const getPageBlockList = inject<(any) => any>('getPageBlockList');

async function rename() {
const { canceled, result: title } = await os.inputText({
title: 'Enter title',
title: i18n.ts._pages.enterSectionTitle,
default: props.modelValue.title,
});
if (canceled) return;
Expand Down
11 changes: 1 addition & 10 deletions packages/frontend/src/pages/page-editor/page-editor.vue
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ import { i18n } from '@/i18n.js';
import { definePageMetadata } from '@/scripts/page-metadata.js';
import { $i } from '@/account.js';
import { mainRouter } from '@/router/main.js';
import { getPageBlockList } from '@/pages/page-editor/common.js';

const props = defineProps<{
initPageId?: string;
Expand All @@ -101,7 +102,6 @@ const alignCenter = ref(false);
const hideTitleWhenPinned = ref(false);

provide('readonly', readonly.value);
provide('getPageBlockList', getPageBlockList);

watch(eyeCatchingImageId, async () => {
if (eyeCatchingImageId.value == null) {
Expand Down Expand Up @@ -216,15 +216,6 @@ async function add() {
content.value.push({ id, type });
}

function getPageBlockList() {
return [
{ value: 'section', text: i18n.ts._pages.blocks.section },
{ value: 'text', text: i18n.ts._pages.blocks.text },
{ value: 'image', text: i18n.ts._pages.blocks.image },
{ value: 'note', text: i18n.ts._pages.blocks.note },
];
}

function setEyeCatchingImage(img) {
selectFile(img.currentTarget ?? img.target, null).then(file => {
eyeCatchingImageId.value = file.id;
Expand Down

0 comments on commit e4ddbb7

Please sign in to comment.