Partially revert "adjust sizing for room timer"

This reverts commit b07745b2ea.

Turns out if we have bigger font size longer talk titles no longer fit.

README.rst

@@ -1,6 +1,10 @@
 Pretalx: Broadcast Tools (and more)
 ===================================
 
+.. image:: http://translate.pretalx.com/widget/pretalx-plugin-broadcast-tools/pretalx-plugin-broadcast-tools/svg-badge.svg
+    :alt: Translation status
+    :target: http://translate.pretalx.com/engage/pretalx-plugin-broadcast-tools/
+
 This is a plugin for `pretalx`_.
 
 This adds the following features to your pretalx instance:

pretalx_broadcast_tools/locale/de_DE/LC_MESSAGES/django.po

@@ -2,19 +2,21 @@
 # Copyright (C) 2024 Franziska 'kunsi' Kunsmann
 # This file is distributed under the same license as the pretalx-broadcast-tools package.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: 2.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-11-05 07:29+0100\n"
-"PO-Revision-Date: 2024-11-05 07:32+0100\n"
-"Last-Translator: Franziska Kunsmann <git@kunsmann.eu>\n"
-"Language: \n"
+"POT-Creation-Date: 2024-11-13 06:37+0100\n"
+"PO-Revision-Date: 2024-11-13 05:41+0000\n"
+"Last-Translator: Franziska <pretalx@kunsmann.eu>\n"
+"Language-Team: German <http://translate.pretalx.com/projects/"
+"pretalx-plugin-broadcast-tools/pretalx-plugin-broadcast-tools/de/>\n"
+"Language: de_DE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 5.6.2\n"
 
 #: apps.py:12
 msgid "Broadcasting Tools"
@@ -27,7 +29,8 @@ msgid ""
 "software"
 msgstr ""
 "Einige Helfer, die zur Unterstützung von Broadcasting-Software benutzt "
-"werden kann, zum Beispiel eine 'Bauchbinden'-Seite."
+"werden kann, zum Beispiel eine 'Bauchbinden'-Seite, die in deine "
+"Broadcasting-Software eingebunden werden kann"
 
 #: exporter.py:124
 msgid "DO NOT RECORD - DO NOT STREAM"
@@ -189,14 +192,11 @@ msgid "Feature"
 msgstr "Funktion"
 
 #: templates/pretalx_broadcast_tools/orga.html:21
-#, fuzzy
-#| msgid "Lower thirds"
 msgid "Lower Thirds"
 msgstr "Bauchbinden"
 
 #: templates/pretalx_broadcast_tools/orga.html:22
-#, fuzzy
-#| msgid "Room info"
+#: templates/pretalx_broadcast_tools/orga.html:63
 msgid "Room Info"
 msgstr "Raum-Information"
 
@@ -253,6 +253,14 @@ msgstr "Track-Name in einfachem Text oder in der Track-Farbe eingefärbt."
 msgid "Settings"
 msgstr "Einstellungen"
 
+#: templates/pretalx_broadcast_tools/orga.html:70
+msgid "PDF Export"
+msgstr "PDF-Export"
+
+#: templates/pretalx_broadcast_tools/orga.html:86
+msgid "Save"
+msgstr "Speichern"
+
 #: templates/pretalx_broadcast_tools/orga.html:55
 msgid "Lower thirds"
 msgstr "Bauchbinden"
@@ -264,7 +272,3 @@ msgstr "Raum-Information"
 #: templates/pretalx_broadcast_tools/orga.html:70
 msgid "PDF export"
 msgstr "PDF-Export"
-
-#: templates/pretalx_broadcast_tools/orga.html:86
-msgid "Save"
-msgstr "Speichern"

pretalx_broadcast_tools/locale/fr_FR/LC_MESSAGES/django.po

@@ -3,19 +3,21 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-11-05 07:29+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"POT-Creation-Date: 2024-11-13 06:37+0100\n"
+"PO-Revision-Date: 2025-02-05 12:56+0000\n"
+"Last-Translator: Harrissou Sant-anna <delazj@gmail.com>\n"
+"Language-Team: French <http://translate.pretalx.com/projects/"
+"pretalx-plugin-broadcast-tools/pretalx-plugin-broadcast-tools/fr/>\n"
+"Language: fr_FR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 5.6.2\n"
 
 #: apps.py:12
 msgid "Broadcasting Tools"
@@ -30,35 +32,35 @@ msgstr ""
 
 #: exporter.py:124
 msgid "DO NOT RECORD - DO NOT STREAM"
-msgstr ""
+msgstr "NE PAS ENREGISTRER - NE PAS DIFFUSER EN CONTINU"
 
 #: exporter.py:167
 msgid "Duration"
-msgstr ""
+msgstr "Durée"
 
 #: exporter.py:168
 msgid "Language"
-msgstr ""
+msgstr "Langue"
 
 #: exporter.py:169
 msgid "Type"
-msgstr ""
+msgstr "Type"
 
 #: exporter.py:170
 msgid "Code"
-msgstr ""
+msgstr "Code"
 
 #: exporter.py:214
 msgid "Questions"
-msgstr ""
+msgstr "Questions"
 
 #: exporter.py:242
 msgid "Notes"
-msgstr ""
+msgstr "Notes"
 
 #: exporter.py:264
 msgid "Internal Notes"
