From: Radek Czajka Date: Tue, 25 Oct 2022 11:58:37 +0000 (+0200) Subject: file page reorg X-Git-Url: https://git.mdrn.pl/audio.git/commitdiff_plain/10ee4271e2cb35c585726a1c306e6c4ef561b257?ds=inline file page reorg --- diff --git a/src/archive/locale/pl/LC_MESSAGES/django.mo b/src/archive/locale/pl/LC_MESSAGES/django.mo index 666b791..dca91ae 100644 Binary files a/src/archive/locale/pl/LC_MESSAGES/django.mo and b/src/archive/locale/pl/LC_MESSAGES/django.mo differ diff --git a/src/archive/locale/pl/LC_MESSAGES/django.po b/src/archive/locale/pl/LC_MESSAGES/django.po index 6fb331d..526f50d 100644 --- a/src/archive/locale/pl/LC_MESSAGES/django.po +++ b/src/archive/locale/pl/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-06-06 00:25+0200\n" -"PO-Revision-Date: 2020-06-06 00:30+0200\n" +"POT-Creation-Date: 2022-10-25 13:56+0200\n" +"PO-Revision-Date: 2022-10-25 13:57+0200\n" "Last-Translator: Radek Czajka \n" "Language-Team: \n" "Language: pl\n" @@ -17,89 +17,97 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -"X-Generator: Poedit 2.2.4\n" +"X-Generator: Poedit 3.0.1\n" -#: constants.py:18 -msgid "Waiting" -msgstr "Czeka" - -#: constants.py:19 +#: archive/constants.py:18 msgid "Queued" msgstr "W kolejce" -#: constants.py:20 +#: archive/constants.py:19 +msgid "Waiting" +msgstr "Czeka" + +#: archive/constants.py:20 msgid "Encoding" msgstr "Konwersja" -#: constants.py:21 +#: archive/constants.py:21 msgid "Tagging" msgstr "Opisywanie" -#: constants.py:22 +#: archive/constants.py:22 msgid "Converting audio" msgstr "Konwersja audio" -#: constants.py:23 +#: archive/constants.py:23 msgid "Converting video" msgstr "Konwersja wideo" -#: constants.py:24 +#: archive/constants.py:24 msgid "Assembling audio" msgstr "Kompletowanie audio" -#: constants.py:25 +#: archive/constants.py:25 msgid "Assembling video" msgstr "Kompletowanie wideo" -#: constants.py:26 +#: archive/constants.py:26 msgid "Joining audio and video" msgstr "Łączenie audio i wideo" -#: constants.py:27 +#: archive/constants.py:27 msgid "Sending" msgstr "Wysyłanie" -#: constants.py:28 +#: archive/constants.py:28 msgid "Setting thumbnail" msgstr "Wysyłanie miniatury" -#: models.py:31 models.py:82 +#: archive/models.py:44 archive/models.py:122 msgid "project" msgstr "projekt" -#: models.py:32 +#: archive/models.py:45 msgid "projects" msgstr "projekty" -#: models.py:63 +#: archive/models.py:76 +msgid "Configuration" +msgstr "Konfiguracja" + +#: archive/models.py:77 +msgid "Configurations" +msgstr "Konfiguracje" + +#: archive/models.py:102 msgid "source file" msgstr "plik źródłowy" -#: models.py:66 +#: archive/models.py:106 msgid "title" msgstr "tytuł" -#: models.py:67 +#: archive/models.py:107 msgid "part name" msgstr "nazwa części" -#: models.py:67 +#: archive/models.py:107 msgid "eg. chapter in a novel" msgstr "np. rozdział w powieści" -#: models.py:69 +#: archive/models.py:109 msgid "index" msgstr "numer" -#: models.py:69 +#: archive/models.py:109 msgid "Ordering of parts of a book." msgstr "Kolejność części w książce" -#: models.py:71 +#: archive/models.py:111 msgid "Volume name for YouTube" msgstr "Nazwa woluminu na YouTube" -#: models.py:75 +#: archive/models.py:115 msgid "" "If set, audiobooks with the save value will be published as single YouTube " "video." @@ -107,241 +115,247 @@ msgstr "" "Jeśli ustawione, audiobooki z tą samą wartością będą opublikowane jako jeden " "film na YouTube." -#: models.py:78 +#: archive/models.py:118 msgid "artist" msgstr "lektor" -#: models.py:79 +#: archive/models.py:119 msgid "conductor" msgstr "reżyser" -#: models.py:80 +#: archive/models.py:120 msgid "encoded by" msgstr "przyg. techn." -#: models.py:81 +#: archive/models.py:121 msgid "date" msgstr "data" -#: models.py:83 +#: archive/models.py:123 msgid "WL catalogue slug of the book." msgstr "Slug książki z katalogu WL." -#: models.py:84 +#: archive/models.py:124 msgid "translator" msgstr "tłumacz" -#: models.py:86 +#: archive/models.py:126 msgid "license" msgstr "licencja" -#: models.py:112 +#: archive/models.py:127 +msgid "secondary license" +msgstr "druga licencja" + +#: archive/models.py:144 msgid "audiobook" msgstr "audiobook" -#: models.py:113 +#: archive/models.py:145 msgid "audiobooks" msgstr "audiobooki" -#: templates/archive/audiobook_list.html:10 templates/archive/base.html:6 +#: archive/templates/archive/audiobook_list.html:11 +#: archive/templates/archive/base.html:6 msgid "Audiobooks" msgstr "Audiobooki" -#: templates/archive/audiobook_list.html:28 templates/archive/book.html:19 +#: archive/templates/archive/audiobook_list.html:37 +#: archive/templates/archive/book.html:19 msgid "Title" msgstr "tytuł" -#: templates/archive/audiobook_list.html:29 +#: archive/templates/archive/audiobook_list.html:38 msgid "YouTube volume" msgstr "wolumin YouTube" -#: templates/archive/base.html:7 templates/archive/file_managed.html:19 +#: archive/templates/archive/base.html:7 msgid "Publishing" msgstr "Publikacja" -#: templates/archive/base.html:8 +#: archive/templates/archive/base.html:8 msgid "New" msgstr "Nowe" -#: templates/archive/base.html:9 +#: archive/templates/archive/base.html:9 msgid "Archive" msgstr "Archiwum" -#: templates/archive/base.html:14 +#: archive/templates/archive/base.html:14 msgid "Projects" msgstr "Projekty" -#: templates/archive/base.html:17 +#: archive/templates/archive/base.html:17 msgid "Logout" msgstr "Wyloguj" -#: templates/archive/base.html:19 templates/registration/login.html:9 +#: archive/templates/archive/base.html:19 +#: archive/templates/registration/login.html:9 msgid "Login" msgstr "Zaloguj" -#: templates/archive/base.html:22 +#: archive/templates/archive/base.html:22 msgid "Administration" msgstr "Administracja" -#: templates/archive/book.html:18 +#: archive/templates/archive/book.html:18 msgid "Index" msgstr "numer" -#: templates/archive/file_managed.html:23 +#: archive/templates/archive/file_managed.html:29 +#: archive/templates/archive/file_new.html:29 +msgid "Commit" +msgstr "Zatwierdź" + +#: archive/templates/archive/file_managed.html:57 msgid "Publishing pending" msgstr "Czeka na publikację" -#: templates/archive/file_managed.html:26 +#: archive/templates/archive/file_managed.html:60 msgid "Cancel publishing" msgstr "Anuluj publikację" -#: templates/archive/file_managed.html:65 -msgid "Publish" -msgstr "Opublikuj" - -#: templates/archive/file_managed.html:74 -msgid "Convert without publishing" -msgstr "Konwertuj bez publikacji" - -#: templates/archive/file_managed.html:82 -msgid "Preview YouTube metadata" -msgstr "Podgląd metadanych dla YouTube" - -#: templates/archive/file_managed.html:87 -msgid "Publish on YouTube" -msgstr "Opublikuj na YouTube" - -#: templates/archive/file_managed.html:94 -msgid "Update YouTube metadata" -msgstr "Aktualizuj metadane na YouTube" - -#: templates/archive/file_managed.html:111 -msgid "MP3 file" -msgstr "Plik MP3" - -#: templates/archive/file_managed.html:115 +#: archive/templates/archive/file_managed.html:81 msgid "Download MP3 file." msgstr "Pobierz plik MP3." -#: templates/archive/file_managed.html:117 -#: templates/archive/file_managed.html:140 -#: templates/archive/file_managed.html:167 +#: archive/templates/archive/file_managed.html:83 +#: archive/templates/archive/file_managed.html:94 +#: archive/templates/archive/file_managed.html:192 msgid "Published:" msgstr "Opublikowano:" -#: templates/archive/file_managed.html:122 -#: templates/archive/file_managed.html:145 -#: templates/archive/file_managed.html:172 +#: archive/templates/archive/file_managed.html:85 +#: archive/templates/archive/file_managed.html:96 msgid "Not published yet." msgstr "Nie opublikowane." -#: templates/archive/file_managed.html:125 +#: archive/templates/archive/file_managed.html:88 msgid "MP3 file hasn't been generated yet." msgstr "Plik MP3 nie został jeszcze wygenerowany." -#: templates/archive/file_managed.html:134 -msgid "Ogg Vorbis file" -msgstr "Plik Ogg Vorbis" - -#: templates/archive/file_managed.html:138 +#: archive/templates/archive/file_managed.html:92 msgid "Download Ogg Vorbis file." msgstr "Pobierz plik Ogg Vorbis." -#: templates/archive/file_managed.html:148 +#: archive/templates/archive/file_managed.html:99 msgid "Ogg Vorbis file hasn't been generated yet." msgstr "Plik Ogg Vorbis nie został jeszcze wygenerowany." -#: templates/archive/file_managed.html:157 -msgid "YouTube" -msgstr "YouTube" +#: archive/templates/archive/file_managed.html:105 +msgid "Publish" +msgstr "Opublikuj" + +#: archive/templates/archive/file_managed.html:114 +msgid "Convert without publishing" +msgstr "Konwertuj bez publikacji" + +#: archive/templates/archive/file_managed.html:160 +msgid "Preview YouTube metadata" +msgstr "Podgląd metadanych dla YouTube" + +#: archive/templates/archive/file_managed.html:169 +msgid "Update YouTube thumbnail" +msgstr "Aktualizuj metadane na YouTube" + +#: archive/templates/archive/file_managed.html:175 +msgid "Update YouTube metadata" +msgstr "Aktualizuj metadane na YouTube" -#: templates/archive/file_managed.html:163 +#: archive/templates/archive/file_managed.html:180 +msgid "Publish on YouTube" +msgstr "Opublikuj na YouTube" + +#: archive/templates/archive/file_managed.html:187 msgid "See on YouTube" msgstr "Zobacz na YouTube" -#: templates/archive/file_managed.html:175 -msgid "YouTube file hasn't been generated yet." -msgstr "Plik dla YouTube nie został jeszcze wygenerowany." - -#: templates/archive/file_managed.html:194 +#: archive/templates/archive/file_managed.html:226 msgid "Are you sure you want to move this audiobook to archive?" msgstr "Czy na pewno chcesz przenieść ten plik to archiwum?" -#: templates/archive/file_managed.html:196 +#: archive/templates/archive/file_managed.html:234 msgid "Remove to archive" msgstr "Usuń do archiwum" -#: templates/archive/file_managed.html:206 -msgid "Update tags" -msgstr "Uaktualnij tagi" - -#: templates/archive/file_managed.html:213 templates/archive/file_new.html:29 -msgid "Commit" -msgstr "Zatwierdź" - -#: templates/archive/file_new.html:17 +#: archive/templates/archive/file_new.html:17 msgid "Move to archive" msgstr "Przenieś do archiwum" -#: templates/archive/file_unmanaged.html:11 +#: archive/templates/archive/file_unmanaged.html:11 msgid "File with same name already exists!" msgstr "Plik o tej nazwie już istnieje!" -#: templates/archive/file_unmanaged.html:27 +#: archive/templates/archive/file_unmanaged.html:27 msgid "Move to new files" msgstr "Przenieś do nowych plików" -#: templates/archive/list_new.html:10 +#: archive/templates/archive/list_new.html:10 msgid "New audiobooks" msgstr "Nowe audiobooki" -#: templates/archive/list_new.html:15 +#: archive/templates/archive/list_new.html:15 msgid "Put source audiobooks in:" msgstr "Umieść nowe audiobooki w:" -#: templates/archive/list_publishing.html:9 +#: archive/templates/archive/list_publishing.html:9 msgid "Audiobooks being published" msgstr "Aktualnie publikowane audiobooki" -#: templates/archive/list_unmanaged.html:9 +#: archive/templates/archive/list_unmanaged.html:9 msgid "Unmanaged archive" msgstr "Audiobooki archiwalne" -#: templates/archive/status.html:7 +#: archive/templates/archive/status.html:7 msgid "Published at" msgstr "Opublikowane" -#: templates/archive/status.html:8 +#: archive/templates/archive/status.html:8 msgid "OK" msgstr "OK" -#: templates/base.html:12 +#: archive/templates/base.html:12 msgid "Audiobook repository" msgstr "Repozytorium audiobooków" -#: templates/pagination/pagination.html:3 +#: archive/templates/pagination/pagination.html:3 msgid "Pagination" msgstr "Paginacja" -#: templates/pagination/pagination.html:8 -#: templates/pagination/pagination.html:14 +#: archive/templates/pagination/pagination.html:8 +#: archive/templates/pagination/pagination.html:14 msgid "previous" msgstr "poprzednia" -#: templates/pagination/pagination.html:40 -#: templates/pagination/pagination.html:46 +#: archive/templates/pagination/pagination.html:40 +#: archive/templates/pagination/pagination.html:46 msgid "next" msgstr "następna" -#: views.py:264 +#: archive/views.py:258 msgid "There is more than one part, but index is not set." msgstr "Utwór ma więcej niż jedną część, ale indeks części nie jest ustawiony." -#: views.py:266 +#: archive/views.py:260 #, python-format msgid "Part indexes are not 1..%(parts_count)d." msgstr "Indeksy części utworu nie tworzą zakresu 1..%(parts_count)d." +#~ msgid "MP3 file" +#~ msgstr "Plik MP3" + +#~ msgid "Ogg Vorbis file" +#~ msgstr "Plik Ogg Vorbis" + +#~ msgid "YouTube" +#~ msgstr "YouTube" + +#~ msgid "YouTube file hasn't been generated yet." +#~ msgstr "Plik dla YouTube nie został jeszcze wygenerowany." + +#~ msgid "Update tags" +#~ msgstr "Uaktualnij tagi" + #~ msgid "parts count" #~ msgstr "liczba części" diff --git a/src/archive/migrations/0029_auto_20221025_1357.py b/src/archive/migrations/0029_auto_20221025_1357.py new file mode 100644 index 0000000..3aaae8f --- /dev/null +++ b/src/archive/migrations/0029_auto_20221025_1357.py @@ -0,0 +1,19 @@ +# Generated by Django 3.1.14 on 2022-10-25 13:57 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('archive', '0028_auto_20221025_1341'), + ] + + operations = [ + migrations.AlterField( + model_name='audiobook', + name='license_secondary', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='secondary', to='archive.license', verbose_name='secondary license'), + ), + ] diff --git a/src/archive/models.py b/src/archive/models.py index f218c88..1dbb701 100644 --- a/src/archive/models.py +++ b/src/archive/models.py @@ -124,7 +124,7 @@ class Audiobook(models.Model): translator = models.CharField(max_length=255, null=True, blank=True, verbose_name=_('translator')) modified = models.DateTimeField(null=True, editable=False) license = models.ForeignKey(License, models.PROTECT, null=True, blank=True, verbose_name=_('license')) - license_secondary = models.ForeignKey(License, models.PROTECT, null=True, blank=True, verbose_name=_('license'), related_name='secondary') + license_secondary = models.ForeignKey(License, models.PROTECT, null=True, blank=True, verbose_name=_('secondary license'), related_name='secondary') # publishing process mp3_status = models.SmallIntegerField(null=True, editable=False, choices=status.choices) diff --git a/src/archive/templates/archive/file_managed.html b/src/archive/templates/archive/file_managed.html index 813ca46..c4e2a57 100644 --- a/src/archive/templates/archive/file_managed.html +++ b/src/archive/templates/archive/file_managed.html @@ -44,99 +44,24 @@
-
-
-
-

