cwtv
/
portier
3
0
Fork 0
Code Issues 8 Pull Requests Packages Projects Releases Activity

little cosmetics and more translations

This commit is contained in:
Jan Koppe 2020-05-02 00:10:36 +02:00
parent 0400e85f89
commit 9cc2e13b2c
Signed by: thunfisch
GPG Key ID: BE935B0735A2129B
16 changed files with 173 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/apps.py
View File

@ -1,5 +1,6 @@
from django.apps import AppConfig from django.apps import AppConfig
class CoreConfig(AppConfig): class CoreConfig(AppConfig):
name = 'core' name = 'core'

152
locale/de/LC_MESSAGES/django.po
View File

@ -1,17 +1,16 @@
# SOME DESCRIPTIVE TITLE. # Copyright (C) Chaoswest TV
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package. # This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # Jan Koppe <post@jankoppe.de>, 2020.
# #
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: portier 0.6.0\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-05-01 17:01+0000\n" "POT-Creation-Date: 2020-05-01 22:10+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: Jan Koppe <post@jankoppe.de>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: German <post@chaoswest.tv>\n"
"Language: \n" "Language: \n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
@ -28,31 +27,31 @@ msgstr "Englisch"
#: restream/models.py:11 #: restream/models.py:11
msgid "restreamconfig_stream_help" msgid "restreamconfig_stream_help"
msgstr "" msgstr "Stream der als Quelle für die Weiterleitung verwendet wird"
#: restream/models.py:12 #: restream/models.py:12
msgid "restreamconfig_target_help" msgid "restreamconfig_target_help"
msgstr "" msgstr "RTMP Ziel URL an die der Stream weitergeleitet wird"
#: restream/models.py:13 #: restream/models.py:13
msgid "restreamconfig_name_help" msgid "restreamconfig_name_help"
msgstr "" msgstr "Name für diese Restream Konfiguration"
#: restream/models.py:14 #: restream/models.py:14
msgid "restreamconfig_activate_help" msgid "restreamconfig_activate_help"
msgstr "" msgstr "Nur aktive Konfigurationen werden bei eingehenden Streams ausgeführt"
#: restream/models.py:17 #: restream/models.py:17
msgid "restreamconfig_verbose_name" msgid "restreamconfig_verbose_name"
msgstr "" msgstr "Restream Konfiguration"
#: restream/models.py:18 #: restream/models.py:18
msgid "restreamconfig_verbose_name_plural" msgid "restreamconfig_verbose_name_plural"
msgstr "" msgstr "Restream Konfigurationen"
#: restream/models.py:21 #: restream/models.py:21
msgid "restreamconfig_class_name" msgid "restreamconfig_class_name"
msgstr "" msgstr "Restream Konfiguration"
#: restream/templates/restream/restreamconfig_confirm_delete.html:6 #: restream/templates/restream/restreamconfig_confirm_delete.html:6
#: rtmp/templates/rtmp/stream_confirm_delete.html:6 #: rtmp/templates/rtmp/stream_confirm_delete.html:6
@ -74,7 +73,7 @@ msgstr "Löschen"
#: restream/templates/restream/restreamconfig_detail.html:12 #: restream/templates/restream/restreamconfig_detail.html:12
msgid "restreamconfig_configuration_details_header" msgid "restreamconfig_configuration_details_header"
msgstr "" msgstr "Restream Konfiguration Details"
#: restream/templates/restream/restreamconfig_detail.html:17 #: restream/templates/restream/restreamconfig_detail.html:17
#: rtmp/templates/rtmp/stream_detail.html:17 #: rtmp/templates/rtmp/stream_detail.html:17
@ -82,9 +81,9 @@ msgid "change"
msgstr "Ändern" msgstr "Ändern"
#: restream/templates/restream/restreamconfig_detail.html:28 #: restream/templates/restream/restreamconfig_detail.html:28
#: restream/templates/restream/restreamconfig_list.html:18 #: restream/templates/restream/restreamconfig_list.html:25
#: rtmp/templates/rtmp/stream_detail.html:28 #: rtmp/templates/rtmp/stream_detail.html:28
#: rtmp/templates/rtmp/stream_list.html:18 #: rtmp/templates/rtmp/stream_list.html:24
msgid "name" msgid "name"
msgstr "Name" msgstr "Name"
@ -92,7 +91,12 @@ msgstr "Name"
msgid "stream" msgid "stream"
msgstr "Stream" msgstr "Stream"
#: restream/templates/restream/restreamconfig_detail.html:35 #: restream/templates/restream/restreamconfig_detail.html:32
#: restream/templates/restream/restreamconfig_list.html:26
msgid "active"
msgstr "Aktiv"
#: restream/templates/restream/restreamconfig_detail.html:43
msgid "configured_target_url" msgid "configured_target_url"
msgstr "Konfigurierte Ziel-URL" msgstr "Konfigurierte Ziel-URL"
@ -104,35 +108,42 @@ msgstr "Neue Restream Konfiguration erstellen"
#: restream/templates/restream/restreamconfig_update_form.html:14 #: restream/templates/restream/restreamconfig_update_form.html:14
#: rtmp/templates/rtmp/stream_form.html:14 #: rtmp/templates/rtmp/stream_form.html:14
#: rtmp/templates/rtmp/stream_update_form.html:14 #: rtmp/templates/rtmp/stream_update_form.html:14
#: templates/registration/password_change_form.html:13 #: templates/registration/password_change_form.html:14
#: templates/registration/password_reset_form.html:13 #: templates/registration/password_reset_form.html:14
msgid "submit" msgid "submit"
msgstr "Abschicken" msgstr "Abschicken"
#: restream/templates/restream/restreamconfig_form.html:21 #: restream/templates/restream/restreamconfig_form.html:21
msgid "create_new_restreamconfig_configuration_text_html" #: restream/templates/restream/restreamconfig_update_form.html:21
msgid "restreamconfig_configuration_text_html"
msgstr "" msgstr ""
"<p>Eine Restream Konfiguration erlaubt es dir eingehende Streams in das "
"System unverändert an externe System weiterzuleiten.</p><p>Die Restream "
"Konfiguration benötigt einen vorher konfigurierten Quell-Stream und ein "
"Ziel, dass du über eine RTMP URL frei definieren kannst. Die RTMP URL sollte "
"zum Beispiel so ausschauen: <code>rtmp://servername/app/streamkey</code></"
"p><p>Du kannst natürlich mehrere Restream Konfigurationen auf einen "
"einzelnen Quell-Stream einrichten. Das erlaubt es dir von deinem Encoder nur "
"einmal einen Stream zu senden, diesen aber automatisch an mehrere Platformen "
"weiterzuleiten.</p><p>Nur Restream Konfigurationen die auf Aktiv geschaltet "
"sind werden bei einem neu eingehenden Stream ausgeführt!</p>"
#: restream/templates/restream/restreamconfig_list.html:8 #: restream/templates/restream/restreamconfig_list.html:11
msgid "restreamconfig_configuration_header" msgid "restreamconfig_configuration_header"
msgstr "Restream Konfiguration" msgstr "Restream Konfiguration"
#: restream/templates/restream/restreamconfig_list.html:12 #: restream/templates/restream/restreamconfig_list.html:16
#: rtmp/templates/rtmp/stream_list.html:12 #: rtmp/templates/rtmp/stream_list.html:15
msgid "create" msgid "create"
msgstr "Erstellen" msgstr "Erstellen"
#: restream/templates/restream/restreamconfig_list.html:19 #: restream/templates/restream/restreamconfig_list.html:27
msgid "active" #: rtmp/templates/rtmp/stream_list.html:26
msgstr "Aktiv"
#: restream/templates/restream/restreamconfig_list.html:20
#: rtmp/templates/rtmp/stream_list.html:20
msgid "actions" msgid "actions"
msgstr "Aktionen" msgstr "Aktionen"
#: restream/templates/restream/restreamconfig_list.html:38 #: restream/templates/restream/restreamconfig_list.html:44
#: rtmp/templates/rtmp/stream_list.html:38 #: rtmp/templates/rtmp/stream_list.html:43
msgid "details" msgid "details"
msgstr "Details" msgstr "Details"
@ -140,10 +151,6 @@ msgstr "Details"
msgid "update_restreamconfig_configuration_header" msgid "update_restreamconfig_configuration_header"
msgstr "Restream Konfiguration anpassen" msgstr "Restream Konfiguration anpassen"
#: restream/templates/restream/restreamconfig_update_form.html:21
msgid "update_restreamconfig_configuration_text_html"
msgstr ""
#: rtmp/models.py:13 #: rtmp/models.py:13
msgid "rtmp_application_name" msgid "rtmp_application_name"
msgstr "RTMP Application Name" msgstr "RTMP Application Name"
@ -200,83 +207,79 @@ msgid "application"
msgstr "Application" msgstr "Application"
#: rtmp/templates/rtmp/stream_detail.html:33 #: rtmp/templates/rtmp/stream_detail.html:33
msgid "stream_configuration_do_not_share_warning"
msgstr "Achtung! Gebe diese Stream ID niemals weiter."
#: rtmp/templates/rtmp/stream_detail.html:36
msgid "how_to_configure_your_encoder_header" msgid "how_to_configure_your_encoder_header"
msgstr "Wie du deinen Encoder konfigurierst" msgstr "Wie du deinen Encoder konfigurierst"
#: rtmp/templates/rtmp/stream_detail.html:38 #: rtmp/templates/rtmp/stream_detail.html:35
msgid "set_this_stream_server_in_encoder" msgid "set_this_stream_server_in_encoder"
msgstr "Stelle diesen Stream Server in deinem Encoder ein" msgstr "Stelle diesen Stream Server in deinem Encoder ein"
#: rtmp/templates/rtmp/stream_detail.html:40 #: rtmp/templates/rtmp/stream_detail.html:37
msgid "set_this_stream_id_in_encoder" msgid "set_this_stream_id_in_encoder"
msgstr "Stelle diese Stream ID in deinem Encoder ein" msgstr "Stelle diese Stream ID in deinem Encoder ein"
#: rtmp/templates/rtmp/stream_detail.html:48 #: rtmp/templates/rtmp/stream_detail.html:46
msgid "you_may_need_to_use_this_full_url_instead" #: rtmp/templates/rtmp/stream_form.html:21
msgstr "Vielleicht musst du diese volle URL verwenden" #: rtmp/templates/rtmp/stream_update_form.html:21
msgid "stream_configuration_text_html"
msgstr ""
"<p>Eine Stream Konfiguration erlaubt es dir einen Stream in das System zu "
"schicken</p><p>Nur Streams die zu einer vorher erstellten Konfiguration "
"zugeordnet werden können werden vom System angenommen.</p><p>Der Name dient "
"dazu den Stream beim Erstellen von weiteren Konfigurationen leicht zu "
"identifizieren. Die tatsächliche Stream ID wird dir nach dem erstellen "
"angezeigt. <strong>Halte die Stream ID auf jeden Fall geheim.</strong></p>"
#: rtmp/templates/rtmp/stream_form.html:5 #: rtmp/templates/rtmp/stream_form.html:5
msgid "create_new_stream_configuration_header" msgid "create_new_stream_configuration_header"
msgstr "Neue Stream Konfiguration erstellen" msgstr "Neue Stream Konfiguration erstellen"
#: rtmp/templates/rtmp/stream_form.html:21 #: rtmp/templates/rtmp/stream_list.html:10
msgid "create_new_stream_configuration_text_html"
msgstr ""
#: rtmp/templates/rtmp/stream_list.html:8
msgid "stream_configuration_header" msgid "stream_configuration_header"
msgstr "Stream Konfiguration" msgstr "Stream Konfiguration"
#: rtmp/templates/rtmp/stream_list.html:19 #: rtmp/templates/rtmp/stream_list.html:25
msgid "receiving" msgid "receiving"
msgstr "Empfängt" msgstr "Empfange"
#: rtmp/templates/rtmp/stream_update_form.html:5 #: rtmp/templates/rtmp/stream_update_form.html:5
msgid "update_stream_configuration_header" msgid "update_stream_configuration_header"
msgstr "Stream Konfiguration anpassen" msgstr "Stream Konfiguration anpassen"
#: rtmp/templates/rtmp/stream_update_form.html:21 #: templates/base.html:40
msgid "update_stream_configuration_text_html"
msgstr ""
#: templates/base.html:36
msgid "navbar_streaming" msgid "navbar_streaming"
msgstr "Streaming" msgstr "Streaming"
#: templates/base.html:39 #: templates/base.html:43
msgid "navbar_configuration_streams" msgid "navbar_configuration_streams"
msgstr "Streams" msgstr "Streams"
#: templates/base.html:40 #: templates/base.html:44
msgid "navbar_configuration_restreams" msgid "navbar_configuration_restreams"
msgstr "Restreams" msgstr "Restreams"
#: templates/base.html:47 #: templates/base.html:51
#, python-format #, python-format
msgid "hello_%(username)s" msgid "hello_%(username)s"
msgstr "Hallo, %(username)s!" msgstr "Hallo, %(username)s!"
#: templates/base.html:50 #: templates/base.html:54
msgid "navbar_account_password_change" msgid "navbar_account_password_change"
msgstr "Passwort ändern" msgstr "Passwort ändern"
#: templates/base.html:51 #: templates/base.html:55
msgid "navbar_account_logout" msgid "navbar_account_logout"
msgstr "Abmelden" msgstr "Abmelden"
#: templates/base.html:55 #: templates/base.html:59
msgid "navbar_login" msgid "navbar_login"
msgstr "Anmelden" msgstr "Anmelden"
#: templates/registration/login.html:5 templates/registration/login.html:13 #: templates/registration/login.html:5 templates/registration/login.html:14
msgid "login" msgid "login"
msgstr "Anmelden" msgstr "Anmelden"
#: templates/registration/login.html:18 #: templates/registration/login.html:19
msgid "forgot_password_q" msgid "forgot_password_q"
msgstr "Passwort vergessen?" msgstr "Passwort vergessen?"
@ -284,22 +287,23 @@ msgstr "Passwort vergessen?"
msgid "password_change_successful" msgid "password_change_successful"
msgstr "Passwort erfolgreich geändert" msgstr "Passwort erfolgreich geändert"
#: templates/registration/password_change_done.html:6 #: templates/registration/password_change_done.html:7
msgid "password_change_successful_text" msgid "password_change_successful_text"
msgstr "" msgstr ""
"Das Passwort wurde erfolgreich geändert. Du kannst dich ab jetzt mit dem "
#: templates/registration/password_change_done.html:7 "neuen Passwort anmelden."
msgid "take_me_to_safety"
msgstr "Bring mich in Sicherheit!"
#: templates/registration/password_change_form.html:5 #: templates/registration/password_change_form.html:5
msgid "change_password" msgid "change_password"
msgstr "Passwort ändern" msgstr "Passwort ändern"
#: templates/registration/password_change_form.html:20 #: templates/registration/password_reset_form.html:5
msgid "change_password_text_html" msgid "reset_password"
msgstr "" msgstr "Passwort vergessen"
#: templates/registration/password_reset_form.html:20 #: templates/registration/password_reset_form.html:21
msgid "reset_password_text_html" msgid "reset_password_text_html"
msgstr "" msgstr ""
"Du hast dein Passwort vergessen? Kein Problem. Gib hier die E-mail Adresse "
"deines Nutzerkonto an, und wir schicken dir einen Link zu mit dem du ein "
"neues Passwort setzen kannst."

