Skip to content

Commit 633abfc

Browse files
committed
Add translations, add list of strings translation
1 parent 3ea337e commit 633abfc

File tree

6 files changed

+30
-11
lines changed

6 files changed

+30
-11
lines changed

src/components/translate/translation/en_US.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ export const translator_en_US = makeTranslator<TranslationArgs>({
4545
"contextmenu.item.name.viewport.reset_camera": "Reset Camera",
4646
"contextmenu.item.name.viewport.add_object": "Add Object",
4747
"contextmenu.item.name.viewport.add_object.obstacle": "Obstacle",
48+
"contextmenu.item.name.viewport.add_object.lava": "Lava",
4849
// #endregion
4950

5051
// #region Topbar
@@ -64,7 +65,7 @@ export const translator_en_US = makeTranslator<TranslationArgs>({
6465
if (!github) return makeCode([`Current build: `, mode, ` `, version]);
6566
const { repoOwner, repoName, commitSha, repoUrl, commitUrl } = github;
6667
return makeCode([
67-
`Current build: `, mode, ` `, version, ` from `,
68+
`Current build: `, mode, ` `, version, ` from `,
6869
makeLink(repoUrl, [repoOwner, `/`, repoName]), ` commit `,
6970
makeLink(commitUrl, commitSha.slice(0, 7)),
7071
]);
@@ -82,6 +83,8 @@ export const translator_en_US = makeTranslator<TranslationArgs>({
8283
"generic.action.open": "Open",
8384
"generic.action.close": "Close",
8485

86+
"generic.list_string": ({ strings }) => strings.join(", "),
87+
8588
"generic.text": "Text",
8689

8790
"generic.lorem": true

src/components/translate/translation/zh_Hans.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ export const translator_zh_Hans = makeTranslator<TranslationArgs>({
4444
"contextmenu.item.name.viewport": "视口",
4545
"contextmenu.item.name.viewport.reset_camera": "重置相机",
4646
"contextmenu.item.name.viewport.add_object": "添加",
47-
"contextmenu.item.name.viewport.add_object.obstacle": "Obstacle",
47+
"contextmenu.item.name.viewport.add_object.obstacle": "障碍",
48+
"contextmenu.item.name.viewport.add_object.lava": "岩浆",
4849
// #endregion
4950

5051
// #region Topbar
@@ -79,6 +80,8 @@ export const translator_zh_Hans = makeTranslator<TranslationArgs>({
7980
"generic.position.width": "宽",
8081
"generic.position.height": "高",
8182

83+
"generic.list_string": ({ strings }) => strings.join("、"),
84+
8285
"generic.action.open": "开",
8386
"generic.action.close": "关",
8487

src/components/translate/translationArgs.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ export type TranslationArgs = {
3838
"contextmenu.item.name.viewport.reset_camera": {};
3939
"contextmenu.item.name.viewport.add_object": {};
4040
"contextmenu.item.name.viewport.add_object.obstacle": {};
41+
"contextmenu.item.name.viewport.add_object.lava": {};
4142
// #endregion
4243

4344
// #region Topbar
@@ -77,6 +78,8 @@ export type TranslationArgs = {
7778
"generic.action.open": {};
7879
"generic.action.close": {};
7980

81+
"generic.list_string": { strings: string[]; };
82+
8083
"generic.text": {};
8184
"generic.lorem": {};
8285
};

src/components/view/inspector/Inspector.tsx

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import { Vec2Input } from "@components/form/Vec2Input";
1313
import { FormTitle } from "@components/form/FormTitle.tsx";
1414
import { useTranslate } from "@components/translate/translationArgs.ts";
1515
import { currentBuild } from "@common/currentBuild.ts";
16+
import { Translate } from "@components/translate/Translate.tsx";
1617

1718
export const Inspector: Layout.ViewComponent = ({
1819
viewSwitch,
@@ -140,11 +141,9 @@ export const Inspector: Layout.ViewComponent = ({
140141
<span>
141142
<Icon icon="select" title="Current Selection" />
142143
&nbsp;
143-
{selection.map((item) => (
144-
<Fragment key={item.id}>
145-
<code>{item.id},</code>
146-
</Fragment>
147-
))}
144+
<code>
145+
<Translate k="generic.list_string" strings={selection.map((item) => item.id)} />
146+
</code>
148147
</span>
149148
{selectionForm}
150149
</FormSection>

src/components/view/viewport/Viewport.tsx

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { useDispatchSkapMap, useSkapMap } from "@editor/reducer.ts";
1010
import { MouseButtons, useDrag } from "@hooks/useDrag.ts";
1111
import { useElementSize } from "@hooks/useElementSize.ts";
1212
import React, { FC, useMemo, useRef, useState } from "react";
13-
import { makeObstacle, SkapRoom } from "../../../editor/map.ts";
13+
import { makeLava, makeObstacle, SkapRoom } from "../../../editor/map.ts";
1414
import { ViewToolbar } from "../../layout/LayoutViewToolbar.tsx";
1515
import { Camera, useCamera } from "./camera.ts";
1616
import { viewportToMap } from "./mapping.ts";
@@ -165,8 +165,20 @@ export const Viewport: Layout.ViewComponent = ({
165165
type: "set_selection",
166166
selection: [makeObjectSelectionItem(object)]
167167
});
168-
})
169-
])
168+
}),
169+
makeSingle("viewport.add_object.lava", "square", () => {
170+
const object = makeLava(0, 0, 10, 10);
171+
dispatchMap({
172+
type: "add_object",
173+
roomId: room.id,
174+
object,
175+
});
176+
dispatchSelection({
177+
type: "set_selection",
178+
selection: [makeObjectSelectionItem(object)]
179+
});
180+
}),
181+
]),
170182
]),
171183
]);
172184

src/hooks/useDrag.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@ export const useDrag = ({
121121
const onPointerDown: PointerEventHandler = event => {
122122
if (enabled && mouseButtonMatches(event.button, buttons)) {
123123
if (stopPropagation) event.stopPropagation();
124-
console.log("pointerdown", event.currentTarget);
125124
setDragging(true);
126125
const pointer = vec2(event.clientX, event.clientY);
127126

0 commit comments

Comments
 (0)