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

Commit d63f9f8

Browse files
committed
Merge branch 'transalations'
2 parents 294a5b1 + ae4c5b8 commit d63f9f8

File tree

80 files changed

+774
-361
lines changed

Some content is hidden

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

80 files changed

+774
-361
lines changed

package-lock.json

Lines changed: 14 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"@types/react": "18.0.26",
3535
"@types/react-csv": "1.1.3",
3636
"@types/react-datepicker": "4.8.0",
37-
"@types/react-dom": "18.0.9",
37+
"@types/react-dom": "18.0.10",
3838
"@types/react-window": "1.8.5",
3939
"@typescript-eslint/eslint-plugin": "5.47.0",
4040
"@typescript-eslint/parser": "5.47.0",
@@ -43,7 +43,7 @@
4343
"jest-mock-extended": "3.0.1",
4444
"jest-environment-jsdom": "29.3.1",
4545
"obsidian": "1.1.1",
46-
"rollup": "3.7.5",
46+
"rollup": "3.8.1",
4747
"rollup-plugin-typescript2": "0.34.1",
4848
"ts-jest": "29.0.3",
4949
"tslib": "2.4.1",

src/Settings.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import csv_settings_section from "settings/CSVSection";
1717
import automation_settings_section from "settings/AutomationSection";
1818
import helpers_settings_section from "settings/HelpersSection";
1919
import { applyPluginModalStyle } from "components/styles/ModalStyles";
20+
import { t } from "lang/helpers";
2021