- YouTube - {% if audiobook.youtube_status %} - {{ audiobook.get_youtube_status_display }} - {% endif %} -

-
-
- - {{ youtube_title }}

- {{ youtube_description|linebreaksbr }} - - - - {% if audiobook.is_youtube_publishable %} -
-

- - {% trans "Preview YouTube metadata" %} - -

- - {% endif %} - -
- {% csrf_token %} - - -
- -
- {% csrf_token %} - -
- {% endif %} -
- {% csrf_token %} - -
- {% endif %} - -
-
- {% if audiobook.youtube_id %} -

- - - -

- {% endif %} -

{% trans "Published:" %} {{ audiobook.youtube_published }}

-
-
-
+
-
-

Metadane dla MP3, Ogg

+

MP3, Ogg

- - tagi, które zostałyby zapisane do pliku, gdyby go teraz opublikować - {% tags_table audiobook.new_publish_tags 0 %} -
-
-
- -
- - -
- {% if audiobook.mp3_status or audiobook.ogg_status or audiobook.youtube_status %} -

{% trans "Publishing pending" %}

-
- {% csrf_token %} - -
- {% endif %} + {% if audiobook.mp3_status or audiobook.ogg_status or audiobook.youtube_status %} +

{% trans "Publishing pending" %}

+
+ {% csrf_token %} + +
+ {% endif %} -
-
-

