Skip to content

Centralize JS translations in skin.js.php with zmPrimeTranslations() for lazy priming #4804

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Copilot wants to merge 5 commits into
base: master
Choose a base branch
from
+43 −58
Open

Centralize JS translations in skin.js.php with zmPrimeTranslations() for lazy priming #4804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b466f7d
Initial plan
Copilot May 6, 2026
d547ba6
feat: centralize JS translate object and common translated strings in…
Copilot May 6, 2026
970ae86
fix: use validJsStr() consistently for JS string escaping in skin.js.php
Copilot May 6, 2026
6aeaba5
feat: add zmPrimeTranslations() for lazy-priming of JS translations p…
Copilot May 6, 2026
a50fd97
style: remove extra blank line in watch.js.php
Copilot May 6, 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
16 changes: 8 additions & 8 deletions web/js/MonitorStream.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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);
Expand Down Expand Up @@ -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
Expand All @@ -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);
Expand Down
29 changes: 29 additions & 0 deletions web/skins/classic/js/skin.js.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,35 @@
const exportSucceededString = '<?php echo translate('ExportSucceeded') ?>';
const cancelString = '<?php echo translate('Cancel') ?>';
const playerDisabledInMonitorSettings = '<?php echo translate('PlayerDisabledInMonitorSettings') ?>';

const deleteString = "<?php echo validJsStr(translate('Delete')) ?>";
const archivedString = "<?php echo validJsStr(translate('Archived')) ?>";
const unarchivedString = "<?php echo validJsStr(translate('Unarchived')) ?>";
const emailedString = "<?php echo validJsStr(translate('Emailed')) ?>";
const yesString = "<?php echo validJsStr(translate('Yes')) ?>";
const noString = "<?php echo validJsStr(translate('No')) ?>";
const confirmDeleteEventsString = "<?php echo validJsStr(translate('ConfirmDeleteEvents')) ?>";

