Skip to content
This repository was archived by the owner on Aug 27, 2022. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions config/config.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
$config['background_chroma'] = null;
$config['force_buzzer'] = false;
$config['webserver_ip'] = null;
$config['wifi_ssid'] = 'Photobooth';
$config['rounded_corners'] = false;
$config['time_to_live'] = '90000';
$config['db_file'] = 'db';
Expand Down
6 changes: 6 additions & 0 deletions lib/configsetup.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,12 @@
'placeholder' => '127.0.0.1',
'value' => $config['webserver_ip']
],
'wifi_ssid' => [
'type' => 'input',
'name' => 'wifi_ssid',
'placeholder' => 'Photobooth',
'value' => $config['wifi_ssid']
],
'use_download' => [
'type' => 'checkbox',
'name' => 'use_download',
Expand Down
2 changes: 1 addition & 1 deletion resources/js/core.js
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ const photoBooth = (function () {
const body = qrCodeModal.find('.modal__body');

$(this).appendTo(body);
$('<p>').css('max-width', this.width + 'px').html(await i18n('qrHelp')).appendTo(body);
$('<p>').css('max-width', this.width + 'px').html(await i18n('qrHelp') + '</br><b>' + config.wifi_ssid + '</b>').appendTo(body);
});

// Add Print Link
Expand Down
4 changes: 3 additions & 1 deletion resources/lang/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
"general_videoHeight": "Gerätekamera Bildhöhe",
"general_videoWidth": "Gerätekamera Bildbreite",
"general_webserver_ip": "IP-Adresse des Photobooth Webservers",
"general_wifi_ssid": "Wireless-Netzwerkname (SSID) für den Zugriff auf die Photobooth",
"home": "Home",
"image_preview_before_processing": "Bild laden bevor Filter berechnet werden",
"insertMail": "Gebe deine E-Mail-Adresse ein, um das Foto zugesendet zu bekommen.",
Expand Down Expand Up @@ -145,6 +146,7 @@
"manual_general_videoHeight": "Geben Sie einen Wert ein, der als Höhe für die Vorschau der Gerätekamera verwendet wird.",
"manual_general_videoWidth": "Geben Sie einen Wert ein, der als Breite für die Vorschau der Gerätekamera verwendet wird.",
"manual_general_webserver_ip": "Bitte definieren Sie die IP-Adresse des Photobooth-Webservers, wenn Sie die Photobooth in einem Unterordner installiert haben oder die Photobooth über \"localhost\" bzw. \"127.0.0.1\" aufrufen. Dies wird zwingend benötigt damit der QR-Code funktioniert. <p>Beispiel, wenn auf Photobooth direkt zugegriffen werden kann: <code>192.168.0.50</code>.</p> <p>Beispiel, wenn Photobooth in einem Unterordner installiert ist: <code>192.168.0.50/photobooth</code>.</p>",
"manual_general_wifi_ssid": "Bitte definieren Sie die den Wireless-Netzwerknamen (SSID), der für den Zugriff auf die Photobooth verwendet werden soll. Der Wireless-Netzwerkname (SSID) wird auf der Ergebnisseite beim Aufruf des QR-Codes angezeigt.",
"manual_image_preview_before_processing": "Wenn diese Option aktiviert ist, werden Bilder vorgeladen und während der Filterverarbeitung angezeigt.",
"manual_is_event": "Wenn diese Option aktiviert ist, können Sie einen Text definieren und zwischen verschiedenen Symbolen wählen, die auf der Startseite angezeigt werden.",
"manual_is_textonprint": "Wenn aktiviert, können Sie Text auf Ihre Bilder drucken.",
Expand Down Expand Up @@ -247,7 +249,7 @@
"protect_admin": "Admin Panel schützen",
"protect_index": "Startseite schützen",
"qr": "QR Code",
"qrHelp": "Um das Bild auf dein Handy zu laden, verbinde dich mit dem WLAN <strong>photobooth</strong>",
"qrHelp": "Um das Bild auf Ihr Handy herunterzuladen, verbinden Sie sich mit dem WLAN:",
"randomPicture": "Zufällige Bilder anzeigen",
"really_delete": "Wollen Sie wirklich alle Bilder löschen? Das kann nicht rückgängig gemacht werden!",
"reload": "Seite neu laden",
Expand Down
1 change: 0 additions & 1 deletion resources/lang/el.json
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@
"print_rotation": "Περιστροφή κείμενο",
"printing": "Η εργασία εκτύπωσης ξεκίνησε! Παρακαλώ περιμένετε...",
"qr": "QR Κώδικας",
"qrHelp": "Για να κάνετε λήψη της εικόνας στο τηλέφωνό σας, συνδεθείτε στο Wi-Fi <strong>photobooth</strong>",
"randomPicture": "Εμφάνιση τυχαίων εικόνων",
"really_delete": "Θέλετε πραγματικά να διαγράψετε όλες τις εικόνες; Αυτό δεν μπορεί να ανατραπεί!",
"reload": "Ανανέωση της σελίδας",
Expand Down
4 changes: 3 additions & 1 deletion resources/lang/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
"general_videoHeight": "Device cam picture height",
"general_videoWidth": "Device cam picture width",
"general_webserver_ip": "IP address of the Photobooth web server",
"general_wifi_ssid": "Wireless network name (SSID) used to access the photobooth",
"home": "Home",
"image_preview_before_processing": "Preload and show image during filter processing",
"insertMail": "Enter your e-mail address to receive the photo.",
Expand Down Expand Up @@ -147,6 +148,7 @@
"manual_general_videoHeight": "Enter a value which is used as height for preview by device cam.",
"manual_general_videoWidth": "Enter a value which is used as width for preview by device cam.",
"manual_general_webserver_ip": "Please define the IP address of the Photobooth web server to make the QR-Code working if you're accessing Photobooth via \"localhost\", \"127.0.0.1\" or if you have Photobooth installed inside a subfolder. <p>Example if Photobooth can be accessed directly: <code>192.168.0.50</code>.</p><p>Example if Photobooth is installed inside a subfolder: <code>192.168.0.50/photobooth</code>.</p>",
"manual_general_wifi_ssid": "Please define the wireless network name (SSID) to be used to access the Photobooth. The wireless network name (SSID) is displayed on the results page when the QR code is called up.",
"manual_image_preview_before_processing": "If enabled, images are preloaded and shown during filter processing.",
"manual_is_event": "If enabled, you can define a text and choose between different symbols which are visible on the start page.",
"manual_is_textonprint": "If enabled, you can print some text onto your pictures.",
Expand Down Expand Up @@ -250,7 +252,7 @@
"protect_admin": "Protect admin panel",
"protect_index": "Protect start screen",
"qr": "QR Code",
"qrHelp": "Connect to the wifi <strong>photobooth</strong>, to download the picture to your smartphone.",
"qrHelp": "To download the picture to your smartphone, connect to the WiFi:",
"randomPicture": "Show random pictures",
"really_delete": "Really delete all picture? This cannot be undone!",
"reload": "Reload Page",
Expand Down
4 changes: 3 additions & 1 deletion resources/lang/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
"general_videoHeight": "Altura de la imagen de la cámara del dispositivo",
"general_videoWidth": "Ancho de imagen de la cámara del dispositivo",
"general_webserver_ip": "La dirección IP del servidor Web de Photobooth",
"general_wifi_ssid": "Nombre de red inalámbrica (SSID) utilizado para acceder photobooth",
"home": "Inicio",
"image_preview_before_processing": "Precargar y mostrar la imagen durante el procesamiento del filtro",
"insertMail": "Introduzca su correo electrónico para recibir la foto.",
Expand Down Expand Up @@ -147,6 +148,7 @@
"manual_general_videoHeight": "Introduzca un valor que se utilice como altura para la vista previa por la cámara del dispositivo.",
"manual_general_videoWidth": "Introduzca un valor que se utilice como ancho para la vista previa por la cámara del dispositivo.",
"manual_general_webserver_ip": "Defina la dirección IP del servidor web Photobooth para que el código QR funcione si está accediendo a Photobooth a través de \"localhost\", \"127.0.0.1\" o si tiene Photobooth instalado dentro de una subcarpeta. <p>Por ejemplo, si Photobooth se puede acceder directamente: <code>192.168.0.50</code>.</p><p>Por ejemplo, si Photobooth está instalado dentro de una subcarpeta: <code>192.168.0.50/photobooth</code>.</p>",
"manual_general_wifi_ssid": "Defina el nombre de la red inalámbrica (SSID) que se utilizará para acceder Photobooth. El nombre de la red inalámbrica (SSID) se muestra en la página de resultados cuando se llama al código QR.",
"manual_image_preview_before_processing": "Si está habilitada, las imágenes se precargan y se muestran durante el procesamiento del filtro.",
"manual_is_event": "Si está habilitado, puede definir un texto y elegir entre diferentes símbolos que están visibles en la página de inicio.",
"manual_is_textonprint": "Si está habilitado, puede imprimir texto en sus imágenes.",
Expand Down Expand Up @@ -250,7 +252,7 @@
"protect_admin": "Proteger el panel de administración",
"protect_index": "Proteger la pantalla de inicio",
"qr": "Código QR",
"qrHelp": "Acceder al wifi del <strong>photobooth</strong>, para descargar la foto en su móvil.",
"qrHelp": "Para descargar la imagen en su teléfono inteligente, conéctese al WiFi:",
"randomPicture": "Mostrar imágenes al azar",
"really_delete": "¿Suprimir realmente todas las imágenes? ¡No puede ser anulado!",
"reload": "Descargar de nuevo la página.",
Expand Down
1 change: 0 additions & 1 deletion resources/lang/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@
"print_rotation": "Rotation du texte",
"printing": "I'impression a commencé",
"qr": "QR Code",
"qrHelp": "Se connecter au wifi du <strong>photobooth</strong>, pour télécharger la photo sur votre smartphone.",
"randomPicture": "Afficher des images aléatoires",
"really_delete": "Vraiment supprimer toutes les images? Ça ne peut pas être annulé!",
"reload": "Recharger la page",
Expand Down