MP3, Ogg

-
-
{% if audiobook.mp3_status %}

MP3

@@ -194,8 +119,83 @@
+ + +
+
+

Metadane dla MP3, Ogg

+
+
+ + tagi, które zostałyby zapisane do pliku, gdyby go teraz opublikować + {% tags_table audiobook.new_publish_tags 0 %} +
+
+
+ +
+ + +
+
+
+

+ YouTube + {% if audiobook.youtube_status %} + {{ audiobook.get_youtube_status_display }} + {% endif %} +

+
+
+ + {{ youtube_title }}

+ {{ youtube_description|linebreaksbr }} + + + + {% if audiobook.is_youtube_publishable %} +
+

+ + {% trans "Preview YouTube metadata" %} + +

+ + {% endif %} + + {% if audiobook.youtube_id %} +
+ {% csrf_token %} + +
+
+ +
+ {% csrf_token %} + +
+ {% endif %} +
+ {% csrf_token %} + +
+ +
+
+ {% if audiobook.youtube_id %} +

+ + + +

+ {% endif %} +

{% trans "Published:" %} {{ audiobook.youtube_published }}

+ +
+
+
diff --git a/src/youtube/locale/pl/LC_MESSAGES/django.mo b/src/youtube/locale/pl/LC_MESSAGES/django.mo index 1e86547..c6101b8 100644 Binary files a/src/youtube/locale/pl/LC_MESSAGES/django.mo and b/src/youtube/locale/pl/LC_MESSAGES/django.mo differ diff --git a/src/youtube/locale/pl/LC_MESSAGES/django.po b/src/youtube/locale/pl/LC_MESSAGES/django.po index 6446cb2..87d3e6d 100644 --- a/src/youtube/locale/pl/LC_MESSAGES/django.po +++ b/src/youtube/locale/pl/LC_MESSAGES/django.po @@ -7,23 +7,35 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-04-01 14:18+0200\n" -"PO-Revision-Date: 2020-04-01 14:18+0200\n" +"POT-Creation-Date: 2022-10-25 13:56+0200\n" +"PO-Revision-Date: 2022-10-25 13:57+0200\n" +"Last-Translator: \n" +"Language-Team: \n" "Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n" -"%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n" -"%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n" -"Last-Translator: \n" -"Language-Team: \n" -"X-Generator: Poedit 2.2.4\n" +"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && " +"(n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && " +"n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n" +"X-Generator: Poedit 3.0.1\n" + +#: youtube/models.py:37 +msgid "public" +msgstr "publiczny" + +#: youtube/models.py:38 +msgid "unlisted" +msgstr "niepubliczny" + +#: youtube/models.py:39 +msgid "private" +msgstr "prywatny" -#: models.py:23 +#: youtube/models.py:44 msgid "YouTube configuration" msgstr "konfiguracja YouTube" -#: models.py:24 +#: youtube/models.py:45 msgid "YouTube configurations" msgstr "konfiguracje YouTube"