141
locale/en/LC_MESSAGES/django.po
View File

@ -1,17 +1,16 @@
# SOME DESCRIPTIVE TITLE. # Copyright (C) Chaoswest TV
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package. # This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # Jan Koppe <post@jankoppe.de>, 2020.
# #
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: portier 0.6.0\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-05-01 17:01+0000\n" "POT-Creation-Date: 2020-05-01 22:10+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: Jan Koppe <post@jankoppe.de>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: english <post@chaoswest.tv>\n"
"Language: \n" "Language: \n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
@ -28,19 +27,19 @@ msgstr "English"
#: restream/models.py:11 #: restream/models.py:11
msgid "restreamconfig_stream_help" msgid "restreamconfig_stream_help"
msgstr "" msgstr "Stream that's being used as source for the restreaming"
#: restream/models.py:12 #: restream/models.py:12
msgid "restreamconfig_target_help" msgid "restreamconfig_target_help"
msgstr "" msgstr "RTMP target url that the stream is being restreamed to"
#: restream/models.py:13 #: restream/models.py:13
msgid "restreamconfig_name_help" msgid "restreamconfig_name_help"
msgstr "" msgstr "Name for this restream configuration"
#: restream/models.py:14 #: restream/models.py:14
msgid "restreamconfig_activate_help" msgid "restreamconfig_activate_help"
msgstr "" msgstr "Only active configurations will be executed for incoming streams"
#: restream/models.py:17 #: restream/models.py:17
msgid "restreamconfig_verbose_name" msgid "restreamconfig_verbose_name"
@ -81,9 +80,9 @@ msgid "change"
msgstr "Change" msgstr "Change"
#: restream/templates/restream/restreamconfig_detail.html:28 #: restream/templates/restream/restreamconfig_detail.html:28
#: restream/templates/restream/restreamconfig_list.html:18 #: restream/templates/restream/restreamconfig_list.html:25
#: rtmp/templates/rtmp/stream_detail.html:28 #: rtmp/templates/rtmp/stream_detail.html:28
#: rtmp/templates/rtmp/stream_list.html:18 #: rtmp/templates/rtmp/stream_list.html:24
msgid "name" msgid "name"
msgstr "Name" msgstr "Name"
@ -91,7 +90,12 @@ msgstr "Name"
msgid "stream" msgid "stream"
msgstr "Stream" msgstr "Stream"
#: restream/templates/restream/restreamconfig_detail.html:35 #: restream/templates/restream/restreamconfig_detail.html:32
#: restream/templates/restream/restreamconfig_list.html:26
msgid "active"
msgstr "Active"
#: restream/templates/restream/restreamconfig_detail.html:43
msgid "configured_target_url" msgid "configured_target_url"
msgstr "Configured target URL" msgstr "Configured target URL"
@ -103,35 +107,41 @@ msgstr "Create new restream configuration"
#: restream/templates/restream/restreamconfig_update_form.html:14 #: restream/templates/restream/restreamconfig_update_form.html:14
#: rtmp/templates/rtmp/stream_form.html:14 #: rtmp/templates/rtmp/stream_form.html:14
#: rtmp/templates/rtmp/stream_update_form.html:14 #: rtmp/templates/rtmp/stream_update_form.html:14
#: templates/registration/password_change_form.html:13 #: templates/registration/password_change_form.html:14
#: templates/registration/password_reset_form.html:13 #: templates/registration/password_reset_form.html:14
msgid "submit" msgid "submit"
msgstr "Submit" msgstr "Submit"
#: restream/templates/restream/restreamconfig_form.html:21 #: restream/templates/restream/restreamconfig_form.html:21
msgid "create_new_restreamconfig_configuration_text_html" #: restream/templates/restream/restreamconfig_update_form.html:21
msgid "restreamconfig_configuration_text_html"
msgstr "" msgstr ""
"<p>A restream configuration allows you to forward incoming streamswithout "
"further processing to external systems.<p><p>The restream configuration "
"needs a previously configured source stream and a target RTMP URL which you "
"can freely chose. The target RTMP URL should look e.g. like this: "
"<code>rtmp://servername/app/streamkey</code></p>You can of course create "
"multiple restream configurations with the same source stream. This allows "
"you to only send one stream from your encoder, but distribute this to "
"multiple platforms.</p><p>Only restream configurations that are marked "
"active will be executed for an incoming stream!</p>"
#: restream/templates/restream/restreamconfig_list.html:8 #: restream/templates/restream/restreamconfig_list.html:11
msgid "restreamconfig_configuration_header" msgid "restreamconfig_configuration_header"
msgstr "Restream configuration" msgstr "Restream configuration"
#: restream/templates/restream/restreamconfig_list.html:12 #: restream/templates/restream/restreamconfig_list.html:16
#: rtmp/templates/rtmp/stream_list.html:12 #: rtmp/templates/rtmp/stream_list.html:15
msgid "create" msgid "create"
msgstr "Create" msgstr "Create"
#: restream/templates/restream/restreamconfig_list.html:19 #: restream/templates/restream/restreamconfig_list.html:27
msgid "active" #: rtmp/templates/rtmp/stream_list.html:26
msgstr "Active"
#: restream/templates/restream/restreamconfig_list.html:20
#: rtmp/templates/rtmp/stream_list.html:20
msgid "actions" msgid "actions"
msgstr "Actions" msgstr "Actions"
#: restream/templates/restream/restreamconfig_list.html:38 #: restream/templates/restream/restreamconfig_list.html:44
#: rtmp/templates/rtmp/stream_list.html:38 #: rtmp/templates/rtmp/stream_list.html:43
msgid "details" msgid "details"
msgstr "Details" msgstr "Details"
@ -139,10 +149,6 @@ msgstr "Details"
msgid "update_restreamconfig_configuration_header" msgid "update_restreamconfig_configuration_header"
msgstr "Update restream configuration" msgstr "Update restream configuration"
#: restream/templates/restream/restreamconfig_update_form.html:21
msgid "update_restreamconfig_configuration_text_html"
msgstr ""
#: rtmp/models.py:13 #: rtmp/models.py:13
msgid "rtmp_application_name" msgid "rtmp_application_name"
msgstr "RTMP application name" msgstr "RTMP application name"
@ -199,38 +205,38 @@ msgid "application"
msgstr "Application" msgstr "Application"
#: rtmp/templates/rtmp/stream_detail.html:33 #: rtmp/templates/rtmp/stream_detail.html:33
msgid "stream_configuration_do_not_share_warning"
msgstr "Attention! Do not share this stream ID with anyone."
#: rtmp/templates/rtmp/stream_detail.html:36
msgid "how_to_configure_your_encoder_header" msgid "how_to_configure_your_encoder_header"
msgstr "How to configure your encoder" msgstr "How to configure your encoder"
#: rtmp/templates/rtmp/stream_detail.html:38 #: rtmp/templates/rtmp/stream_detail.html:35
msgid "set_this_stream_server_in_encoder" msgid "set_this_stream_server_in_encoder"
msgstr "Set this stream server in your encoder" msgstr "Set this stream server in your encoder"
#: rtmp/templates/rtmp/stream_detail.html:40 #: rtmp/templates/rtmp/stream_detail.html:37
msgid "set_this_stream_id_in_encoder" msgid "set_this_stream_id_in_encoder"
msgstr "Set this stream ID in your encoder" msgstr "Set this stream ID in your encoder"
#: rtmp/templates/rtmp/stream_detail.html:48 #: rtmp/templates/rtmp/stream_detail.html:46
msgid "you_may_need_to_use_this_full_url_instead" #: rtmp/templates/rtmp/stream_form.html:21
msgstr "You may need to use this full URL instead" #: rtmp/templates/rtmp/stream_update_form.html:21
msgid "stream_configuration_text_html"
msgstr ""
"<p>A stream configuration allows you to send a stream into the system.</"
"p><p>Only streams that can be matched to a previously configured stream will "
"be accepted by the system.</p><p>The only purpose of the name is to make "
"this stream easily identifiable when creating further configurations.The "
"actual stream ID will be shown to you after creation. <strong>Always keep "
"your stream ID secret.</strong></p>"
#: rtmp/templates/rtmp/stream_form.html:5 #: rtmp/templates/rtmp/stream_form.html:5
msgid "create_new_stream_configuration_header" msgid "create_new_stream_configuration_header"
msgstr "Create new stream configuration" msgstr "Create new stream configuration"
#: rtmp/templates/rtmp/stream_form.html:21 #: rtmp/templates/rtmp/stream_list.html:10
msgid "create_new_stream_configuration_text_html"
msgstr ""
#: rtmp/templates/rtmp/stream_list.html:8
msgid "stream_configuration_header" msgid "stream_configuration_header"
msgstr "Stream configuration" msgstr "Stream configuration"
#: rtmp/templates/rtmp/stream_list.html:19 #: rtmp/templates/rtmp/stream_list.html:25
msgid "receiving" msgid "receiving"
msgstr "Receiving" msgstr "Receiving"
@ -238,44 +244,40 @@ msgstr "Receiving"
msgid "update_stream_configuration_header" msgid "update_stream_configuration_header"
msgstr "Change stream configuration" msgstr "Change stream configuration"
#: rtmp/templates/rtmp/stream_update_form.html:21 #: templates/base.html:40
msgid "update_stream_configuration_text_html"
msgstr ""
#: templates/base.html:36
msgid "navbar_streaming" msgid "navbar_streaming"
msgstr "Streaming" msgstr "Streaming"
#: templates/base.html:39 #: templates/base.html:43
msgid "navbar_configuration_streams" msgid "navbar_configuration_streams"
msgstr "Streams" msgstr "Streams"
#: templates/base.html:40 #: templates/base.html:44
msgid "navbar_configuration_restreams" msgid "navbar_configuration_restreams"
msgstr "Restreams" msgstr "Restreams"
#: templates/base.html:47 #: templates/base.html:51
#, python-format #, python-format
msgid "hello_%(username)s" msgid "hello_%(username)s"
msgstr "Hello, %(username)s!" msgstr "Hello, %(username)s!"
#: templates/base.html:50 #: templates/base.html:54
msgid "navbar_account_password_change" msgid "navbar_account_password_change"
msgstr "Change password" msgstr "Change password"
#: templates/base.html:51 #: templates/base.html:55
msgid "navbar_account_logout" msgid "navbar_account_logout"
msgstr "Logout" msgstr "Logout"
#: templates/base.html:55 #: templates/base.html:59
msgid "navbar_login" msgid "navbar_login"
msgstr "Login" msgstr "Login"
#: templates/registration/login.html:5 templates/registration/login.html:13 #: templates/registration/login.html:5 templates/registration/login.html:14
msgid "login" msgid "login"
msgstr "Login" msgstr "Login"
#: templates/registration/login.html:18 #: templates/registration/login.html:19
msgid "forgot_password_q" msgid "forgot_password_q"
msgstr "Did you forget your password?" msgstr "Did you forget your password?"
@ -283,22 +285,23 @@ msgstr "Did you forget your password?"
msgid "password_change_successful" msgid "password_change_successful"
msgstr "Password change was successful" msgstr "Password change was successful"
#: templates/registration/password_change_done.html:6 #: templates/registration/password_change_done.html:7
msgid "password_change_successful_text" msgid "password_change_successful_text"
msgstr "" msgstr ""
"The password has succesfully been changed. From now on you can login with "
#: templates/registration/password_change_done.html:7 "your new password."
msgid "take_me_to_safety"
msgstr "Help! Take me back to safety!"
#: templates/registration/password_change_form.html:5 #: templates/registration/password_change_form.html:5
msgid "change_password" msgid "change_password"
msgstr "Change password" msgstr "Change password"
#: templates/registration/password_change_form.html:20 #: templates/registration/password_reset_form.html:5
msgid "change_password_text_html" msgid "reset_password"
msgstr "" msgstr "Password forgotten?"
#: templates/registration/password_reset_form.html:20 #: templates/registration/password_reset_form.html:21
msgid "reset_password_text_html" msgid "reset_password_text_html"
msgstr "" msgstr ""
"Did you forget your password? No worries. Enter the e-mail address of your "
"user account here. We will send an e-mail with a link to you, which you can "
"use to reset the password."

