Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
f7a66d0
Refactor UI translation files to use nested keys (Resolves #68252)
pranampagi Jun 9, 2026
9da0a35
Merge branch 'apache:main' into simplify_translation
pranampagi Jun 9, 2026
e25aad0
Merge branch 'main' into simplify_translation
pranampagi Jun 10, 2026
9ed244a
Merge branch 'main' into simplify_translation
pranampagi Jun 10, 2026
791d6d7
Merge branch 'main' into simplify_translation
pranampagi Jun 10, 2026
879c35a
Merge branch 'main' into simplify_translation
pranampagi Jun 11, 2026
dd15af6
Merge branch 'apache:main' into simplify_translation
pranampagi Jun 11, 2026
ce8f1af
Fix casing regressions in UI translation files
pranampagi Jun 13, 2026
e873e56
Merge branch 'main' of https://github.com/apache/airflow into simplif…
pranampagi Jun 13, 2026
b641946
Merge branch 'apache:main' into simplify_translation
pranampagi Jun 15, 2026
a50c34d
Merge branch 'apache:main' into simplify_translation
pranampagi Jun 15, 2026
d8b6c7a
Merge branch 'apache:main' into simplify_translation
pranampagi Jun 15, 2026
578e112
Fix CI E2E test timeouts by reverting nested i18n for ID strings
pranampagi Jun 15, 2026
dfc7988
Merge branch 'main' into simplify_translation
pranampagi Jun 15, 2026
5c8dbe8
Merge branch 'main' into simplify_translation
pranampagi Jun 15, 2026
15a45a2
Merge branch 'main' into simplify_translation
pranampagi Jun 15, 2026
635c21e
Merge branch 'main' into simplify_translation
pranampagi Jun 15, 2026
39e5098
Merge branch 'main' into simplify_translation
pranampagi Jun 16, 2026
c2c67b8
Merge branch 'main' into simplify_translation
pranampagi Jun 16, 2026
65eb85b
Merge branch 'main' into simplify_translation
pranampagi Jun 16, 2026
0f04bb1
Merge branch 'main' into simplify_translation
pranampagi Jun 17, 2026
00985d0
Merge branch 'main' into simplify_translation
pranampagi Jun 17, 2026
4aee10a
Merge branch 'main' into simplify_translation
pranampagi Jun 17, 2026
c4ce882
Merge branch 'main' into simplify_translation
pranampagi Jun 17, 2026
41eff2d
Merge branch 'main' into simplify_translation
pranampagi Jun 17, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions airflow-core/src/airflow/ui/public/i18n/locales/en/admin.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"title": "Airflow Configuration"
},
"connections": {
"add": "Add Connection",
"add": "Add $t(connections.connection_one)",
"columns": {
"connectionId": "Connection ID",
"connectionType": "Connection Type",
Expand All @@ -27,9 +27,9 @@
"deleteConnection_other": "Delete {{count}} connections",
"firstConfirmMessage_one": "You are about to delete the following connection:",
"firstConfirmMessage_other": "You are about to delete the following connections:",
"title": "Delete Connection"
"title": "Delete $t(connections.connection_one)"
},
"edit": "Edit Connection",
"edit": "Edit $t(connections.connection_one)",
"form": {
"connectionIdRequired": "Connection ID is required",
"connectionIdRequirement": "Connection ID cannot contain only spaces",
Expand All @@ -47,14 +47,14 @@
"learnMore": "These are resolved at runtime and are not visible in the UI.",
"title": "No connection found!"
},
"searchPlaceholder": "Search Connections",
"test": "Test Connection",
"searchPlaceholder": "Search $t(connections.connection_other)",
"test": "Test $t(connections.connection_one)",
"testDisabled": "Test connection feature is disabled. Please contact an administrator to enable it.",
"testError": {
"title": "Test Connection Failed"
"title": "Test $t(connections.connection_one) Failed"
},
"testSuccess": {
"title": "Test Connection Successful"
"title": "Test $t(connections.connection_one) Successful"
},
"typeMeta": {
"error": "Failed to retrieve Connection Type Meta",
Expand Down Expand Up @@ -107,13 +107,13 @@
"searchPlaceholder": "Search by file"
},
"pools": {
"add": "Add Pool",
"add": "Add $t(pools.pool_one)",
"deferredSlotsIncluded": "Deferred Slots Included",
"delete": {
"title": "Delete Pool",
"title": "Delete $t(pools.pool_one)",
"warning": "This will remove all metadata related to the pool and may affect tasks using this pool."
},
"edit": "Edit Pool",
"edit": "Edit $t(pools.pool_one)",
"form": {
"checkbox": "Check to include deferred tasks when calculating open pool slots",
"description": "Description",
Expand All @@ -126,7 +126,7 @@
"noPoolsFound": "No pools found",
"pool_one": "Pool",
"pool_other": "Pools",
"searchPlaceholder": "Search Pools",
"searchPlaceholder": "Search $t(pools.pool_other)",
"sort": {
"asc": "Name (A-Z)",
"desc": "Name (Z-A)",
Expand All @@ -140,19 +140,19 @@
}
},
"variables": {
"add": "Add Variable",
"add": "Add $t(variables.variable_one)",
"columns": {
"isEncrypted": "Is Encrypted"
},
"delete": {
"deleteVariable_one": "Delete 1 Variable",
"deleteVariable_other": "Delete {{count}} Variables",
"deleteVariable_one": "Delete 1 $t(variables.variable_one)",
"deleteVariable_other": "Delete {{count}} $t(variables.variable_other)",
"firstConfirmMessage_one": "You are about to delete the following variable:",
"firstConfirmMessage_other": "You are about to delete the following variables:",
"title": "Delete Variable",
"title": "Delete $t(variables.variable_one)",
"tooltip": "Delete selected variables"
},
"edit": "Edit Variable",
"edit": "Edit $t(variables.variable_one)",
"form": {
"invalidJson": "Invalid JSON",
"keyMaxLength": "Key can contain a maximum of 250 characters",
Expand Down
12 changes: 6 additions & 6 deletions airflow-core/src/airflow/ui/public/i18n/locales/en/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
},
"asset_one": "Asset",
"asset_other": "Assets",
"assetEvent_one": "Asset Event",
"assetEvent_other": "Asset Events",
"assetEvent_one": "$t(asset_one) Event",
"assetEvent_other": "$t(asset_one) Events",
"assetInactive": {
"tooltip": "Upstream asset has been deactivated; the scheduler is holding partition evaluation until it is reactivated."
},
Expand All @@ -33,8 +33,8 @@
"collapseAllExtra": "Collapse all extra JSON",
"collapseDetailsPanel": "Collapse Details Panel",
"consumingAsset": "Consuming Asset",
"createdAssetEvent_one": "Created Asset Event",
"createdAssetEvent_other": "Created Asset Events",
"createdAssetEvent_one": "Created $t(assetEvent_one)",
"createdAssetEvent_other": "Created $t(assetEvent_other)",
"dag_one": "Dag",
"dag_other": "Dags",
"dagDetails": {
Expand Down Expand Up @@ -232,8 +232,8 @@
"hotkey": "s",
"show": "Show Source"
},
"sourceAssetEvent_one": "Source Asset Event",
"sourceAssetEvent_other": "Source Asset Events",
"sourceAssetEvent_one": "Source $t(assetEvent_one)",
"sourceAssetEvent_other": "Source $t(assetEvent_other)",
"startDate": "Start Date",
"state": "State",
"states": {
Expand Down
12 changes: 6 additions & 6 deletions airflow-core/src/airflow/ui/public/i18n/locales/en/dags.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
"assetSchedule": "{{count}} of {{total}} assets updated",
"dagActions": {
"delete": {
"button": "Delete Dag",
"warning": "This will remove all metadata related to the Dag, including Runs and Tasks."
"button": "Delete $t(common:dag_one)",
"warning": "This will remove all metadata related to the $t(common:dag_one), including Runs and $t(common:task_other)."
}
},
"favoriteDag": "Favorite Dag",
"favoriteDag": "Favorite $t(common:dag_one)",
"filters": {
"allRunTypes": "All Run Types",
"allStates": "All States",
Expand Down Expand Up @@ -79,9 +79,9 @@
"search": {
"advanced": "Advanced Search",
"clear": "Clear search",
"dags": "Search Dags",
"dags": "Search $t(common:dag_other)",
"hotkey": "+K",
"tasks": "Search Tasks"
"tasks": "Search $t(common:task_other)"
},
"sort": {
"displayName": {
Expand All @@ -102,5 +102,5 @@
},
"placeholder": "Sort by"
},
"unfavoriteDag": "Unfavorite Dag"
"unfavoriteDag": "Unfavorite $t(common:dag_one)"
}
Loading