2122
export type SettingRetriever = <K extends keyof DatabaseSettings>(
2223
key: K,
@@ -168,7 +169,7 @@ export class DBFolderSettingTab extends PluginSettingTab {
168169
display(): void {
169170
const { containerEl } = this;
170171
containerEl.empty();
171-
this.settingsManager.constructUI(containerEl, 'Database Folder Plugin', false);
172+
this.settingsManager.constructUI(containerEl, t("settings_title"), false);
172173
}
173174
}
174175

src/components/headerActions/handlers/buttons/AddColumnHandlerAction.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import ArrowRightIcon from "components/img/ArrowRight";
55
import React from "react";
66
import { TableColumn } from "cdm/FolderModel";
77
import headerButtonComponent from "components/headerActions/HeaderButtonComponent";
8+
import { t } from "lang/helpers";
89

910
export default class AddColumnHandlerAction extends AbstractHeaderAction {
1011
globalHeaderActionResponse: HeaderActionResponse;
@@ -42,7 +43,7 @@ function addColumnToRightButton(headerActionResponse: HeaderActionResponse) {
4243
return headerButtonComponent({
4344
onClick: addColumnToRightOnClick,
4445
icon: <ArrowRightIcon />,
45-
label: "Insert right",
46+
label: t("header_menu_insert_column_right"),
4647
});
4748
}
4849

@@ -63,6 +64,6 @@ function addColumnToLeftButton(headerActionResponse: HeaderActionResponse) {
6364
return headerButtonComponent({
6465
onClick: addColumnToLeftOnClick,
6566
icon: <ArrowLeftIcon />,
66-
label: "Insert left",
67+
label: t("header_menu_insert_column_left"),
6768
});
6869
}

src/components/headerActions/handlers/buttons/HideColumnHandlerAction.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import React from "react";
44
import { TableColumn } from "cdm/FolderModel";
55
import headerButtonComponent from "components/headerActions/HeaderButtonComponent";
66
import HideIcon from "components/img/HideIcon";
7+
import { t } from "lang/helpers";
78

89
export default class HideColumnHandlerAction extends AbstractHeaderAction {
910
globalHeaderActionResponse: HeaderActionResponse;
@@ -39,6 +40,6 @@ function hideButton(headerActionResponse: HeaderActionResponse) {
3940
return headerButtonComponent({
4041
onClick: onClick,
4142
icon: <HideIcon />,
42-
label: "Hide",
43+
label: t("header_menu_hide_column"),
4344
});
4445
}

src/components/headerActions/handlers/buttons/RemoveColumnHandlerAction.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import { UpdateRowOptions } from "helpers/Constants";
66
import { RowDataType, TableColumn } from "cdm/FolderModel";
77
import headerButtonComponent from "components/headerActions/HeaderButtonComponent";
88
import { EditEngineService } from "services/EditEngineService";
9+
import { t } from "lang/helpers";
910

1011
export default class RemoveColumnHandlerAction extends AbstractHeaderAction {
1112
globalHeaderActionResponse: HeaderActionResponse;
@@ -80,6 +81,6 @@ function removeButton(headerActionResponse: HeaderActionResponse) {
8081
return headerButtonComponent({
8182
onClick: onClick,
8283
icon: <TrashIcon />,
83-
label: "Delete",
84+
label: t("header_menu_delete_column"),
8485
});
8586
}

src/components/headerActions/handlers/buttons/SortHandlerAction.tsx

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import React from "react";
77
import { InputType } from "helpers/Constants";
88
import { TableColumn } from "cdm/FolderModel";
99
import headerButtonComponent from "components/headerActions/HeaderButtonComponent";
10+
import { t } from "lang/helpers";
1011

1112
export default class SortHandlerAction extends AbstractHeaderAction {
1213
globalHeaderActionResponse: HeaderActionResponse;
@@ -80,7 +81,9 @@ function sortingUpButton(headerActionResponse: HeaderActionResponse) {
8081
return headerButtonComponent({
8182
onClick: sortingUpOnClick,
8283
icon: isAscSorted ? <CrossIcon /> : <ArrowUpIcon />,
83-
label: isAscSorted ? "Remove ascending sort" : "Sort ascending",
84+
label: isAscSorted
85+
? t("header_menu_sort_ascending_remove")
86+
: t("header_menu_sort_ascending"),
8487
});
8588
}
8689

@@ -133,7 +136,7 @@ function sortingDownButton(headerActionResponse: HeaderActionResponse) {
133136
),
134137
label:
135138
header.column.getIsSorted() === "desc"
136-
? "Remove descending sort"
137-
: "Sort descending",
139+
? t("header_menu_sort_descending_remove")
140+
: t("header_menu_sort_descending"),
138141
});
139142
}

src/components/headerActions/handlers/types/CheckboxTypeHeaderAction.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { HeaderActionResponse } from "cdm/HeaderActionModel";
22
import { AbstractHeaderAction } from "components/headerActions/handlers/AbstractHeaderAction";
33
import React from "react";
4-
import { ActionTypes, InputType } from "helpers/Constants";
4+
import { InputType } from "helpers/Constants";
55
import TaskIcon from "components/img/TaskIcon";
66
import headerTypeComponent from "components/headerActions/HeaderTypeComponent";
77
import { TableColumn } from "cdm/FolderModel";

src/components/modals/TextAreaModal.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { c } from "helpers/StylesHelper";
2+
import { t } from "lang/helpers";
23
import {
34
Modal,
45
TextAreaComponent,
@@ -12,7 +13,7 @@ export class TextAreaModal extends Modal {
1213
private reject: () => void;
1314
private submitted = false;
1415
private value: string;
15-
private placeholder = "Type text here";
16+
private placeholder = t("text_modal_default_placeholder");
1617
constructor(
1718
private prompt_text: string,
1819
private default_value: string

src/components/modals/TextModal.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { c } from "helpers/StylesHelper";
2+
import { t } from "lang/helpers";
23
import {
34
Modal,
45
TextComponent,
@@ -12,7 +13,7 @@ export class TextModal extends Modal {
1213
private reject: () => void;
1314
private submitted = false;
1415
private value: string;
15-
private placeholder = "Type text here";
16+
private placeholder = t("text_modal_default_placeholder");
1617
constructor(
1718
private prompt_text: string,
1819
private default_value: string

0 commit comments

Comments
 (0)