Skip to content
This repository was archived by the owner on Jul 28, 2025. It is now read-only.

Commit 28a787f

Browse files
committed
Merge branch '386-fr-create-a-translation-architecture'
2 parents 3d81191 + 47782e9 commit 28a787f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+251
-89
lines changed

devops/generateTranslations.py

Whitespace-only changes.

src/DatabaseView.tsx

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,17 @@ import {
1313
} from "components/Columns";
1414
import { createDatabase } from "components/index/Database";
1515
import { DbFolderException } from "errors/AbstractException";
16-
import { DatabaseCore, InputType, StyleClasses } from "helpers/Constants";
16+
import {
17+
DatabaseCore,
18+
DB_ICONS,
19+
InputType,
20+
StyleClasses,
21+
} from "helpers/Constants";
1722
import { createEmitter, Emitter } from "helpers/Emitter";
1823
import obtainInitialType from "helpers/InitialType";
1924
import { adapterTFilesToRows, isDatabaseNote } from "helpers/VaultManagement";
2025
import { getParentWindow } from "helpers/WindowElement";
26+
import { t } from "lang/helpers";
2127
import DBFolderPlugin from "main";
2228

2329
import {
@@ -109,7 +115,7 @@ export class DatabaseView extends TextFileView implements HoverParent {
109115
menu
110116
.addItem((item) => {
111117
item
112-
.setTitle("Open as markdown")
118+
.setTitle(t("menu_pane_open_as_md_action"))
113119
.setIcon("document")
114120
.onClick(() => {
115121
this.plugin.databaseFileModes[
@@ -120,8 +126,8 @@ export class DatabaseView extends TextFileView implements HoverParent {
120126
})
121127
.addItem((item) => {
122128
item
123-
.setTitle("Open database settings")
124-
.setIcon("gear")
129+
.setTitle(t("menu_pane_open_db_settings_action"))
130+
.setIcon(DB_ICONS.NAME)
125131
.onClick(() => {
126132
new SettingsModal(
127133
this,

src/components/DefaultHeader.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ export default function DefaultHeader(headerProps: DatabaseHeaderProps) {
177177
labelState={labelState}
178178
setLabelState={setLabelState}
179179
/>,
180-
activeDocument.getElementById(`${view.file.path}-popper`)
180+
activeDocument.body
181181
)
182182
: null}
183183
</>

src/components/NavBar.tsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import DataviewFilters from "components/reducers/DataviewFilters";
2020
import { MenuButtonStyle } from "components/styles/NavBarStyles";
2121
import { SettingsModal } from "Settings";
2222
import CsvReader from "./navbar/CsvReader";
23+
import { t } from "lang/helpers";
2324

2425
export function NavBar(navBarProps: NavBarProps) {
2526
const { table } = navBarProps;
@@ -75,7 +76,7 @@ export function NavBar(navBarProps: NavBarProps) {
7576
size="large"
7677
edge="start"
7778
color="inherit"
78-
aria-label="Open table options"
79+
aria-label={t("toolbar_menu_aria_label")}
7980
sx={{ mr: 2 }}
8081
id="long-button"
8182
aria-controls={open ? "long-menu" : undefined}
@@ -105,11 +106,11 @@ export function NavBar(navBarProps: NavBarProps) {
105106
>
106107
<MenuItem onClick={handleSettingsClick} disableRipple>
107108
<SettingsIcon {...MenuButtonStyle} />
108-
Settings
109+
{t("menu_pane_open_db_settings_action")}
109110
</MenuItem>
110111
<MenuItem onClick={handleOpenAsMarkdownClick} disableRipple>
111112
<InsertDriveFileIcon {...MenuButtonStyle} />
112-
Open as Markdown
113+
{t("menu_pane_open_as_md_action")}
113114
</MenuItem>
114115
<MenuItem disableRipple>
115116
{/* CSV buttton download */}

src/components/index/Database.tsx

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@ export function Database(tableProps: TableDataType) {
1111
return (
1212
<React.StrictMode>
1313
<Table {...tableProps} tableStore={tableStore} />
14-
<div
15-
id={`${tableProps.view.file.path}-popper`}
16-
key={`${tableProps.view.file.path}-popper-key`}
17-
></div>
1814
</React.StrictMode>
1915
);
2016
}

src/components/navbar/CsvReader.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import FileUploadIcon from "@mui/icons-material/FileUpload";
33
import React, { ChangeEventHandler, MouseEventHandler, useRef } from "react";
44
import { MenuButtonStyle } from "components/styles/NavBarStyles";
55
import { NavBarProps } from "cdm/MenuBarModel";
6+
import { t } from "lang/helpers";
67

78
export default function CsvReader(navBarProps: NavBarProps) {
89
const { table } = navBarProps;
@@ -30,7 +31,7 @@ export default function CsvReader(navBarProps: NavBarProps) {
3031
return (
3132
<MenuItem disableRipple onClick={handleFileUpload}>
3233
<FileUploadIcon {...MenuButtonStyle} />
33-
Upload CSV
34+
{t("toolbar_menu_import_csv")}
3435
{/* Hidden input element to trigger file upload */}
3536
<input
3637
ref={inputRef}

src/components/navbar/CsvWriter.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import React from "react";
77
import { CSVLink } from "react-csv";
88
import DownloadIcon from "@mui/icons-material/Download";
99
import { MenuButtonStyle } from "components/styles/NavBarStyles";
10+
import { t } from "lang/helpers";
1011

1112
const CsvWriter = (CsvButtonProps: CsvButtonProps) => {
1213
const { columns, rows, name } = CsvButtonProps;
@@ -36,7 +37,7 @@ const CsvWriter = (CsvButtonProps: CsvButtonProps) => {
3637
target="_blank"
3738
>
3839
<DownloadIcon {...MenuButtonStyle} />
39-
Download CSV
40+
{t("toolbar_menu_export_csv")}
4041
</CSVLink>
4142
</>
4243
);

src/components/portals/CalendarPortal.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,9 @@ const CalendarPortal = (calendarProps: CellComponentProps) => {
4343
}
4444

4545
const CalendarContainer = (containerProps: any) => {
46-
const el = activeDocument.getElementById(`${view.file.path}-popper`);
47-
return <Portal container={el}>{containerProps.children}</Portal>;
46+
return (
47+
<Portal container={activeDocument.body}>{containerProps.children}</Portal>
48+
);
4849
};
4950
return showDatePicker ? (
5051
<DatePicker

src/components/portals/CalendarTimePortal.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,9 @@ const CalendarTimePortal = (calendarTimeProps: CellComponentProps) => {
4242
}
4343

4444
const CalendarContainer = (containerProps: any) => {
45-
const el = activeDocument.getElementById(`${view.file.path}-popper`);
46-
return <Portal container={el}>{containerProps.children}</Portal>;
45+
return (
46+
<Portal container={activeDocument.body}>{containerProps.children}</Portal>
47+
);
4748
};
4849

4950
return showDatePicker &&

src/components/portals/DataviewFiltersPortal.tsx

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import ReactDOM from "react-dom";
1818
import { usePopper } from "react-popper";
1919
import { Notice } from "obsidian";
2020
import MenuUpIcon from "components/img/MenuUpIcon";
21+
import { t } from "lang/helpers";
2122

2223
const DataviewFiltersPortal = (props: DataviewFiltersProps) => {
2324
const { table } = props;
@@ -150,7 +151,7 @@ const DataviewFiltersPortal = (props: DataviewFiltersProps) => {
150151
value={key}
151152
key={`MenuItem-OperatorSelector-${value[0]}-${selectorProps.index}`}
152153
>
153-
{value[1]}
154+
{t(value[1] as any)}
154155
</MenuItem>
155156
);
156157
})}
@@ -297,10 +298,7 @@ const DataviewFiltersPortal = (props: DataviewFiltersProps) => {
297298
</Button>
298299

299300
{domReady
300-
? ReactDOM.createPortal(
301-
currentFilters(),
302-
activeDocument.getElementById(`${view.file.path}-popper`)
303-
)
301+
? ReactDOM.createPortal(currentFilters(), activeDocument.body)
304302
: null}
305303
</>
306304
);

0 commit comments

Comments
 (0)