Skip to content

Commit 22ecfe2

Browse files
authored
Merge branch 'dev' into blueprint-editor
2 parents 9416a69 + 1990472 commit 22ecfe2

File tree

3 files changed

+460
-428
lines changed

3 files changed

+460
-428
lines changed

src/common/datetime/format_date.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ export const formatDateNumeric = (
7777
const month = parts.find((value) => value.type === "month")?.value;
7878
const year = parts.find((value) => value.type === "year")?.value;
7979

80-
const lastPart = parts.at(parts.length - 1);
80+
const lastPart = parts[parts.length - 1];
8181
let lastLiteral = lastPart?.type === "literal" ? lastPart?.value : "";
8282

8383
if (locale.language === "bg" && locale.date_format === DateFormat.YMD) {

src/translations/en.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5763,7 +5763,7 @@
57635763
"network_settings_title": "Network settings",
57645764
"change_channel": "Change channel",
57655765
"channel_dialog": {
5766-
"title": "Multiprotocol addon in use",
5766+
"title": "Multiprotocol add-on in use",
57675767
"text": "Zigbee and Thread share the same radio and must use the same channel. Change the channel of both networks by reconfiguring multiprotocol from the hardware menu."
57685768
}
57695769
},
@@ -9286,12 +9286,12 @@
92869286
"not_supported": "[%key:ui::panel::my::not_supported%]",
92879287
"faq_link": "[%key:ui::panel::my::faq_link%]",
92889288
"add_addon_repository_title": "Missing add-on repository",
9289-
"add_addon_repository_description": "The addon ''{addon}'' is a part of the add-on repository ''{repository}'', this repository is missing on your system, do you want to add that now?",
9289+
"add_addon_repository_description": "The add-on ''{addon}'' is a part of the add-on repository ''{repository}'', this repository is missing on your system, do you want to add that now?",
92909290
"error": "[%key:ui::panel::my::error%]",
92919291
"error_addon_not_found": "Add-on not found",
9292-
"error_repository_not_found": "The required repository for this Add-on was not found",
9292+
"error_repository_not_found": "The required repository for this add-on was not found",
92939293
"error_addon_not_installed": "The requested add-on is not installed. Please install it first",
9294-
"error_addon_no_ingress": "The requested add-on does not support ingress"
9294+
"error_addon_no_ingress": "The requested add-on does not support Ingress"
92959295
},
92969296
"ingress": {
92979297
"error_addon_info": "Unable to fetch add-on info to start Ingress",
@@ -9491,7 +9491,7 @@
94919491
},
94929492
"uninstall_addon": {
94939493
"title": "Uninstall {name}?",
9494-
"remove_data": "Also permanently delete this addon's data",
9494+
"remove_data": "Also permanently delete this add-on's data",
94959495
"uninstall": "Uninstall"
94969496
},
94979497
"hardware": {

0 commit comments

Comments
 (0)