2
portier/common/handlers.py
View File

@ -2,7 +2,7 @@ from django.contrib.contenttypes.models import ContentType
from django.db.models import Q from django.db.models import Q
from guardian.models import UserObjectPermission from guardian.models import UserObjectPermission
from guardian.models import GroupObjectPermission from guardian.models import GroupObjectPermission
from django.contrib.auth.models import User, Group from django.contrib.auth.models import Group
from django.conf import settings from django.conf import settings

10
restream/templates/restream/restreamconfig_detail.html
View File

@ -29,12 +29,20 @@
<dd class="col-sm-9">{{ object.name }}</dd> <dd class="col-sm-9">{{ object.name }}</dd>
<dt class="col-sm-3">{% trans "stream" %}</dt> <dt class="col-sm-3">{% trans "stream" %}</dt>
<dd class="col-sm-9"><a href="{% url 'rtmp:stream_detail' pk=object.stream.pk %}">{{ object.stream.name }}</a></dd> <dd class="col-sm-9"><a href="{% url 'rtmp:stream_detail' pk=object.stream.pk %}">{{ object.stream.name }}</a></dd>
<dt class="col-sm-3">{% trans "active" %}</dt>
<dd class="col-sm-9">
{% if object.active %}
<span class="text-success">{% fa5_icon 'check-circle' %}</span>
{% else %}
<span class="text-danger">{% fa5_icon 'times-circle' %}</span>
{% endif %}
</dd>
</dl> </dl>
</div> </div>
<div class="col-sm"> <div class="col-sm">
<p>{% trans "configured_target_url" %}</p> <p>{% trans "configured_target_url" %}</p>
<div class="input-group mb-4" id="show_hide_target_url"> <div class="input-group mb-4" id="show_hide_target_url">
<input class="form-control" type="password" value="{{ object.target }}"> <input readonly class="form-control" type="password" value="{{ object.target }}">
<div class="input-group-append"> <div class="input-group-append">
<a href="" class="btn btn-outline-secondary"><i class="fa fa-eye-slash" aria-hidden="true"></i></a> <a href="" class="btn btn-outline-secondary"><i class="fa fa-eye-slash" aria-hidden="true"></i></a>
</div> </div>

