Skip to content

Commit 1c85f84

Browse files
committed
translations, preview screensaver link
1 parent 489aa9c commit 1c85f84

File tree

5 files changed

+44
-24
lines changed

5 files changed

+44
-24
lines changed

assets/js/core.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,11 @@ const photoBooth = (function () {
161161
initPhotoSwipeFromDOM('#galimages');
162162

163163
api.screensaver.resetTimer();
164+
165+
const params = new URLSearchParams(window.location.search);
166+
if (params.has('screensaverPreview')) {
167+
api.screensaver.show(true);
168+
}
164169
};
165170

166171
api.screensaver = createScreensaver({

assets/js/screensaver.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,8 @@
197197
}
198198
};
199199

200-
api.show = function show() {
201-
if (!screensaverEnabled || !overlay.length) {
200+
api.show = function show(force = false) {
201+
if ((!force && !screensaverEnabled) || !overlay.length) {
202202
return;
203203
}
204204
const mode = screensaverMode;

lib/configsetup.inc.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -506,6 +506,13 @@
506506
'name' => 'screensaver[enabled]',
507507
'value' => $config['screensaver']['enabled'],
508508
],
509+
'screensaver_preview' => [
510+
'view' => 'basic',
511+
'type' => 'button',
512+
'name' => 'screensaver[preview]',
513+
'placeholder' => 'screensaver_preview',
514+
'value' => 'screensaver-preview-btn',
515+
],
509516
'screensaver_mode' => [
510517
'view' => 'basic',
511518
'type' => 'select',

resources/lang/de.json

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -702,6 +702,7 @@
702702
"manual:userinterface:icons_update": "Icon für Update.",
703703
"manual:userinterface:icons_update_git": "Icon für Git-Update.",
704704
"manual:userinterface:icons_zoom": "Icon für Zoom.",
705+
"manual:userinterface:colors_status_bar": "Farbe für Browser-/Statusleiste (theme-color) auf Mobilgeräten.",
705706
"manual:userinterface:ui_button": "Wählen Sie Ihren gewünschten Tastenstil aus.",
706707
"manual:userinterface:ui_decore_lines": "Wenn aktiviert, werden Linien auf der Startseite angezeigt.",
707708
"manual:userinterface:ui_result_buttons": "Wenn aktiviert, werden die Nachbearbeitungs-Schaltflächen auf dem Ergebnisbildschirm sichtbar. Wenn deaktiviert, wird die gesamte Schaltflächenleiste ausgeblendet.",
@@ -1044,17 +1045,19 @@
10441045
"video:video_gif": "Video als GIF",
10451046
"video:video_qr": "QR für Video",
10461047
"wait_message": "Bitte warten...",
1047-
"screensaver:screensaver_enabled": "Bildschirmschoner aktivieren",
1048-
"screensaver:screensaver_mode": "Bildschirmschoner Medientyp",
1049-
"screensaver:screensaver_image_source": "Bildschirmschoner-Bildpfad",
1050-
"screensaver:screensaver_video_source": "Bildschirmschoner-Videopfad",
1051-
"screensaver:screensaver_text": "Bildschirmschoner-Text",
1052-
"screensaver:screensaver_text_color": "Bildschirmschoner-Textfarbe",
1053-
"screensaver:screensaver_text_backdrop_color": "Hintergrundfarbe des Bildschirmschoner-Textes",
1054-
"screensaver:screensaver_text_backdrop_opacity": "Deckkraft des Text-Hintergrunds",
1055-
"screensaver:screensaver_text_position": "Bildschirmschoner-Textposition",
1056-
"screensaver:screensaver_timeout_minutes": "Zeit bis Bildschirmschoner (Minuten)",
1057-
"screensaver:screensaver_switch_minutes": "Wechselintervall (Minuten)",
1048+
"screensaver:screensaver_enabled": "Bildschirmschoner aktiv",
1049+
"screensaver:screensaver_mode": "Medientyp",
1050+
"screensaver:screensaver_preview": "Vorschau",
1051+
"screensaver_preview": "Vorschau öffnen",
1052+
"screensaver:screensaver_image_source": "Bildpfad",
1053+
"screensaver:screensaver_video_source": "Videopfad",
1054+
"screensaver:screensaver_text": "Text",
1055+
"screensaver:screensaver_text_color": "Textfarbe",
1056+
"screensaver:screensaver_text_backdrop_color": "Texthintergrund",
1057+
"screensaver:screensaver_text_backdrop_opacity": "Hintergrund-Deckkraft",
1058+
"screensaver:screensaver_text_position": "Textposition",
1059+
"screensaver:screensaver_timeout_minutes": "Start nach (Min.)",
1060+
"screensaver:screensaver_switch_minutes": "Wechselintervall (Min.)",
10581061
"manual:screensaver:screensaver_enabled": "Bildschirmschoner ein- oder ausschalten.",
10591062
"manual:screensaver:screensaver_mode": "Wählen, was der Bildschirmschoner zeigt: Einzelbild, Video, Bilder aus dem Ordner screensavers oder Galerie-Bilder.",
10601063
"manual:screensaver:screensaver_image_source": "Bild wählen, das im Modus Bild bzw. als Fallback für Galerie genutzt wird.",
@@ -1064,6 +1067,7 @@
10641067
"manual:screensaver:screensaver_text_backdrop_color": "Grundfarbe hinter dem Text.",
10651068
"manual:screensaver:screensaver_text_backdrop_opacity": "Deckkraft des Text-Hintergrunds (0 = transparent, 1 = deckend).",
10661069
"manual:screensaver:screensaver_text_position": "Position des Bildschirmschoner-Textes wählen.",
1070+
"manual:screensaver:screensaver_preview": "Öffnet in neuem Tab und startet den Bildschirmschoner sofort mit aktuellen Einstellungen.",
10671071
"manual:screensaver:screensaver_timeout_minutes": "Inaktivitäts-Minuten, bevor der Bildschirmschoner startet.",
10681072
"manual:screensaver:screensaver_switch_minutes": "Minuten zwischen Bild-/Video-Wechseln im Bildschirmschoner."
10691073
}

resources/lang/en.json

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -704,6 +704,7 @@
704704
"manual:userinterface:icons_update": "Defines the icon class used for the update button.",
705705
"manual:userinterface:icons_update_git": "Defines the icon class used for the Git update button.",
706706
"manual:userinterface:icons_zoom": "Defines the icon class used for the zoom button.",
707+
"manual:userinterface:colors_status_bar": "Color used for the browser/status bar (theme-color) on mobile.",
707708
"manual:userinterface:ui_button": "Choose your desired button style.",
708709
"manual:userinterface:ui_decore_lines": "If enabled, decorate lines will be visible on start page.",
709710
"manual:userinterface:ui_result_buttons": "If enabled, post-processing buttons will be visible on the on result screen. If disabled the whole button bar will be hidden.",
@@ -1047,17 +1048,19 @@
10471048
"video:video_gif": "Video as GIF",
10481049
"video:video_qr": "Show video QR code",
10491050
"wait_message": "Please wait...",
1050-
"screensaver:screensaver_enabled": "Enable screensaver",
1051-
"screensaver:screensaver_mode": "Screensaver media type",
1052-
"screensaver:screensaver_image_source": "Screensaver image path",
1053-
"screensaver:screensaver_video_source": "Screensaver video path",
1054-
"screensaver:screensaver_text": "Screensaver text",
1055-
"screensaver:screensaver_text_color": "Screensaver text color",
1056-
"screensaver:screensaver_text_backdrop_color": "Screensaver text backdrop color",
1057-
"screensaver:screensaver_text_backdrop_opacity": "Screensaver text backdrop opacity",
1058-
"screensaver:screensaver_text_position": "Screensaver text position",
1059-
"screensaver:screensaver_timeout_minutes": "Timeout before screensaver (minutes)",
1060-
"screensaver:screensaver_switch_minutes": "Slide change interval (minutes)",
1051+
"screensaver:screensaver_enabled": "Screensaver on",
1052+
"screensaver:screensaver_mode": "Media type",
1053+
"screensaver:screensaver_preview": "Preview",
1054+
"screensaver_preview": "Open preview",
1055+
"screensaver:screensaver_image_source": "Image path",
1056+
"screensaver:screensaver_video_source": "Video path",
1057+
"screensaver:screensaver_text": "Text",
1058+
"screensaver:screensaver_text_color": "Text color",
1059+
"screensaver:screensaver_text_backdrop_color": "Text backdrop",
1060+
"screensaver:screensaver_text_backdrop_opacity": "Backdrop opacity",
1061+
"screensaver:screensaver_text_position": "Text position",
1062+
"screensaver:screensaver_timeout_minutes": "Start after (min)",
1063+
"screensaver:screensaver_switch_minutes": "Change interval (min)",
10611064
"manual:screensaver:screensaver_enabled": "Enable or disable the screensaver.",
10621065
"manual:screensaver:screensaver_mode": "Select what the screensaver shows: single image, single video, images from the screensavers folder, or gallery images.",
10631066
"manual:screensaver:screensaver_image_source": "Pick the image used when screensaver mode is image or as fallback for gallery.",
@@ -1067,6 +1070,7 @@
10671070
"manual:screensaver:screensaver_text_backdrop_color": "Backdrop base color behind screensaver text.",
10681071
"manual:screensaver:screensaver_text_backdrop_opacity": "Backdrop opacity (0 = transparent, 1 = solid).",
10691072
"manual:screensaver:screensaver_text_position": "Select where the screensaver text is placed.",
1073+
"manual:screensaver:screensaver_preview": "Open a new tab and show the screensaver immediately with the current settings.",
10701074
"manual:screensaver:screensaver_timeout_minutes": "Minutes of inactivity before the screensaver starts.",
10711075
"manual:screensaver:screensaver_switch_minutes": "Minutes between image/video changes in the screensaver."
10721076
}

0 commit comments

Comments
 (0)