Skip to content

Commit 61cc9a5

Browse files
bbovenzichoo121600
authored andcommitted
Migrate all plaintext to i18n (apache#51635)
Fix tryNumber key Fix run details merge issues Replace all plaintext and change eslint to ERROR Fix zh-tw assets file
1 parent 4a096e2 commit 61cc9a5

File tree

7 files changed

+161
-0
lines changed

7 files changed

+161
-0
lines changed

airflow-core/src/airflow/ui/public/i18n/locales/en/common.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,14 @@
5353
"queuedAt": "Queued At",
5454
"runAfter": "Run After",
5555
"runType": "Run Type",
56+
<<<<<<< HEAD
5657
<<<<<<< HEAD
5758
"sourceAssetEvent": "Source Asset Event",
5859
=======
5960
>>>>>>> bf7a5c94b0 (Move Dag, run and TI into common.json (#51622))
61+
=======
62+
"sourceAssetEvent": "Source Asset Event",
63+
>>>>>>> c9d55421ce (Migrate all plaintext to i18n (#51635))
6064
"triggeredBy": "Triggered By"
6165
},
6266
"dagRun_one": "Dag Run",
@@ -180,10 +184,14 @@
180184
"to": "To"
181185
},
182186
"task": {
187+
<<<<<<< HEAD
183188
<<<<<<< HEAD
184189
"documentation": "Task Documentation",
185190
=======
186191
>>>>>>> bf7a5c94b0 (Move Dag, run and TI into common.json (#51622))
192+
=======
193+
"documentation": "Task Documentation",
194+
>>>>>>> c9d55421ce (Migrate all plaintext to i18n (#51635))
187195
"lastInstance": "Last Instance",
188196
"operator": "Operator",
189197
"triggerRule": "Trigger Rule"
@@ -205,6 +213,9 @@
205213
"queuedWhen": "Queued At",
206214
"scheduledWhen": "Scheduled At",
207215
<<<<<<< HEAD
216+
<<<<<<< HEAD
217+
=======
218+
>>>>>>> c9d55421ce (Migrate all plaintext to i18n (#51635))
208219
"triggerer": {
209220
"assigned": "Assigned triggerer",
210221
"class": "Trigger class",
@@ -213,8 +224,11 @@
213224
"latestHeartbeat": "Latest triggerer heartbeat",
214225
"title": "Triggerer Info"
215226
},
227+
<<<<<<< HEAD
216228
=======
217229
>>>>>>> bf7a5c94b0 (Move Dag, run and TI into common.json (#51622))
230+
=======
231+
>>>>>>> c9d55421ce (Migrate all plaintext to i18n (#51635))
218232
"unixname": "Unix Name"
219233
},
220234
"taskInstance_one": "Task Instance",

airflow-core/src/airflow/ui/public/i18n/locales/en/dag.json

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,14 @@
1010
"noCode": "No Code Found",
1111
"parsedAt": "Parsed at:"
1212
},
13+
<<<<<<< HEAD
1314
<<<<<<< HEAD
1415
"extraLinks": "Extra Links",
1516
=======
1617
>>>>>>> bf7a5c94b0 (Move Dag, run and TI into common.json (#51622))
18+
=======
19+
"extraLinks": "Extra Links",
20+
>>>>>>> c9d55421ce (Migrate all plaintext to i18n (#51635))
1721
"grid": {
1822
"buttons": {
1923
"resetToLatest": "Reset to latest",
@@ -83,6 +87,7 @@
8387
}
8488
},
8589
"tabs": {
90+
<<<<<<< HEAD
8691
<<<<<<< HEAD
8792
"assetEvents": "Asset Events",
8893
"auditLog": "Audit Log",
@@ -109,6 +114,22 @@
109114
=======
110115
"tasks": "Tasks"
111116
>>>>>>> bf7a5c94b0 (Move Dag, run and TI into common.json (#51622))
117+
=======
118+
"assetEvents": "Asset Events",
119+
"auditLog": "Audit Log",
120+
"backfills": "Backfills",
121+
"code": "Code",
122+
"details": "Details",
123+
"logs": "Logs",
124+
"mappedTaskInstances_one": "Task Instance [{{count}}]",
125+
"mappedTaskInstances_other": "Task Instances [{{count}}]",
126+
"overview": "Overview",
127+
"renderedTemplates": "Rendered Templates",
128+
"runs": "Runs",
129+
"taskInstances": "Task Instances",
130+
"tasks": "Tasks",
131+
"xcom": "XCom"
132+
>>>>>>> c9d55421ce (Migrate all plaintext to i18n (#51635))
112133
},
113134
"taskGroups": {
114135
"collapseAll": "Collapse all task groups",

airflow-core/src/airflow/ui/public/i18n/locales/zh-TW/assets.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"consumingDags": "消費者 Dags",
3+
<<<<<<< HEAD
34
"createEvent": {
45
"button": "建立事件",
56
"manual": {
@@ -21,6 +22,8 @@
2122
},
2223
"title": "為 {{name}} 建立資源事件"
2324
},
25+
=======
26+
>>>>>>> c9d55421ce (Migrate all plaintext to i18n (#51635))
2427
"group": "群組",
2528
"lastAssetEvent": "最後資源事件",
2629
"name": "名稱",

airflow-core/src/airflow/ui/src/pages/Run/Details.tsx

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,14 @@ export const Details = () => {
4545
);
4646

4747
<<<<<<< HEAD
48+
<<<<<<< HEAD
49+
=======
50+
>>>>>>> c9d55421ce (Migrate all plaintext to i18n (#51635))
4851
if (!dagRun) {
4952
return undefined;
5053
}
5154

55+
<<<<<<< HEAD
5256
return (
5357
<Table.Root striped>
5458
<Table.Body>
@@ -258,5 +262,107 @@ export const Details = () => {
258262
)}
259263
</Box>
260264
>>>>>>> 56fc9e7851 (Move asset events to its own tab (#51625))
265+
=======
266+
return (
267+
<Table.Root striped>
268+
<Table.Body>
269+
<Table.Row>
270+
<Table.Cell>{translate("state")}</Table.Cell>
271+
<Table.Cell>
272+
<Flex gap={1}>
273+
<StateBadge state={dagRun.state} />
274+
{dagRun.state}
275+
</Flex>
276+
</Table.Cell>
277+
</Table.Row>
278+
<Table.Row>
279+
<Table.Cell>{translate("runId")}</Table.Cell>
280+
<Table.Cell>
281+
<HStack>
282+
{dagRun.dag_run_id}
283+
<ClipboardRoot value={dagRun.dag_run_id}>
284+
<ClipboardIconButton />
285+
</ClipboardRoot>
286+
</HStack>
287+
</Table.Cell>
288+
</Table.Row>
289+
<Table.Row>
290+
<Table.Cell>{translate("dagRun.runType")}</Table.Cell>
291+
<Table.Cell>
292+
<HStack>
293+
<RunTypeIcon runType={dagRun.run_type} />
294+
<Text>{dagRun.run_type}</Text>
295+
</HStack>
296+
</Table.Cell>
297+
</Table.Row>
298+
<Table.Row>
299+
<Table.Cell>{translate("duration")}</Table.Cell>
300+
<Table.Cell>{getDuration(dagRun.start_date, dagRun.end_date)}</Table.Cell>
301+
</Table.Row>
302+
<Table.Row>
303+
<Table.Cell>{translate("dagRun.lastSchedulingDecision")}</Table.Cell>
304+
<Table.Cell>
305+
<Time datetime={dagRun.last_scheduling_decision} />
306+
</Table.Cell>
307+
</Table.Row>
308+
<Table.Row>
309+
<Table.Cell>{translate("dagRun.queuedAt")}</Table.Cell>
310+
<Table.Cell>
311+
<Time datetime={dagRun.queued_at} />
312+
</Table.Cell>
313+
</Table.Row>
314+
<Table.Row>
315+
<Table.Cell>{translate("startDate")}</Table.Cell>
316+
<Table.Cell>
317+
<Time datetime={dagRun.start_date} />
318+
</Table.Cell>
319+
</Table.Row>
320+
<Table.Row>
321+
<Table.Cell>{translate("endDate")}</Table.Cell>
322+
<Table.Cell>
323+
<Time datetime={dagRun.end_date} />
324+
</Table.Cell>
325+
</Table.Row>
326+
<Table.Row>
327+
<Table.Cell>{translate("dagRun.dataIntervalStart")}</Table.Cell>
328+
<Table.Cell>
329+
<Time datetime={dagRun.data_interval_start} />
330+
</Table.Cell>
331+
</Table.Row>
332+
<Table.Row>
333+
<Table.Cell>{translate("dagRun.dataIntervalEnd")}</Table.Cell>
334+
<Table.Cell>
335+
<Time datetime={dagRun.data_interval_end} />
336+
</Table.Cell>
337+
</Table.Row>
338+
<Table.Row>
339+
<Table.Cell>{translate("dagRun.triggeredBy")}</Table.Cell>
340+
<Table.Cell>{dagRun.triggered_by}</Table.Cell>
341+
</Table.Row>
342+
{dagRun.bundle_version !== null && (
343+
<Table.Row>
344+
<Table.Cell>{translate("components:versionDetails.bundleVersion")}</Table.Cell>
345+
<Table.Cell>{dagRun.bundle_version}</Table.Cell>
346+
</Table.Row>
347+
)}
348+
<Table.Row>
349+
<Table.Cell>{translate("dagRun.dagVersions")}</Table.Cell>
350+
<Table.Cell>
351+
<VStack separator={<StackSeparator />}>
352+
{dagRun.dag_versions.map((dagVersion) => (
353+
<DagVersionDetails dagVersion={dagVersion} key={dagVersion.id} />
354+
))}
355+
</VStack>
356+
</Table.Cell>
357+
</Table.Row>
358+
<Table.Row>
359+
<Table.Cell>{translate("dagRun.conf")}</Table.Cell>
360+
<Table.Cell>
361+
<RenderedJsonField content={dagRun.conf ?? {}} />
362+
</Table.Cell>
363+
</Table.Row>
364+
</Table.Body>
365+
</Table.Root>
366+
>>>>>>> c9d55421ce (Migrate all plaintext to i18n (#51635))
261367
);
262368
};

airflow-core/src/airflow/ui/src/pages/Run/Run.tsx

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,13 @@
1818
*/
1919
import { ReactFlowProvider } from "@xyflow/react";
2020
<<<<<<< HEAD
21+
<<<<<<< HEAD
2122
import { useTranslation } from "react-i18next";
2223
=======
2324
>>>>>>> 56fc9e7851 (Move asset events to its own tab (#51625))
25+
=======
26+
import { useTranslation } from "react-i18next";
27+
>>>>>>> c9d55421ce (Migrate all plaintext to i18n (#51635))
2428
import { FiCode, FiDatabase } from "react-icons/fi";
2529
import { MdDetails, MdOutlineEventNote, MdOutlineTask } from "react-icons/md";
2630
import { useParams } from "react-router-dom";
@@ -31,6 +35,7 @@ import { isStatePending, useAutoRefresh } from "src/utils";
3135

3236
import { Header } from "./Header";
3337

38+
<<<<<<< HEAD
3439
<<<<<<< HEAD
3540
=======
3641
const tabs = [
@@ -42,6 +47,8 @@ const tabs = [
4247
];
4348

4449
>>>>>>> 56fc9e7851 (Move asset events to its own tab (#51625))
50+
=======
51+
>>>>>>> c9d55421ce (Migrate all plaintext to i18n (#51635))
4552
export const Run = () => {
4653
const { t: translate } = useTranslation("dag");
4754
const { dagId = "", runId = "" } = useParams();

airflow-core/src/airflow/ui/src/pages/Task/Task.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import { getGroupTask } from "src/utils/groupTask";
2929
import { GroupTaskHeader } from "./GroupTaskHeader";
3030
import { Header } from "./Header";
3131

32+
<<<<<<< HEAD
3233
<<<<<<< HEAD
3334
=======
3435
const tabs = [
@@ -38,6 +39,8 @@ const tabs = [
3839
];
3940

4041
>>>>>>> 56fc9e7851 (Move asset events to its own tab (#51625))
42+
=======
43+
>>>>>>> c9d55421ce (Migrate all plaintext to i18n (#51635))
4144
export const Task = () => {
4245
const { t: translate } = useTranslation("dag");
4346
const { dagId = "", groupId, taskId } = useParams();

airflow-core/src/airflow/ui/src/pages/TaskInstance/TaskInstance.tsx

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,13 @@
1818
*/
1919
import { ReactFlowProvider } from "@xyflow/react";
2020
<<<<<<< HEAD
21+
<<<<<<< HEAD
2122
import { useTranslation } from "react-i18next";
2223
=======
2324
>>>>>>> 56fc9e7851 (Move asset events to its own tab (#51625))
25+
=======
26+
import { useTranslation } from "react-i18next";
27+
>>>>>>> c9d55421ce (Migrate all plaintext to i18n (#51635))
2428
import { FiCode, FiDatabase } from "react-icons/fi";
2529
import { MdDetails, MdOutlineEventNote, MdOutlineTask, MdReorder, MdSyncAlt } from "react-icons/md";
2630
import { PiBracketsCurlyBold } from "react-icons/pi";
@@ -36,6 +40,7 @@ import { isStatePending, useAutoRefresh } from "src/utils";
3640

3741
import { Header } from "./Header";
3842

43+
<<<<<<< HEAD
3944
<<<<<<< HEAD
4045
=======
4146
const tabs = [
@@ -49,6 +54,8 @@ const tabs = [
4954
];
5055

5156
>>>>>>> 56fc9e7851 (Move asset events to its own tab (#51625))
57+
=======
58+
>>>>>>> c9d55421ce (Migrate all plaintext to i18n (#51635))
5259
export const TaskInstance = () => {
5360
const { t: translate } = useTranslation("dag");
5461
const { dagId = "", mapIndex = "-1", runId = "", taskId = "" } = useParams();

0 commit comments

Comments
 (0)