2
restream/templates/restream/restreamconfig_form.html
View File

@ -18,7 +18,7 @@
</form> </form>
</div> </div>
<div class="col-sm"> <div class="col-sm">
{% trans "create_new_restreamconfig_configuration_text_html" %} {% trans "restreamconfig_configuration_text_html" %}
</div> </div>
</div> </div>
{% endblock %} {% endblock %}

2
restream/templates/restream/restreamconfig_list.html
View File

@ -41,12 +41,10 @@
{% endif %} {% endif %}
</td> </td>
<td align="right"> <td align="right">
<div class="btn-group" role="group">
<a href="{% url 'restream:restreamconfig_detail' pk=object.pk %}" type="button" class="btn btn-sm btn-outline-primary">{% trans "details" %}</a> <a href="{% url 'restream:restreamconfig_detail' pk=object.pk %}" type="button" class="btn btn-sm btn-outline-primary">{% trans "details" %}</a>
{% if "delete_restreamconfig" in obj_perms %} {% if "delete_restreamconfig" in obj_perms %}
<a href="{% url 'restream:restreamconfig_delete' pk=object.pk %}" type="button" class="btn btn-sm btn-outline-danger">{% fa5_icon 'trash' %}</a> <a href="{% url 'restream:restreamconfig_delete' pk=object.pk %}" type="button" class="btn btn-sm btn-outline-danger">{% fa5_icon 'trash' %}</a>
{% endif %} {% endif %}
</div>
</td> </td>
</tr> </tr>
{% endif %} {% endif %}