const translate = {};
function zmPrimeTranslations(t) { Object.assign(translate, t); }
zmPrimeTranslations({
"seconds": "<?php echo translate('seconds') ?>",
"Fullscreen": "<?php echo translate('Fullscreen') ?>",
"Exit Fullscreen": "<?php echo translate('Exit Fullscreen') ?>",
"Showing Analysis": "<?php echo translate('Showing Analysis') ?>",
"Show Analysis": "<?php echo translate('Show Analysis') ?>",
"Not Showing Analysis": "<?php echo translate('Not Showing Analysis') ?>",
"Live": "<?php echo translate('Live') ?>",
"Edit": "<?php echo translate('Edit') ?>",
"All Events": "<?php echo translate('All Events') ?>",
"Info": "<?php echo translate('Info') ?>",
"Archived": "<?php echo translate('Archived') ?>",
"Emailed": "<?php echo translate('Emailed') ?>",
"EnableAlarms": "<?php echo translate('EnableAlarms') ?>",
"DisableAlarms": "<?php echo translate('DisableAlarms') ?>",
"ForceAlarm": "<?php echo translate('ForceAlarm') ?>",
"CancelForcedAlarm": "<?php echo translate('CancelForcedAlarm') ?>",
});
<?php
/* We can't trust PHP_SELF on a path like /index.php/"%3E%3Cimg src=x onerror=prompt('1');%3E which
will still load index.php but will include the arbitrary payload after `.php/`. To mitigate this,
Expand Down
4 changes: 2 additions & 2 deletions web/skins/classic/views/js/event.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1930,12 +1930,12 @@ function toggleZones(e) {
if (zones.length) {
if (zones.is(":visible")) {
zones.hide();
button.setAttribute('title', showZonesString);
button.setAttribute('title', translate["Show Zones"]);
$j('#toggleZonesButton .material-icons').text('layers');
setCookie('zmEventShowZones'+eventData.MonitorId, '0');
} else {
zones.show();
button.setAttribute('title', hideZonesString);
button.setAttribute('title', translate["Hide Zones"]);
$j('#toggleZonesButton .material-icons').text('layers_clear');
setCookie('zmEventShowZones'+eventData.MonitorId, '1');
}
Expand Down
19 changes: 4 additions & 15 deletions web/skins/classic/views/js/event.js.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,23 +102,12 @@
//
// Strings
//
var deleteString = "<?php echo validJsStr(translate('Delete')) ?>";
var causeString = "<?php echo validJsStr(translate('AttrCause')) ?>";
var showZonesString = "<?php echo validJsStr(translate('Show Zones'))?>";
var hideZonesString = "<?php echo validJsStr(translate('Hide Zones'))?>";
zmPrimeTranslations({
"Show Zones": "<?php echo validJsStr(translate('Show Zones')) ?>",
"Hide Zones": "<?php echo validJsStr(translate('Hide Zones')) ?>",
});
var WEB_LIST_THUMB_WIDTH = '<?php echo ZM_WEB_LIST_THUMB_WIDTH ?>';
var WEB_LIST_THUMB_HEIGHT = '<?php echo ZM_WEB_LIST_THUMB_HEIGHT ?>';
var popup = '<?php echo $popup ?>';

var translate = {
"seconds": "<?php echo translate('seconds') ?>",
"Fullscreen": "<?php echo translate('Fullscreen') ?>",
"Exit Fullscreen": "<?php echo translate('Exit Fullscreen') ?>",
"Live": "<?php echo translate('Live') ?>",
"Edit": "<?php echo translate('Edit') ?>",
"All Events": "<?php echo translate('All Events') ?>",
"Info": "<?php echo translate('Info') ?>",
"Archived": "<?php echo translate('Archived') ?>",
"Emailed": "<?php echo translate('Emailed') ?>",
};

6 changes: 0 additions & 6 deletions web/skins/classic/views/js/events.js.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,6 @@
var filterQuery = '<?php echo isset($filterQuery)?validJsStr(htmlspecialchars_decode($filterQuery)):'' ?>';
var sortQuery = '<?php echo isset($sortQuery)?validJsStr(htmlspecialchars_decode($sortQuery)):'' ?>';

const confirmDeleteEventsString = "<?php echo addslashes(translate('ConfirmDeleteEvents')) ?>";
const archivedString = "<?php echo translate('Archived') ?>";
const unarchivedString = "<?php echo translate('Unarchived') ?>";
const archiveString = "<?php echo translate('Archive') ?>";
const unarchiveString = "<?php echo translate('Unarchive') ?>";
const emailedString = "<?php echo translate('Emailed') ?>";
const yesString = "<?php echo translate('Yes') ?>";
const noString = "<?php echo translate('No') ?>";
var WEB_LIST_THUMBS = <?php echo ZM_WEB_LIST_THUMBS?'true':'false' ?>;
1 change: 0 additions & 1 deletion web/skins/classic/views/js/snapshot.js.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@

// Strings
//
var deleteString = "<?php echo validJsStr(translate('Delete')) ?>";
var causeString = "<?php echo validJsStr(translate('AttrCause')) ?>";
var downloadProgressString = "<?php echo validJsStr(translate('Downloading')) ?>";
var downloadFailedString = '<?php echo translate('Download Failed') ?>';
Expand Down
5 changes: 0 additions & 5 deletions web/skins/classic/views/js/snapshots.js.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1 @@
var confirmDeleteEventsString = "<?php echo addslashes(translate('ConfirmDeleteEvents')) ?>";
var archivedString = "<?php echo translate('Archived') ?>";
var emailedString = "<?php echo translate('Emailed') ?>";
var yesString = "<?php echo translate('Yes') ?>";
var noString = "<?php echo translate('No') ?>";
var WEB_LIST_THUMBS = <?php echo ZM_WEB_LIST_THUMBS?'true':'false' ?>;
2 changes: 0 additions & 2 deletions web/skins/classic/views/js/timeline.js.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@
?>
var monitors = <?php echo json_encode($jsMonitors) ?>;

var archivedString = "<?php echo translate('Archived') ?>";

var minTime = '<?php echo $minTime?>';
var midTime = '<?php echo $midTime?>';
var maxTime = '<?php echo $maxTime?>';
Expand Down
13 changes: 0 additions & 13 deletions web/skins/classic/views/js/watch.js.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,16 +102,3 @@
global $players;
echo 'players = '.json_encode($players).PHP_EOL;
?>
var deleteString = "<?php echo translate('Delete') ?>";
var enableAlarmsStr = "<?php echo translate('EnableAlarms') ?>";
var disableAlarmsStr = "<?php echo translate('DisableAlarms') ?>";
var forceAlarmStr = "<?php echo translate('ForceAlarm') ?>";
var cancelForcedAlarmStr = "<?php echo translate('CancelForcedAlarm') ?>";
var translate = {
"seconds": "<?php echo translate('seconds') ?>",
"Fullscreen": "<?php echo translate('Fullscreen') ?>",
"Exit Fullscreen": "<?php echo translate('Exit Fullscreen') ?>",
"Showing Analysis": "<?php echo translate('Showing Analysis') ?>",
"Show Analysis": "<?php echo translate('Show Analysis') ?>",
"Not Showing Analysis": "<?php echo translate('Not Showing Analysis') ?>",
};
6 changes: 0 additions & 6 deletions web/skins/classic/views/js/zone.js.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@
var minBlobsUnsetString = '<?php echo addslashes(translate('MinBlobsUnset')) ?>';
var minBlobsLtMaxString = '<?php echo addslashes(translate('MinBlobsLtMax')) ?>';

var deleteString = "<?php echo translate('Delete') ?>";
//
// Imported from watch.js.php and modified for new zone edit view
//
Expand All @@ -120,8 +119,3 @@
var imageRefreshTimeout = <?php echo 1000*ZM_WEB_REFRESH_IMAGE ?>;

var canStream = <?php echo canStream()?'true':'false' ?>;

var translate = {
"Showing Analysis": '<?php echo translate('Showing Analysis'); ?>',
"Not Showing Analysis": '<?php echo translate('Not Showing Analysis'); ?>'
};