-msgstr ""
+msgstr "Notes internes"
 
 #: forms.py:10
 msgid "Will be shown as talk title if there's currently no talk running."
@@ -169,10 +171,12 @@ msgid "Feature"
 msgstr ""
 
 #: templates/pretalx_broadcast_tools/orga.html:21
+#: templates/pretalx_broadcast_tools/orga.html:55
 msgid "Lower Thirds"
 msgstr ""
 
 #: templates/pretalx_broadcast_tools/orga.html:22
+#: templates/pretalx_broadcast_tools/orga.html:63
 msgid "Room Info"
 msgstr ""
 
@@ -227,16 +231,8 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: templates/pretalx_broadcast_tools/orga.html:55
-msgid "Lower thirds"
-msgstr ""
-
-#: templates/pretalx_broadcast_tools/orga.html:63
-msgid "Room info"
-msgstr ""
-
 #: templates/pretalx_broadcast_tools/orga.html:70
-msgid "PDF export"
+msgid "PDF Export"
 msgstr ""
 
 #: templates/pretalx_broadcast_tools/orga.html:86

pretalx_broadcast_tools/static/pretalx_broadcast_tools/frontend.css

@@ -110,7 +110,7 @@ body {
 }
 
 #broadcast_tools_room_timer_timeleft_timer {
-    font-size: 20vh;
+    font-size: 35vh;
 }
 
 #broadcast_tools_room_timer_progressbar, #broadcast_tools_room_timer_progressbar_bar {

pretalx_broadcast_tools/static/pretalx_broadcast_tools/room_timer.js

@@ -1,3 +1,10 @@
+function _left_zero_pad(i) {
+    if (i < 10) {
+        i = "0" + i;
+    }
+    return i;
+}
+
 function update_room_info() {
     room_name = get_room_name();
 
@@ -37,6 +44,7 @@ function update_room_info() {
 
     current_talk = get_current_talk(60);
     next_talk = get_next_talk();
+    now = new Date();
 
     if (current_talk) {
         title.innerHTML = current_talk['title'];
@@ -45,7 +53,6 @@ function update_room_info() {
         scheduledata.innerHTML += ' - ';
         scheduledata.innerHTML += format_time_from_pretalx(current_talk['end']);
 
-        now = new Date();
         scheduled_start = new Date(current_talk['start']);
         scheduled_end = new Date(current_talk['end']);
 
@@ -54,15 +61,20 @@ function update_room_info() {
             progressbar_bar.style.width = '0';
             timehint.innerHTML = '';
         } else if (scheduled_end < now) {
-            timeleft.innerHTML = '0sec';
+            timeleft.innerHTML = '0:00';
             progressbar_bar.style.width = '100vw';
             timehint.innerHTML = 'talk has ended';
         } else {
             diff = scheduled_end - now;
-            let diff_s = Math.floor(Math.floor(diff / 1000) % 60/10);
+            let diff_s = Math.floor(diff / 1000) % 60;
             let diff_m = Math.floor(diff / 1000 / 60) % 60;
+            let diff_h = Math.floor(diff / 1000 / 60 / 60);
 
-            timeleft.innerHTML = diff_m + 'min ' + diff_s + '0sec';
+            if (diff_h > 0) {
+                timeleft.innerHTML = diff_h + ":" + _left_zero_pad(diff_m) + ":" + _left_zero_pad(diff_s);
+            } else {
+                timeleft.innerHTML = diff_m + ":" + _left_zero_pad(diff_s);
+            }
 
             total_time = scheduled_end - scheduled_start;
             progressbar_bar.style.width = (((diff/total_time)*100)-100)*-1 + 'vw';
@@ -83,9 +95,10 @@ function update_room_info() {
         progressbar_bar.style.width = '0';
         speaker.innerHTML = 'Break';
         timehint.innerHTML = '';
-        timeleft.innerHTML = '';
         title.innerHTML = room_name;
 
+        timeleft.innerHTML = _left_zero_pad(now.getHours()) + ":" + _left_zero_pad(now.getMinutes()) + ":" + _left_zero_pad(now.getSeconds());
+
         if (next_talk) {
             scheduledata.innerHTML = format_time_from_pretalx(next_talk['start']) + ' ' + next_talk['title'];
 

pretalx_broadcast_tools/templates/pretalx_broadcast_tools/orga.html

@@ -52,7 +52,7 @@
         <h2>{% translate "Settings" %}</h2>
         <fieldset>
             <legend>
-                {% translate "Lower thirds" %}
+                {% translate "Lower Thirds" %}
             </legend>
             {{ form.broadcast_tools_lower_thirds_no_talk_info.as_field_group }}
             {{ form.broadcast_tools_lower_thirds_info_string.as_field_group }}
@@ -60,14 +60,14 @@
         </fieldset>
         <fieldset>
             <legend>
-                {% translate "Room info" %}
+                {% translate "Room Info" %}
             </legend>
             {{ form.broadcast_tools_room_info_lower_content.as_field_group }}
             {{ form.broadcast_tools_room_info_show_next_talk.as_field_group }}
         </fieldset>
         <fieldset>
             <legend>
-                {% translate "PDF export" %}
+                {% translate "PDF Export" %}
             </legend>
             {{ form.broadcast_tools_pdf_show_internal_notes.as_field_group }}
             {{ form.broadcast_tools_pdf_ignore_do_not_record.as_field_group }}