2
restream/templates/restream/restreamconfig_update_form.html
View File

@ -18,7 +18,7 @@
</form> </form>
</div> </div>
<div class="col-sm"> <div class="col-sm">
{% trans "update_restreamconfig_configuration_text_html" %} {% trans "restreamconfig_configuration_text_html" %}
</div> </div>
</div> </div>
{% endblock %} {% endblock %}

32
rtmp/templates/rtmp/stream_detail.html
View File

@ -30,29 +30,21 @@
<dt class="col-sm-3">{% trans "application" %}</dt> <dt class="col-sm-3">{% trans "application" %}</dt>
<dd class="col-sm-9">{{ object.application }}</dd> <dd class="col-sm-9">{{ object.application }}</dd>
</dl> </dl>
<p>{% trans "stream_configuration_do_not_share_warning" %}</p>
</div>
<div class="col-sm">
<h6>{% trans "how_to_configure_your_encoder_header" %}</h6> <h6>{% trans "how_to_configure_your_encoder_header" %}</h6>
<hr class="my-4"> <hr class="my-4">
<p>{% trans "set_this_stream_server_in_encoder" %}</p> <p>{% trans "set_this_stream_server_in_encoder" %}</p>
<code>rtmp://TODO TODO SERVER BASE URL/{{ object.application }}/</code> <p class="mb-4"><code>rtmp://TODO TODO SERVER BASE URL/{{ object.application }}/</code></p>
<p>{% trans "set_this_stream_id_in_encoder" %}</p> <p>{% trans "set_this_stream_id_in_encoder" %}</p>
<div class="input-group mb-4" id="show_hide_stream_key"> <div class="input-group mb-4" id="show_hide_stream_key">
<input class="form-control" type="password" value="{{ object.stream }}"> <input readonly class="form-control" type="password" value="{{ object.stream }}">
<div class="input-group-append">
<a href="" class="btn btn-outline-secondary"><i class="fa fa-eye-slash" aria-hidden="true"></i></a>
</div>
</div>
<hr class="my-4">
<p>{% trans "you_may_need_to_use_this_full_url_instead" %}</p>
<div class="input-group mb-4" id="show_hide_stream_url">
<input class="form-control" type="password" value="rtmp://TODO TODO TODO SERVER BASE URL/{{ object.stream }}">
<div class="input-group-append"> <div class="input-group-append">
<a href="" class="btn btn-outline-secondary"><i class="fa fa-eye-slash" aria-hidden="true"></i></a> <a href="" class="btn btn-outline-secondary"><i class="fa fa-eye-slash" aria-hidden="true"></i></a>
</div> </div>
</div> </div>
</div> </div>
<div class="col-sm">
{% trans "stream_configuration_text_html" %}
</div>
</div> </div>
<script> <script>
$(function () { $(function () {
@ -72,19 +64,5 @@
} }
}); });
}); });
$(function() {
$("#show_hide_stream_url a").on('click', function(event) {
event.preventDefault();
if ($('#show_hide_stream_url input').attr('type') == 'text') {
$('#show_hide_stream_url input').attr('type', 'password');
$('#show_hide_stream_url i').addClass('fa-eye-slash');
$('#show_hide_stream_url i').removeClass('fa-eye');
} else if ($('#show_hide_stream_url input').attr('type') == 'password') {
$('#show_hide_stream_url input').attr('type', 'text');
$('#show_hide_stream_url i').removeClass('fa-eye-slash');
$('#show_hide_stream_url i').addClass('fa-eye');
}
});
});
</script> </script>
{% endblock %} {% endblock %}

