diff --git a/web/js/MonitorStream.js b/web/js/MonitorStream.js index baed627444a..2ab2ac49797 100644 --- a/web/js/MonitorStream.js +++ b/web/js/MonitorStream.js @@ -1337,11 +1337,11 @@ function MonitorStream(monitorData) { if (!this.buttons.enableAlarmButton.hasClass('disabled')) { this.buttons.enableAlarmButton.addClass('disabled'); - this.buttons.enableAlarmButton.prop('title', disableAlarmsStr); + this.buttons.enableAlarmButton.prop('title', translate["DisableAlarms"]); } } else { this.buttons.enableAlarmButton.removeClass('disabled'); - this.buttons.enableAlarmButton.prop('title', enableAlarmsStr); + this.buttons.enableAlarmButton.prop('title', translate["EnableAlarms"]); } // end if doing analysis this.buttons.enableAlarmButton.prop('disabled', false); } // end if have enableAlarmButton @@ -1352,13 +1352,13 @@ function MonitorStream(monitorData) { // and the disabled state should be to force an alarm if (this.buttons.forceAlarmButton.hasClass('disabled')) { this.buttons.forceAlarmButton.removeClass('disabled'); - this.buttons.forceAlarmButton.prop('title', cancelForcedAlarmStr); + this.buttons.forceAlarmButton.prop('title', translate["CancelForcedAlarm"]); } } else { if (!this.buttons.forceAlarmButton.hasClass('disabled')) { // Looks disabled this.buttons.forceAlarmButton.addClass('disabled'); - this.buttons.forceAlarmButton.prop('title', forceAlarmStr); + this.buttons.forceAlarmButton.prop('title', translate["ForceAlarm"]); } } this.buttons.forceAlarmButton.prop('disabled', false); @@ -1468,11 +1468,11 @@ function MonitorStream(monitorData) { if (!this.buttons.enableAlarmButton.hasClass('disabled')) { this.buttons.enableAlarmButton.addClass('disabled'); - this.buttons.enableAlarmButton.prop('title', disableAlarmsStr); + this.buttons.enableAlarmButton.prop('title', translate["DisableAlarms"]); } } else { this.buttons.enableAlarmButton.removeClass('disabled'); - this.buttons.enableAlarmButton.prop('title', enableAlarmsStr); + this.buttons.enableAlarmButton.prop('title', translate["EnableAlarms"]); } // end if doing analysis this.buttons.enableAlarmButton.prop('disabled', false); } // end if have enableAlarmButton @@ -1483,13 +1483,13 @@ function MonitorStream(monitorData) { // and the disabled state should be to force an alarm if (this.buttons.forceAlarmButton.hasClass('disabled')) { this.buttons.forceAlarmButton.removeClass('disabled'); - this.buttons.forceAlarmButton.prop('title', cancelForcedAlarmStr); + this.buttons.forceAlarmButton.prop('title', translate["CancelForcedAlarm"]); } } else { if (!this.buttons.forceAlarmButton.hasClass('disabled')) { // Looks disabled this.buttons.forceAlarmButton.addClass('disabled'); - this.buttons.forceAlarmButton.prop('title', forceAlarmStr); + this.buttons.forceAlarmButton.prop('title', translate["ForceAlarm"]); } } this.buttons.forceAlarmButton.prop('disabled', false); diff --git a/web/skins/classic/js/skin.js.php b/web/skins/classic/js/skin.js.php index 926aafea72c..119c4c32eba 100644 --- a/web/skins/classic/js/skin.js.php +++ b/web/skins/classic/js/skin.js.php @@ -38,6 +38,35 @@ const exportSucceededString = ''; const cancelString = ''; const playerDisabledInMonitorSettings = ''; + +const deleteString = ""; +const archivedString = ""; +const unarchivedString = ""; +const emailedString = ""; +const yesString = ""; +const noString = ""; +const confirmDeleteEventsString = ""; + +const translate = {}; +function zmPrimeTranslations(t) { Object.assign(translate, t); } +zmPrimeTranslations({ + "seconds": "", + "Fullscreen": "", + "Exit Fullscreen": "", + "Showing Analysis": "", + "Show Analysis": "", + "Not Showing Analysis": "", + "Live": "", + "Edit": "", + "All Events": "", + "Info": "", + "Archived": "", + "Emailed": "", + "EnableAlarms": "", + "DisableAlarms": "", + "ForceAlarm": "", + "CancelForcedAlarm": "", +}); "; var causeString = ""; -var showZonesString = ""; -var hideZonesString = ""; +zmPrimeTranslations({ + "Show Zones": "", + "Hide Zones": "", +}); var WEB_LIST_THUMB_WIDTH = ''; var WEB_LIST_THUMB_HEIGHT = ''; var popup = ''; -var translate = { - "seconds": "", - "Fullscreen": "", - "Exit Fullscreen": "", - "Live": "", - "Edit": "", - "All Events": "", - "Info": "", - "Archived": "", - "Emailed": "", -}; - diff --git a/web/skins/classic/views/js/events.js.php b/web/skins/classic/views/js/events.js.php index 52a39ca41a3..1b0b6ad1c99 100644 --- a/web/skins/classic/views/js/events.js.php +++ b/web/skins/classic/views/js/events.js.php @@ -6,12 +6,6 @@ var filterQuery = ''; var sortQuery = ''; -const confirmDeleteEventsString = ""; -const archivedString = ""; -const unarchivedString = ""; const archiveString = ""; const unarchiveString = ""; -const emailedString = ""; -const yesString = ""; -const noString = ""; var WEB_LIST_THUMBS = ; diff --git a/web/skins/classic/views/js/snapshot.js.php b/web/skins/classic/views/js/snapshot.js.php index a04f4cb951e..8534993bc6b 100644 --- a/web/skins/classic/views/js/snapshot.js.php +++ b/web/skins/classic/views/js/snapshot.js.php @@ -24,7 +24,6 @@ // Strings // -var deleteString = ""; var causeString = ""; var downloadProgressString = ""; var downloadFailedString = ''; diff --git a/web/skins/classic/views/js/snapshots.js.php b/web/skins/classic/views/js/snapshots.js.php index 487d9cd5df1..7d8d459eb85 100644 --- a/web/skins/classic/views/js/snapshots.js.php +++ b/web/skins/classic/views/js/snapshots.js.php @@ -1,6 +1 @@ -var confirmDeleteEventsString = ""; -var archivedString = ""; -var emailedString = ""; -var yesString = ""; -var noString = ""; var WEB_LIST_THUMBS = ; diff --git a/web/skins/classic/views/js/timeline.js.php b/web/skins/classic/views/js/timeline.js.php index aa9d7398674..e0d5c3bb620 100644 --- a/web/skins/classic/views/js/timeline.js.php +++ b/web/skins/classic/views/js/timeline.js.php @@ -33,8 +33,6 @@ ?> var monitors = ; -var archivedString = ""; - var minTime = ''; var midTime = ''; var maxTime = ''; diff --git a/web/skins/classic/views/js/watch.js.php b/web/skins/classic/views/js/watch.js.php index 9b5c47a98ff..e70db16a92d 100644 --- a/web/skins/classic/views/js/watch.js.php +++ b/web/skins/classic/views/js/watch.js.php @@ -102,16 +102,3 @@ global $players; echo 'players = '.json_encode($players).PHP_EOL; ?> -var deleteString = ""; -var enableAlarmsStr = ""; -var disableAlarmsStr = ""; -var forceAlarmStr = ""; -var cancelForcedAlarmStr = ""; -var translate = { - "seconds": "", - "Fullscreen": "", - "Exit Fullscreen": "", - "Showing Analysis": "", - "Show Analysis": "", - "Not Showing Analysis": "", -}; diff --git a/web/skins/classic/views/js/zone.js.php b/web/skins/classic/views/js/zone.js.php index 2cb8ebcc10e..d74024e2262 100644 --- a/web/skins/classic/views/js/zone.js.php +++ b/web/skins/classic/views/js/zone.js.php @@ -101,7 +101,6 @@ var minBlobsUnsetString = ''; var minBlobsLtMaxString = ''; -var deleteString = ""; // // Imported from watch.js.php and modified for new zone edit view // @@ -120,8 +119,3 @@ var imageRefreshTimeout = ; var canStream = ; - -var translate = { - "Showing Analysis": '', - "Not Showing Analysis": '' -};