2
rtmp/templates/rtmp/stream_form.html
View File

@ -18,7 +18,7 @@
</form> </form>
</div> </div>
<div class="col-sm"> <div class="col-sm">
{% trans "create_new_stream_configuration_text_html" %} {% trans "stream_configuration_text_html" %}
</div> </div>
</div> </div>
{% endblock %} {% endblock %}

2
rtmp/templates/rtmp/stream_list.html
View File

@ -40,12 +40,10 @@
{% endif %} {% endif %}
</td> </td>
<td align="right"> <td align="right">
<div class="btn-group" role="group">
<a href="{% url 'rtmp:stream_detail' pk=object.pk %}" type="button" class="btn btn-sm btn-outline-primary ">{% trans "details" %}</a> <a href="{% url 'rtmp:stream_detail' pk=object.pk %}" type="button" class="btn btn-sm btn-outline-primary ">{% trans "details" %}</a>
{% if "delete_stream" in obj_perms %} {% if "delete_stream" in obj_perms %}
<a href="{% url 'rtmp:stream_delete' pk=object.pk %}" type="button" class="btn btn-sm btn-outline-danger">{% fa5_icon 'trash' %}</a> <a href="{% url 'rtmp:stream_delete' pk=object.pk %}" type="button" class="btn btn-sm btn-outline-danger">{% fa5_icon 'trash' %}</a>
{% endif %} {% endif %}
</div>
</td> </td>
</tr> </tr>
{% endif %} {% endif %}

2
rtmp/templates/rtmp/stream_update_form.html
View File

@ -18,7 +18,7 @@
</form> </form>
</div> </div>
<div class="col-sm"> <div class="col-sm">
{% trans "update_stream_configuration_text_html" %} {% trans "stream_configuration_text_html" %}
</div> </div>
</div> </div>
{% endblock %} {% endblock %}

2
templates/base.html
View File

@ -22,6 +22,7 @@
<body> <body>
<header> <header>
<nav class="navbar navbar-expand-md navbar-light bg-light mb-4 border boder-bottom-0"> <nav class="navbar navbar-expand-md navbar-light bg-light mb-4 border boder-bottom-0">
<div class="container">
<span class="navbar-brand mb-0 h1"> <span class="navbar-brand mb-0 h1">
<a href="{% url 'index' %}">portier</a> <a href="{% url 'index' %}">portier</a>
</span> </span>
@ -78,6 +79,7 @@
</li> </li>
</ul> </ul>
</div> </div>
</div>
</nav> </nav>
</header> </header>
<main class="container" roles="main"> <main class="container" roles="main">

1
templates/registration/password_change_done.html
View File

@ -5,5 +5,4 @@
<h6>{% trans "password_change_successful" %}</h6> <h6>{% trans "password_change_successful" %}</h6>
<hr class="my-4"> <hr class="my-4">
<p>{% trans "password_change_successful_text" %}</p> <p>{% trans "password_change_successful_text" %}</p>
<a class="btn btn-primary btn-lg" href="{% url 'index' %}">{% trans "take_me_to_safety" %}</a>
{% endblock %} {% endblock %}

1
templates/registration/password_change_form.html
View File

@ -18,7 +18,6 @@
</form> </form>
</div> </div>
<div class="col-sm"> <div class="col-sm">
{% trans "change_password_text_html" %}
</div> </div>
</div> </div>
{% endblock %} {% endblock %}

2
templates/registration/password_reset_form.html
View File

@ -2,7 +2,7 @@
{% load i18n %} {% load i18n %}
{% load bootstrap4 %} {% load bootstrap4 %}
{% block 'content' %} {% block 'content' %}
<h6>{% trans "reset_password"}</h6> <h6>{% trans "reset_password" %}</h6>
<hr class="my-4"> <hr class="my-4">
<div class="row"> <div class="row">
<div class="col-sm border-right"> <div class="col-sm border-right">