From 4442664c36cae00a1ba7cb61a148631480a9d6b8 Mon Sep 17 00:00:00 2001 From: libretime-bot Date: Mon, 6 May 2024 01:56:09 +0000 Subject: [PATCH 01/29] chore(legacy): update locales --- legacy/locale/cs_CZ/LC_MESSAGES/libretime.po | 20 +++++++--------- legacy/locale/de_AT/LC_MESSAGES/libretime.po | 20 +++++++--------- legacy/locale/de_DE/LC_MESSAGES/libretime.po | 20 +++++++--------- legacy/locale/el_GR/LC_MESSAGES/libretime.po | 20 +++++++--------- legacy/locale/en_CA/LC_MESSAGES/libretime.po | 20 +++++++--------- legacy/locale/en_GB/LC_MESSAGES/libretime.po | 20 +++++++--------- legacy/locale/en_US/LC_MESSAGES/libretime.po | 20 +++++++--------- legacy/locale/es_ES/LC_MESSAGES/libretime.po | 23 +++++++++---------- legacy/locale/fr_FR/LC_MESSAGES/libretime.po | 20 +++++++--------- legacy/locale/hr_HR/LC_MESSAGES/libretime.po | 20 +++++++--------- legacy/locale/hu_HU/LC_MESSAGES/libretime.po | 20 +++++++--------- legacy/locale/it_IT/LC_MESSAGES/libretime.po | 20 +++++++--------- legacy/locale/ja_JP/LC_MESSAGES/libretime.po | 20 +++++++--------- legacy/locale/ko_KR/LC_MESSAGES/libretime.po | 20 +++++++--------- legacy/locale/nl_NL/LC_MESSAGES/libretime.po | 20 +++++++--------- legacy/locale/pl_PL/LC_MESSAGES/libretime.po | 20 +++++++--------- legacy/locale/pt_BR/LC_MESSAGES/libretime.po | 20 +++++++--------- legacy/locale/ru_RU/LC_MESSAGES/libretime.po | 20 +++++++--------- legacy/locale/sr_RS/LC_MESSAGES/libretime.po | 20 +++++++--------- .../sr_RS@latin/LC_MESSAGES/libretime.po | 20 +++++++--------- legacy/locale/tr_TR/LC_MESSAGES/libretime.po | 20 +++++++--------- legacy/locale/uk_UA/LC_MESSAGES/libretime.po | 20 +++++++--------- legacy/locale/zh_CN/LC_MESSAGES/libretime.po | 20 +++++++--------- 23 files changed, 187 insertions(+), 276 deletions(-) diff --git a/legacy/locale/cs_CZ/LC_MESSAGES/libretime.po b/legacy/locale/cs_CZ/LC_MESSAGES/libretime.po index 98f75a63e..232c09a6d 100644 --- a/legacy/locale/cs_CZ/LC_MESSAGES/libretime.po +++ b/legacy/locale/cs_CZ/LC_MESSAGES/libretime.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: LibreTime\n" "Report-Msgid-Bugs-To: https://github.com/libretime/libretime/issues\n" -"POT-Creation-Date: 2024-04-29 01:54+0000\n" +"POT-Creation-Date: 2024-05-06 01:56+0000\n" "PO-Revision-Date: 2015-09-05 08:33+0000\n" "Last-Translator: Daniel James \n" "Language-Team: Czech (Czech Republic)\n" @@ -2037,14 +2037,14 @@ msgstr "Posunutí %s položek" #: application/controllers/LocaleController.php:302 #: application/forms/AddTracktype.php:75 application/forms/AddUser.php:108 -#: application/forms/EditAudioMD.php:288 application/forms/EditHistory.php:131 +#: application/forms/EditAudioMD.php:280 application/forms/EditHistory.php:131 #: application/forms/PasswordChange.php:43 application/forms/Preferences.php:35 msgid "Save" msgstr "Uložit" #: application/controllers/LocaleController.php:303 #: application/controllers/LocaleController.php:327 -#: application/forms/EditAudioMD.php:278 application/forms/EditHistory.php:141 +#: application/forms/EditAudioMD.php:270 application/forms/EditHistory.php:141 msgid "Cancel" msgstr "Zrušit" @@ -3204,31 +3204,27 @@ msgid "Mood:" msgstr "Nálada:" #: application/forms/EditAudioMD.php:196 -msgid "Replay Gain:" -msgstr "" - -#: application/forms/EditAudioMD.php:204 msgid "BPM:" msgstr "BPM:" -#: application/forms/EditAudioMD.php:215 +#: application/forms/EditAudioMD.php:207 msgid "Copyright:" msgstr "Autorská práva:" -#: application/forms/EditAudioMD.php:225 +#: application/forms/EditAudioMD.php:217 msgid "ISRC Number:" msgstr "ISRC číslo:" -#: application/forms/EditAudioMD.php:235 +#: application/forms/EditAudioMD.php:227 msgid "Website:" msgstr "Internetová stránka:" -#: application/forms/EditAudioMD.php:245 application/forms/EditUser.php:118 +#: application/forms/EditAudioMD.php:237 application/forms/EditUser.php:118 #: application/forms/Login.php:67 msgid "Language:" msgstr "Jazyk:" -#: application/forms/EditAudioMD.php:298 +#: application/forms/EditAudioMD.php:290 msgid "Publish..." msgstr "" diff --git a/legacy/locale/de_AT/LC_MESSAGES/libretime.po b/legacy/locale/de_AT/LC_MESSAGES/libretime.po index 83366095f..1dd0784c2 100644 --- a/legacy/locale/de_AT/LC_MESSAGES/libretime.po +++ b/legacy/locale/de_AT/LC_MESSAGES/libretime.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: LibreTime\n" "Report-Msgid-Bugs-To: https://github.com/libretime/libretime/issues\n" -"POT-Creation-Date: 2024-04-29 01:54+0000\n" +"POT-Creation-Date: 2024-05-06 01:56+0000\n" "PO-Revision-Date: 2021-10-17 08:09+0000\n" "Last-Translator: Kyle Robbertze \n" "Language-Team: German (Austria) \n" @@ -2047,14 +2047,14 @@ msgstr "Verschiebe %s Objekte" #: application/controllers/LocaleController.php:302 #: application/forms/AddTracktype.php:75 application/forms/AddUser.php:108 -#: application/forms/EditAudioMD.php:288 application/forms/EditHistory.php:131 +#: application/forms/EditAudioMD.php:280 application/forms/EditHistory.php:131 #: application/forms/PasswordChange.php:43 application/forms/Preferences.php:35 msgid "Save" msgstr "Speichern" #: application/controllers/LocaleController.php:303 #: application/controllers/LocaleController.php:327 -#: application/forms/EditAudioMD.php:278 application/forms/EditHistory.php:141 +#: application/forms/EditAudioMD.php:270 application/forms/EditHistory.php:141 msgid "Cancel" msgstr "Abbrechen" @@ -3214,31 +3214,27 @@ msgid "Mood:" msgstr "Stimmung:" #: application/forms/EditAudioMD.php:196 -msgid "Replay Gain:" -msgstr "" - -#: application/forms/EditAudioMD.php:204 msgid "BPM:" msgstr "BPM:" -#: application/forms/EditAudioMD.php:215 +#: application/forms/EditAudioMD.php:207 msgid "Copyright:" msgstr "Copyright:" -#: application/forms/EditAudioMD.php:225 +#: application/forms/EditAudioMD.php:217 msgid "ISRC Number:" msgstr "ISRC Nummer:" -#: application/forms/EditAudioMD.php:235 +#: application/forms/EditAudioMD.php:227 msgid "Website:" msgstr "Webseite:" -#: application/forms/EditAudioMD.php:245 application/forms/EditUser.php:118 +#: application/forms/EditAudioMD.php:237 application/forms/EditUser.php:118 #: application/forms/Login.php:67 msgid "Language:" msgstr "Sprache:" -#: application/forms/EditAudioMD.php:298 +#: application/forms/EditAudioMD.php:290 msgid "Publish..." msgstr "" diff --git a/legacy/locale/de_DE/LC_MESSAGES/libretime.po b/legacy/locale/de_DE/LC_MESSAGES/libretime.po index 6d149936a..1efff356f 100644 --- a/legacy/locale/de_DE/LC_MESSAGES/libretime.po +++ b/legacy/locale/de_DE/LC_MESSAGES/libretime.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: LibreTime\n" "Report-Msgid-Bugs-To: https://github.com/libretime/libretime/issues\n" -"POT-Creation-Date: 2024-04-29 01:54+0000\n" +"POT-Creation-Date: 2024-05-06 01:56+0000\n" "PO-Revision-Date: 2024-01-19 16:00+0000\n" "Last-Translator: Domenik Töfflinger \n" "Language-Team: German \n" @@ -2050,14 +2050,14 @@ msgstr "Verschiebe %s Objekte" #: application/controllers/LocaleController.php:302 #: application/forms/AddTracktype.php:75 application/forms/AddUser.php:108 -#: application/forms/EditAudioMD.php:288 application/forms/EditHistory.php:131 +#: application/forms/EditAudioMD.php:280 application/forms/EditHistory.php:131 #: application/forms/PasswordChange.php:43 application/forms/Preferences.php:35 msgid "Save" msgstr "Speichern" #: application/controllers/LocaleController.php:303 #: application/controllers/LocaleController.php:327 -#: application/forms/EditAudioMD.php:278 application/forms/EditHistory.php:141 +#: application/forms/EditAudioMD.php:270 application/forms/EditHistory.php:141 msgid "Cancel" msgstr "Abbrechen" @@ -3217,31 +3217,27 @@ msgid "Mood:" msgstr "Stimmung:" #: application/forms/EditAudioMD.php:196 -msgid "Replay Gain:" -msgstr "" - -#: application/forms/EditAudioMD.php:204 msgid "BPM:" msgstr "BPM:" -#: application/forms/EditAudioMD.php:215 +#: application/forms/EditAudioMD.php:207 msgid "Copyright:" msgstr "Copyright:" -#: application/forms/EditAudioMD.php:225 +#: application/forms/EditAudioMD.php:217 msgid "ISRC Number:" msgstr "ISRC-Nr.:" -#: application/forms/EditAudioMD.php:235 +#: application/forms/EditAudioMD.php:227 msgid "Website:" msgstr "Webseite:" -#: application/forms/EditAudioMD.php:245 application/forms/EditUser.php:118 +#: application/forms/EditAudioMD.php:237 application/forms/EditUser.php:118 #: application/forms/Login.php:67 msgid "Language:" msgstr "Sprache:" -#: application/forms/EditAudioMD.php:298 +#: application/forms/EditAudioMD.php:290 msgid "Publish..." msgstr "Veröffentlichen..." diff --git a/legacy/locale/el_GR/LC_MESSAGES/libretime.po b/legacy/locale/el_GR/LC_MESSAGES/libretime.po index 63b16fd2e..06ea5a803 100644 --- a/legacy/locale/el_GR/LC_MESSAGES/libretime.po +++ b/legacy/locale/el_GR/LC_MESSAGES/libretime.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: LibreTime\n" "Report-Msgid-Bugs-To: https://github.com/libretime/libretime/issues\n" -"POT-Creation-Date: 2024-04-29 01:54+0000\n" +"POT-Creation-Date: 2024-05-06 01:56+0000\n" "PO-Revision-Date: 2021-10-17 08:09+0000\n" "Last-Translator: Kyle Robbertze \n" "Language-Team: Greek \n" @@ -2038,14 +2038,14 @@ msgstr "Μετακίνηση Στοιχείων %s" #: application/controllers/LocaleController.php:302 #: application/forms/AddTracktype.php:75 application/forms/AddUser.php:108 -#: application/forms/EditAudioMD.php:288 application/forms/EditHistory.php:131 +#: application/forms/EditAudioMD.php:280 application/forms/EditHistory.php:131 #: application/forms/PasswordChange.php:43 application/forms/Preferences.php:35 msgid "Save" msgstr "Αποθήκευση" #: application/controllers/LocaleController.php:303 #: application/controllers/LocaleController.php:327 -#: application/forms/EditAudioMD.php:278 application/forms/EditHistory.php:141 +#: application/forms/EditAudioMD.php:270 application/forms/EditHistory.php:141 msgid "Cancel" msgstr "Ακύρωση" @@ -3205,31 +3205,27 @@ msgid "Mood:" msgstr "Διάθεση:" #: application/forms/EditAudioMD.php:196 -msgid "Replay Gain:" -msgstr "" - -#: application/forms/EditAudioMD.php:204 msgid "BPM:" msgstr "BPM:" -#: application/forms/EditAudioMD.php:215 +#: application/forms/EditAudioMD.php:207 msgid "Copyright:" msgstr "Copyright:" -#: application/forms/EditAudioMD.php:225 +#: application/forms/EditAudioMD.php:217 msgid "ISRC Number:" msgstr "Αριθμός ISRC:" -#: application/forms/EditAudioMD.php:235 +#: application/forms/EditAudioMD.php:227 msgid "Website:" msgstr "Ιστοσελίδα:" -#: application/forms/EditAudioMD.php:245 application/forms/EditUser.php:118 +#: application/forms/EditAudioMD.php:237 application/forms/EditUser.php:118 #: application/forms/Login.php:67 msgid "Language:" msgstr "Γλώσσα:" -#: application/forms/EditAudioMD.php:298 +#: application/forms/EditAudioMD.php:290 msgid "Publish..." msgstr "" diff --git a/legacy/locale/en_CA/LC_MESSAGES/libretime.po b/legacy/locale/en_CA/LC_MESSAGES/libretime.po index bf8c28af6..06cc3d7e2 100644 --- a/legacy/locale/en_CA/LC_MESSAGES/libretime.po +++ b/legacy/locale/en_CA/LC_MESSAGES/libretime.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: LibreTime\n" "Report-Msgid-Bugs-To: https://github.com/libretime/libretime/issues\n" -"POT-Creation-Date: 2024-04-29 01:54+0000\n" +"POT-Creation-Date: 2024-05-06 01:56+0000\n" "PO-Revision-Date: 2015-09-05 08:33+0000\n" "Last-Translator: Daniel James \n" "Language-Team: English (Canada)\n" @@ -2037,14 +2037,14 @@ msgstr "Moving %s Items" #: application/controllers/LocaleController.php:302 #: application/forms/AddTracktype.php:75 application/forms/AddUser.php:108 -#: application/forms/EditAudioMD.php:288 application/forms/EditHistory.php:131 +#: application/forms/EditAudioMD.php:280 application/forms/EditHistory.php:131 #: application/forms/PasswordChange.php:43 application/forms/Preferences.php:35 msgid "Save" msgstr "Save" #: application/controllers/LocaleController.php:303 #: application/controllers/LocaleController.php:327 -#: application/forms/EditAudioMD.php:278 application/forms/EditHistory.php:141 +#: application/forms/EditAudioMD.php:270 application/forms/EditHistory.php:141 msgid "Cancel" msgstr "Cancel" @@ -3204,31 +3204,27 @@ msgid "Mood:" msgstr "Mood:" #: application/forms/EditAudioMD.php:196 -msgid "Replay Gain:" -msgstr "" - -#: application/forms/EditAudioMD.php:204 msgid "BPM:" msgstr "BPM:" -#: application/forms/EditAudioMD.php:215 +#: application/forms/EditAudioMD.php:207 msgid "Copyright:" msgstr "Copyright:" -#: application/forms/EditAudioMD.php:225 +#: application/forms/EditAudioMD.php:217 msgid "ISRC Number:" msgstr "ISRC Number:" -#: application/forms/EditAudioMD.php:235 +#: application/forms/EditAudioMD.php:227 msgid "Website:" msgstr "Website:" -#: application/forms/EditAudioMD.php:245 application/forms/EditUser.php:118 +#: application/forms/EditAudioMD.php:237 application/forms/EditUser.php:118 #: application/forms/Login.php:67 msgid "Language:" msgstr "Language:" -#: application/forms/EditAudioMD.php:298 +#: application/forms/EditAudioMD.php:290 msgid "Publish..." msgstr "" diff --git a/legacy/locale/en_GB/LC_MESSAGES/libretime.po b/legacy/locale/en_GB/LC_MESSAGES/libretime.po index 4a08b9f41..bfff21366 100644 --- a/legacy/locale/en_GB/LC_MESSAGES/libretime.po +++ b/legacy/locale/en_GB/LC_MESSAGES/libretime.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: LibreTime\n" "Report-Msgid-Bugs-To: https://github.com/libretime/libretime/issues\n" -"POT-Creation-Date: 2024-04-29 01:54+0000\n" +"POT-Creation-Date: 2024-05-06 01:56+0000\n" "PO-Revision-Date: 2022-07-14 09:18+0000\n" "Last-Translator: Kyle Robbertze \n" "Language-Team: English (United Kingdom) \n" @@ -2042,14 +2042,14 @@ msgstr "Moving %s Items" #: application/controllers/LocaleController.php:302 #: application/forms/AddTracktype.php:75 application/forms/AddUser.php:108 -#: application/forms/EditAudioMD.php:288 application/forms/EditHistory.php:131 +#: application/forms/EditAudioMD.php:280 application/forms/EditHistory.php:131 #: application/forms/PasswordChange.php:43 application/forms/Preferences.php:35 msgid "Save" msgstr "Save" #: application/controllers/LocaleController.php:303 #: application/controllers/LocaleController.php:327 -#: application/forms/EditAudioMD.php:278 application/forms/EditHistory.php:141 +#: application/forms/EditAudioMD.php:270 application/forms/EditHistory.php:141 msgid "Cancel" msgstr "Cancel" @@ -3209,31 +3209,27 @@ msgid "Mood:" msgstr "Mood:" #: application/forms/EditAudioMD.php:196 -msgid "Replay Gain:" -msgstr "" - -#: application/forms/EditAudioMD.php:204 msgid "BPM:" msgstr "BPM:" -#: application/forms/EditAudioMD.php:215 +#: application/forms/EditAudioMD.php:207 msgid "Copyright:" msgstr "Copyright:" -#: application/forms/EditAudioMD.php:225 +#: application/forms/EditAudioMD.php:217 msgid "ISRC Number:" msgstr "ISRC Number:" -#: application/forms/EditAudioMD.php:235 +#: application/forms/EditAudioMD.php:227 msgid "Website:" msgstr "Website:" -#: application/forms/EditAudioMD.php:245 application/forms/EditUser.php:118 +#: application/forms/EditAudioMD.php:237 application/forms/EditUser.php:118 #: application/forms/Login.php:67 msgid "Language:" msgstr "Language:" -#: application/forms/EditAudioMD.php:298 +#: application/forms/EditAudioMD.php:290 msgid "Publish..." msgstr "" diff --git a/legacy/locale/en_US/LC_MESSAGES/libretime.po b/legacy/locale/en_US/LC_MESSAGES/libretime.po index bc43a73b3..54df756c6 100644 --- a/legacy/locale/en_US/LC_MESSAGES/libretime.po +++ b/legacy/locale/en_US/LC_MESSAGES/libretime.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: LibreTime\n" "Report-Msgid-Bugs-To: https://github.com/libretime/libretime/issues\n" -"POT-Creation-Date: 2024-04-29 01:54+0000\n" +"POT-Creation-Date: 2024-05-06 01:56+0000\n" "PO-Revision-Date: 2023-05-21 17:52+0000\n" "Last-Translator: Zachary Klosko \n" "Language-Team: English (United States) \n" @@ -2038,14 +2038,14 @@ msgstr "Moving %s Items" #: application/controllers/LocaleController.php:302 #: application/forms/AddTracktype.php:75 application/forms/AddUser.php:108 -#: application/forms/EditAudioMD.php:288 application/forms/EditHistory.php:131 +#: application/forms/EditAudioMD.php:280 application/forms/EditHistory.php:131 #: application/forms/PasswordChange.php:43 application/forms/Preferences.php:35 msgid "Save" msgstr "Save" #: application/controllers/LocaleController.php:303 #: application/controllers/LocaleController.php:327 -#: application/forms/EditAudioMD.php:278 application/forms/EditHistory.php:141 +#: application/forms/EditAudioMD.php:270 application/forms/EditHistory.php:141 msgid "Cancel" msgstr "Cancel" @@ -3205,31 +3205,27 @@ msgid "Mood:" msgstr "Mood:" #: application/forms/EditAudioMD.php:196 -msgid "Replay Gain:" -msgstr "" - -#: application/forms/EditAudioMD.php:204 msgid "BPM:" msgstr "BPM:" -#: application/forms/EditAudioMD.php:215 +#: application/forms/EditAudioMD.php:207 msgid "Copyright:" msgstr "Copyright:" -#: application/forms/EditAudioMD.php:225 +#: application/forms/EditAudioMD.php:217 msgid "ISRC Number:" msgstr "ISRC Number:" -#: application/forms/EditAudioMD.php:235 +#: application/forms/EditAudioMD.php:227 msgid "Website:" msgstr "Website:" -#: application/forms/EditAudioMD.php:245 application/forms/EditUser.php:118 +#: application/forms/EditAudioMD.php:237 application/forms/EditUser.php:118 #: application/forms/Login.php:67 msgid "Language:" msgstr "Language:" -#: application/forms/EditAudioMD.php:298 +#: application/forms/EditAudioMD.php:290 msgid "Publish..." msgstr "" diff --git a/legacy/locale/es_ES/LC_MESSAGES/libretime.po b/legacy/locale/es_ES/LC_MESSAGES/libretime.po index 823e75df7..8963038a5 100644 --- a/legacy/locale/es_ES/LC_MESSAGES/libretime.po +++ b/legacy/locale/es_ES/LC_MESSAGES/libretime.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: LibreTime\n" "Report-Msgid-Bugs-To: https://github.com/libretime/libretime/issues\n" -"POT-Creation-Date: 2024-04-29 01:54+0000\n" +"POT-Creation-Date: 2024-05-06 01:56+0000\n" "PO-Revision-Date: 2024-04-23 09:07+0000\n" "Last-Translator: gallegonovato \n" "Language-Team: Spanish \n" @@ -2049,14 +2049,14 @@ msgstr "Moviendo %s elementos" #: application/controllers/LocaleController.php:302 #: application/forms/AddTracktype.php:75 application/forms/AddUser.php:108 -#: application/forms/EditAudioMD.php:288 application/forms/EditHistory.php:131 +#: application/forms/EditAudioMD.php:280 application/forms/EditHistory.php:131 #: application/forms/PasswordChange.php:43 application/forms/Preferences.php:35 msgid "Save" msgstr "Guardar" #: application/controllers/LocaleController.php:303 #: application/controllers/LocaleController.php:327 -#: application/forms/EditAudioMD.php:278 application/forms/EditHistory.php:141 +#: application/forms/EditAudioMD.php:270 application/forms/EditHistory.php:141 msgid "Cancel" msgstr "Cancelar" @@ -3218,31 +3218,27 @@ msgid "Mood:" msgstr "Ánimo (mood):" #: application/forms/EditAudioMD.php:196 -msgid "Replay Gain:" -msgstr "Ganancia de repetición:" - -#: application/forms/EditAudioMD.php:204 msgid "BPM:" msgstr "BPM:" -#: application/forms/EditAudioMD.php:215 +#: application/forms/EditAudioMD.php:207 msgid "Copyright:" msgstr "Derechos de autor:" -#: application/forms/EditAudioMD.php:225 +#: application/forms/EditAudioMD.php:217 msgid "ISRC Number:" msgstr "Número ISRC:" -#: application/forms/EditAudioMD.php:235 +#: application/forms/EditAudioMD.php:227 msgid "Website:" msgstr "Sitio web:" -#: application/forms/EditAudioMD.php:245 application/forms/EditUser.php:118 +#: application/forms/EditAudioMD.php:237 application/forms/EditUser.php:118 #: application/forms/Login.php:67 msgid "Language:" msgstr "Idioma:" -#: application/forms/EditAudioMD.php:298 +#: application/forms/EditAudioMD.php:290 msgid "Publish..." msgstr "Publicar..." @@ -4687,6 +4683,9 @@ msgstr "Retransmisiones por Internet" #~ msgid "Repeat Days:" #~ msgstr "Días de repetición:" +#~ msgid "Replay Gain:" +#~ msgstr "Ganancia de repetición:" + #, php-format #~ msgid "Rescan watched directory (This is useful if it is network mount and may be out of sync with %s)" #~ msgstr "Vuelva a analizar el directorio monitorizado (Esto es útil si es un montaje en red y pueda estar fuera de sincronización con %s)" diff --git a/legacy/locale/fr_FR/LC_MESSAGES/libretime.po b/legacy/locale/fr_FR/LC_MESSAGES/libretime.po index d5b53175f..9443699a4 100644 --- a/legacy/locale/fr_FR/LC_MESSAGES/libretime.po +++ b/legacy/locale/fr_FR/LC_MESSAGES/libretime.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: LibreTime\n" "Report-Msgid-Bugs-To: https://github.com/libretime/libretime/issues\n" -"POT-Creation-Date: 2024-04-29 01:54+0000\n" +"POT-Creation-Date: 2024-05-06 01:56+0000\n" "PO-Revision-Date: 2023-03-06 23:45+0000\n" "Last-Translator: \"Jonas L.\" \n" "Language-Team: French \n" @@ -2047,14 +2047,14 @@ msgstr "Déplacer %s éléments" #: application/controllers/LocaleController.php:302 #: application/forms/AddTracktype.php:75 application/forms/AddUser.php:108 -#: application/forms/EditAudioMD.php:288 application/forms/EditHistory.php:131 +#: application/forms/EditAudioMD.php:280 application/forms/EditHistory.php:131 #: application/forms/PasswordChange.php:43 application/forms/Preferences.php:35 msgid "Save" msgstr "Sauvegarder" #: application/controllers/LocaleController.php:303 #: application/controllers/LocaleController.php:327 -#: application/forms/EditAudioMD.php:278 application/forms/EditHistory.php:141 +#: application/forms/EditAudioMD.php:270 application/forms/EditHistory.php:141 msgid "Cancel" msgstr "Annuler" @@ -3216,31 +3216,27 @@ msgid "Mood:" msgstr "Atmosphère :" #: application/forms/EditAudioMD.php:196 -msgid "Replay Gain:" -msgstr "" - -#: application/forms/EditAudioMD.php:204 msgid "BPM:" msgstr "BPM :" -#: application/forms/EditAudioMD.php:215 +#: application/forms/EditAudioMD.php:207 msgid "Copyright:" msgstr "Copyright :" -#: application/forms/EditAudioMD.php:225 +#: application/forms/EditAudioMD.php:217 msgid "ISRC Number:" msgstr "Numéro ISRC :" -#: application/forms/EditAudioMD.php:235 +#: application/forms/EditAudioMD.php:227 msgid "Website:" msgstr "Site Internet :" -#: application/forms/EditAudioMD.php:245 application/forms/EditUser.php:118 +#: application/forms/EditAudioMD.php:237 application/forms/EditUser.php:118 #: application/forms/Login.php:67 msgid "Language:" msgstr "Langue :" -#: application/forms/EditAudioMD.php:298 +#: application/forms/EditAudioMD.php:290 msgid "Publish..." msgstr "Publier..." diff --git a/legacy/locale/hr_HR/LC_MESSAGES/libretime.po b/legacy/locale/hr_HR/LC_MESSAGES/libretime.po index d7a76fcf7..308734cf9 100644 --- a/legacy/locale/hr_HR/LC_MESSAGES/libretime.po +++ b/legacy/locale/hr_HR/LC_MESSAGES/libretime.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: LibreTime\n" "Report-Msgid-Bugs-To: https://github.com/libretime/libretime/issues\n" -"POT-Creation-Date: 2024-04-29 01:54+0000\n" +"POT-Creation-Date: 2024-05-06 01:56+0000\n" "PO-Revision-Date: 2023-10-29 05:18+0000\n" "Last-Translator: Milo Ivir \n" "Language-Team: Croatian \n" @@ -2038,14 +2038,14 @@ msgstr "Premještanje %s stavki" #: application/controllers/LocaleController.php:302 #: application/forms/AddTracktype.php:75 application/forms/AddUser.php:108 -#: application/forms/EditAudioMD.php:288 application/forms/EditHistory.php:131 +#: application/forms/EditAudioMD.php:280 application/forms/EditHistory.php:131 #: application/forms/PasswordChange.php:43 application/forms/Preferences.php:35 msgid "Save" msgstr "Spremi" #: application/controllers/LocaleController.php:303 #: application/controllers/LocaleController.php:327 -#: application/forms/EditAudioMD.php:278 application/forms/EditHistory.php:141 +#: application/forms/EditAudioMD.php:270 application/forms/EditHistory.php:141 msgid "Cancel" msgstr "Odustani" @@ -3208,31 +3208,27 @@ msgid "Mood:" msgstr "Raspoloženje:" #: application/forms/EditAudioMD.php:196 -msgid "Replay Gain:" -msgstr "" - -#: application/forms/EditAudioMD.php:204 msgid "BPM:" msgstr "BPM:" -#: application/forms/EditAudioMD.php:215 +#: application/forms/EditAudioMD.php:207 msgid "Copyright:" msgstr "Autorsko pravo:" -#: application/forms/EditAudioMD.php:225 +#: application/forms/EditAudioMD.php:217 msgid "ISRC Number:" msgstr "ISRC Broj:" -#: application/forms/EditAudioMD.php:235 +#: application/forms/EditAudioMD.php:227 msgid "Website:" msgstr "Web stranica:" -#: application/forms/EditAudioMD.php:245 application/forms/EditUser.php:118 +#: application/forms/EditAudioMD.php:237 application/forms/EditUser.php:118 #: application/forms/Login.php:67 msgid "Language:" msgstr "Jezik:" -#: application/forms/EditAudioMD.php:298 +#: application/forms/EditAudioMD.php:290 msgid "Publish..." msgstr "Objavi …" diff --git a/legacy/locale/hu_HU/LC_MESSAGES/libretime.po b/legacy/locale/hu_HU/LC_MESSAGES/libretime.po index 3c1ef3887..ed7ccf58a 100644 --- a/legacy/locale/hu_HU/LC_MESSAGES/libretime.po +++ b/legacy/locale/hu_HU/LC_MESSAGES/libretime.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: LibreTime\n" "Report-Msgid-Bugs-To: https://github.com/libretime/libretime/issues\n" -"POT-Creation-Date: 2024-04-29 01:54+0000\n" +"POT-Creation-Date: 2024-05-06 01:56+0000\n" "PO-Revision-Date: 2021-12-27 20:52+0000\n" "Last-Translator: f3rr31 <5920873@disroot.org>\n" "Language-Team: Hungarian \n" @@ -2050,14 +2050,14 @@ msgstr "%s elem áthelyezése" #: application/controllers/LocaleController.php:302 #: application/forms/AddTracktype.php:75 application/forms/AddUser.php:108 -#: application/forms/EditAudioMD.php:288 application/forms/EditHistory.php:131 +#: application/forms/EditAudioMD.php:280 application/forms/EditHistory.php:131 #: application/forms/PasswordChange.php:43 application/forms/Preferences.php:35 msgid "Save" msgstr "Mentés" #: application/controllers/LocaleController.php:303 #: application/controllers/LocaleController.php:327 -#: application/forms/EditAudioMD.php:278 application/forms/EditHistory.php:141 +#: application/forms/EditAudioMD.php:270 application/forms/EditHistory.php:141 msgid "Cancel" msgstr "Mégse" @@ -3222,31 +3222,27 @@ msgid "Mood:" msgstr "Hangulat:" #: application/forms/EditAudioMD.php:196 -msgid "Replay Gain:" -msgstr "" - -#: application/forms/EditAudioMD.php:204 msgid "BPM:" msgstr "BPM:" -#: application/forms/EditAudioMD.php:215 +#: application/forms/EditAudioMD.php:207 msgid "Copyright:" msgstr "Szerzői jog:" -#: application/forms/EditAudioMD.php:225 +#: application/forms/EditAudioMD.php:217 msgid "ISRC Number:" msgstr "ISRC Szám:" -#: application/forms/EditAudioMD.php:235 +#: application/forms/EditAudioMD.php:227 msgid "Website:" msgstr "Honlap:" -#: application/forms/EditAudioMD.php:245 application/forms/EditUser.php:118 +#: application/forms/EditAudioMD.php:237 application/forms/EditUser.php:118 #: application/forms/Login.php:67 msgid "Language:" msgstr "Nyelv:" -#: application/forms/EditAudioMD.php:298 +#: application/forms/EditAudioMD.php:290 msgid "Publish..." msgstr "Közzététel..." diff --git a/legacy/locale/it_IT/LC_MESSAGES/libretime.po b/legacy/locale/it_IT/LC_MESSAGES/libretime.po index 5febbbfef..b9a1cc247 100644 --- a/legacy/locale/it_IT/LC_MESSAGES/libretime.po +++ b/legacy/locale/it_IT/LC_MESSAGES/libretime.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: LibreTime\n" "Report-Msgid-Bugs-To: https://github.com/libretime/libretime/issues\n" -"POT-Creation-Date: 2024-04-29 01:54+0000\n" +"POT-Creation-Date: 2024-05-06 01:56+0000\n" "PO-Revision-Date: 2023-12-27 23:06+0000\n" "Last-Translator: Maurizio Castelvetro \n" "Language-Team: Italian \n" @@ -2041,14 +2041,14 @@ msgstr "Spostamento degli elementi %s in corso" #: application/controllers/LocaleController.php:302 #: application/forms/AddTracktype.php:75 application/forms/AddUser.php:108 -#: application/forms/EditAudioMD.php:288 application/forms/EditHistory.php:131 +#: application/forms/EditAudioMD.php:280 application/forms/EditHistory.php:131 #: application/forms/PasswordChange.php:43 application/forms/Preferences.php:35 msgid "Save" msgstr "Salva" #: application/controllers/LocaleController.php:303 #: application/controllers/LocaleController.php:327 -#: application/forms/EditAudioMD.php:278 application/forms/EditHistory.php:141 +#: application/forms/EditAudioMD.php:270 application/forms/EditHistory.php:141 msgid "Cancel" msgstr "Cancella" @@ -3208,31 +3208,27 @@ msgid "Mood:" msgstr "Umore:" #: application/forms/EditAudioMD.php:196 -msgid "Replay Gain:" -msgstr "" - -#: application/forms/EditAudioMD.php:204 msgid "BPM:" msgstr "BPM:" -#: application/forms/EditAudioMD.php:215 +#: application/forms/EditAudioMD.php:207 msgid "Copyright:" msgstr "Copyright:" -#: application/forms/EditAudioMD.php:225 +#: application/forms/EditAudioMD.php:217 msgid "ISRC Number:" msgstr "Numero ISRC :" -#: application/forms/EditAudioMD.php:235 +#: application/forms/EditAudioMD.php:227 msgid "Website:" msgstr "Sito web:" -#: application/forms/EditAudioMD.php:245 application/forms/EditUser.php:118 +#: application/forms/EditAudioMD.php:237 application/forms/EditUser.php:118 #: application/forms/Login.php:67 msgid "Language:" msgstr "Lingua:" -#: application/forms/EditAudioMD.php:298 +#: application/forms/EditAudioMD.php:290 msgid "Publish..." msgstr "" diff --git a/legacy/locale/ja_JP/LC_MESSAGES/libretime.po b/legacy/locale/ja_JP/LC_MESSAGES/libretime.po index 35408ce72..fbd7bb40a 100644 --- a/legacy/locale/ja_JP/LC_MESSAGES/libretime.po +++ b/legacy/locale/ja_JP/LC_MESSAGES/libretime.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: LibreTime\n" "Report-Msgid-Bugs-To: https://github.com/libretime/libretime/issues\n" -"POT-Creation-Date: 2024-04-29 01:54+0000\n" +"POT-Creation-Date: 2024-05-06 01:56+0000\n" "PO-Revision-Date: 2021-10-17 08:09+0000\n" "Last-Translator: Kyle Robbertze \n" "Language-Team: Japanese \n" @@ -2037,14 +2037,14 @@ msgstr "%s 個の項目を移動" #: application/controllers/LocaleController.php:302 #: application/forms/AddTracktype.php:75 application/forms/AddUser.php:108 -#: application/forms/EditAudioMD.php:288 application/forms/EditHistory.php:131 +#: application/forms/EditAudioMD.php:280 application/forms/EditHistory.php:131 #: application/forms/PasswordChange.php:43 application/forms/Preferences.php:35 msgid "Save" msgstr "保存" #: application/controllers/LocaleController.php:303 #: application/controllers/LocaleController.php:327 -#: application/forms/EditAudioMD.php:278 application/forms/EditHistory.php:141 +#: application/forms/EditAudioMD.php:270 application/forms/EditHistory.php:141 msgid "Cancel" msgstr "キャンセル" @@ -3204,31 +3204,27 @@ msgid "Mood:" msgstr "ムード：" #: application/forms/EditAudioMD.php:196 -msgid "Replay Gain:" -msgstr "" - -#: application/forms/EditAudioMD.php:204 msgid "BPM:" msgstr "BPM：" -#: application/forms/EditAudioMD.php:215 +#: application/forms/EditAudioMD.php:207 msgid "Copyright:" msgstr "著作権：" -#: application/forms/EditAudioMD.php:225 +#: application/forms/EditAudioMD.php:217 msgid "ISRC Number:" msgstr "ISRC番号：" -#: application/forms/EditAudioMD.php:235 +#: application/forms/EditAudioMD.php:227 msgid "Website:" msgstr "ウェブサイト：" -#: application/forms/EditAudioMD.php:245 application/forms/EditUser.php:118 +#: application/forms/EditAudioMD.php:237 application/forms/EditUser.php:118 #: application/forms/Login.php:67 msgid "Language:" msgstr "言語：" -#: application/forms/EditAudioMD.php:298 +#: application/forms/EditAudioMD.php:290 msgid "Publish..." msgstr "" diff --git a/legacy/locale/ko_KR/LC_MESSAGES/libretime.po b/legacy/locale/ko_KR/LC_MESSAGES/libretime.po index 6c69cbf5a..a38096876 100644 --- a/legacy/locale/ko_KR/LC_MESSAGES/libretime.po +++ b/legacy/locale/ko_KR/LC_MESSAGES/libretime.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: LibreTime\n" "Report-Msgid-Bugs-To: https://github.com/libretime/libretime/issues\n" -"POT-Creation-Date: 2024-04-29 01:54+0000\n" +"POT-Creation-Date: 2024-05-06 01:56+0000\n" "PO-Revision-Date: 2015-09-05 08:33+0000\n" "Last-Translator: Daniel James \n" "Language-Team: Korean (Korea)\n" @@ -2034,14 +2034,14 @@ msgstr "아이템 %s개 이동" #: application/controllers/LocaleController.php:302 #: application/forms/AddTracktype.php:75 application/forms/AddUser.php:108 -#: application/forms/EditAudioMD.php:288 application/forms/EditHistory.php:131 +#: application/forms/EditAudioMD.php:280 application/forms/EditHistory.php:131 #: application/forms/PasswordChange.php:43 application/forms/Preferences.php:35 msgid "Save" msgstr "저장" #: application/controllers/LocaleController.php:303 #: application/controllers/LocaleController.php:327 -#: application/forms/EditAudioMD.php:278 application/forms/EditHistory.php:141 +#: application/forms/EditAudioMD.php:270 application/forms/EditHistory.php:141 msgid "Cancel" msgstr "취소" @@ -3201,31 +3201,27 @@ msgid "Mood:" msgstr "무드" #: application/forms/EditAudioMD.php:196 -msgid "Replay Gain:" -msgstr "" - -#: application/forms/EditAudioMD.php:204 msgid "BPM:" msgstr "" -#: application/forms/EditAudioMD.php:215 +#: application/forms/EditAudioMD.php:207 msgid "Copyright:" msgstr "저작권:" -#: application/forms/EditAudioMD.php:225 +#: application/forms/EditAudioMD.php:217 msgid "ISRC Number:" msgstr "ISRC 넘버" -#: application/forms/EditAudioMD.php:235 +#: application/forms/EditAudioMD.php:227 msgid "Website:" msgstr "웹사이트" -#: application/forms/EditAudioMD.php:245 application/forms/EditUser.php:118 +#: application/forms/EditAudioMD.php:237 application/forms/EditUser.php:118 #: application/forms/Login.php:67 msgid "Language:" msgstr "언어" -#: application/forms/EditAudioMD.php:298 +#: application/forms/EditAudioMD.php:290 msgid "Publish..." msgstr "" diff --git a/legacy/locale/nl_NL/LC_MESSAGES/libretime.po b/legacy/locale/nl_NL/LC_MESSAGES/libretime.po index 0af27ba8d..d5b063adb 100644 --- a/legacy/locale/nl_NL/LC_MESSAGES/libretime.po +++ b/legacy/locale/nl_NL/LC_MESSAGES/libretime.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: LibreTime\n" "Report-Msgid-Bugs-To: https://github.com/libretime/libretime/issues\n" -"POT-Creation-Date: 2024-04-29 01:54+0000\n" +"POT-Creation-Date: 2024-05-06 01:56+0000\n" "PO-Revision-Date: 2024-03-17 07:32+0000\n" "Last-Translator: Mikachu \n" "Language-Team: Dutch \n" @@ -2048,14 +2048,14 @@ msgstr "%s Items verplaatsen" #: application/controllers/LocaleController.php:302 #: application/forms/AddTracktype.php:75 application/forms/AddUser.php:108 -#: application/forms/EditAudioMD.php:288 application/forms/EditHistory.php:131 +#: application/forms/EditAudioMD.php:280 application/forms/EditHistory.php:131 #: application/forms/PasswordChange.php:43 application/forms/Preferences.php:35 msgid "Save" msgstr "opslaan" #: application/controllers/LocaleController.php:303 #: application/controllers/LocaleController.php:327 -#: application/forms/EditAudioMD.php:278 application/forms/EditHistory.php:141 +#: application/forms/EditAudioMD.php:270 application/forms/EditHistory.php:141 msgid "Cancel" msgstr "anuleren" @@ -3217,31 +3217,27 @@ msgid "Mood:" msgstr "Stemming:" #: application/forms/EditAudioMD.php:196 -msgid "Replay Gain:" -msgstr "" - -#: application/forms/EditAudioMD.php:204 msgid "BPM:" msgstr "BPM:" -#: application/forms/EditAudioMD.php:215 +#: application/forms/EditAudioMD.php:207 msgid "Copyright:" msgstr "Copyright:" -#: application/forms/EditAudioMD.php:225 +#: application/forms/EditAudioMD.php:217 msgid "ISRC Number:" msgstr "ISRC nummer:" -#: application/forms/EditAudioMD.php:235 +#: application/forms/EditAudioMD.php:227 msgid "Website:" msgstr "Website:" -#: application/forms/EditAudioMD.php:245 application/forms/EditUser.php:118 +#: application/forms/EditAudioMD.php:237 application/forms/EditUser.php:118 #: application/forms/Login.php:67 msgid "Language:" msgstr "Taal:" -#: application/forms/EditAudioMD.php:298 +#: application/forms/EditAudioMD.php:290 msgid "Publish..." msgstr "Publiceren..." diff --git a/legacy/locale/pl_PL/LC_MESSAGES/libretime.po b/legacy/locale/pl_PL/LC_MESSAGES/libretime.po index 46a28c778..263e76367 100644 --- a/legacy/locale/pl_PL/LC_MESSAGES/libretime.po +++ b/legacy/locale/pl_PL/LC_MESSAGES/libretime.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: LibreTime\n" "Report-Msgid-Bugs-To: https://github.com/libretime/libretime/issues\n" -"POT-Creation-Date: 2024-04-29 01:54+0000\n" +"POT-Creation-Date: 2024-05-06 01:56+0000\n" "PO-Revision-Date: 2023-10-12 10:01+0000\n" "Last-Translator: Piotr Strebski \n" "Language-Team: Polish \n" @@ -2038,14 +2038,14 @@ msgstr "Przenoszenie %s elementów" #: application/controllers/LocaleController.php:302 #: application/forms/AddTracktype.php:75 application/forms/AddUser.php:108 -#: application/forms/EditAudioMD.php:288 application/forms/EditHistory.php:131 +#: application/forms/EditAudioMD.php:280 application/forms/EditHistory.php:131 #: application/forms/PasswordChange.php:43 application/forms/Preferences.php:35 msgid "Save" msgstr "Zapisz" #: application/controllers/LocaleController.php:303 #: application/controllers/LocaleController.php:327 -#: application/forms/EditAudioMD.php:278 application/forms/EditHistory.php:141 +#: application/forms/EditAudioMD.php:270 application/forms/EditHistory.php:141 msgid "Cancel" msgstr "Anuluj" @@ -3205,31 +3205,27 @@ msgid "Mood:" msgstr "Nastrój:" #: application/forms/EditAudioMD.php:196 -msgid "Replay Gain:" -msgstr "" - -#: application/forms/EditAudioMD.php:204 msgid "BPM:" msgstr "BPM:" -#: application/forms/EditAudioMD.php:215 +#: application/forms/EditAudioMD.php:207 msgid "Copyright:" msgstr "Prawa autorskie:" -#: application/forms/EditAudioMD.php:225 +#: application/forms/EditAudioMD.php:217 msgid "ISRC Number:" msgstr "Numer ISRC:" -#: application/forms/EditAudioMD.php:235 +#: application/forms/EditAudioMD.php:227 msgid "Website:" msgstr "Strona internetowa:" -#: application/forms/EditAudioMD.php:245 application/forms/EditUser.php:118 +#: application/forms/EditAudioMD.php:237 application/forms/EditUser.php:118 #: application/forms/Login.php:67 msgid "Language:" msgstr "Język:" -#: application/forms/EditAudioMD.php:298 +#: application/forms/EditAudioMD.php:290 msgid "Publish..." msgstr "" diff --git a/legacy/locale/pt_BR/LC_MESSAGES/libretime.po b/legacy/locale/pt_BR/LC_MESSAGES/libretime.po index 67ffd961a..156689401 100644 --- a/legacy/locale/pt_BR/LC_MESSAGES/libretime.po +++ b/legacy/locale/pt_BR/LC_MESSAGES/libretime.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: LibreTime\n" "Report-Msgid-Bugs-To: https://github.com/libretime/libretime/issues\n" -"POT-Creation-Date: 2024-04-29 01:54+0000\n" +"POT-Creation-Date: 2024-05-06 01:56+0000\n" "PO-Revision-Date: 2023-03-26 18:38+0000\n" "Last-Translator: Felipe Nogueira \n" "Language-Team: Portuguese (Brazil) \n" @@ -2039,14 +2039,14 @@ msgstr "Movendo %s itens" #: application/controllers/LocaleController.php:302 #: application/forms/AddTracktype.php:75 application/forms/AddUser.php:108 -#: application/forms/EditAudioMD.php:288 application/forms/EditHistory.php:131 +#: application/forms/EditAudioMD.php:280 application/forms/EditHistory.php:131 #: application/forms/PasswordChange.php:43 application/forms/Preferences.php:35 msgid "Save" msgstr "Salvar" #: application/controllers/LocaleController.php:303 #: application/controllers/LocaleController.php:327 -#: application/forms/EditAudioMD.php:278 application/forms/EditHistory.php:141 +#: application/forms/EditAudioMD.php:270 application/forms/EditHistory.php:141 msgid "Cancel" msgstr "Cancelar" @@ -3206,31 +3206,27 @@ msgid "Mood:" msgstr "Humor:" #: application/forms/EditAudioMD.php:196 -msgid "Replay Gain:" -msgstr "" - -#: application/forms/EditAudioMD.php:204 msgid "BPM:" msgstr "BPM:" -#: application/forms/EditAudioMD.php:215 +#: application/forms/EditAudioMD.php:207 msgid "Copyright:" msgstr "Copyright:" -#: application/forms/EditAudioMD.php:225 +#: application/forms/EditAudioMD.php:217 msgid "ISRC Number:" msgstr "Número ISRC:" -#: application/forms/EditAudioMD.php:235 +#: application/forms/EditAudioMD.php:227 msgid "Website:" msgstr "Website:" -#: application/forms/EditAudioMD.php:245 application/forms/EditUser.php:118 +#: application/forms/EditAudioMD.php:237 application/forms/EditUser.php:118 #: application/forms/Login.php:67 msgid "Language:" msgstr "Idioma:" -#: application/forms/EditAudioMD.php:298 +#: application/forms/EditAudioMD.php:290 msgid "Publish..." msgstr "" diff --git a/legacy/locale/ru_RU/LC_MESSAGES/libretime.po b/legacy/locale/ru_RU/LC_MESSAGES/libretime.po index ca62e4bc7..ad8a6e33c 100644 --- a/legacy/locale/ru_RU/LC_MESSAGES/libretime.po +++ b/legacy/locale/ru_RU/LC_MESSAGES/libretime.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: LibreTime\n" "Report-Msgid-Bugs-To: https://github.com/libretime/libretime/issues\n" -"POT-Creation-Date: 2024-04-29 01:54+0000\n" +"POT-Creation-Date: 2024-05-06 01:56+0000\n" "PO-Revision-Date: 2022-06-05 10:17+0000\n" "Last-Translator: МАН69К \n" "Language-Team: Russian \n" @@ -2051,14 +2051,14 @@ msgstr "Перемещение %s элементов" #: application/controllers/LocaleController.php:302 #: application/forms/AddTracktype.php:75 application/forms/AddUser.php:108 -#: application/forms/EditAudioMD.php:288 application/forms/EditHistory.php:131 +#: application/forms/EditAudioMD.php:280 application/forms/EditHistory.php:131 #: application/forms/PasswordChange.php:43 application/forms/Preferences.php:35 msgid "Save" msgstr "Сохранить" #: application/controllers/LocaleController.php:303 #: application/controllers/LocaleController.php:327 -#: application/forms/EditAudioMD.php:278 application/forms/EditHistory.php:141 +#: application/forms/EditAudioMD.php:270 application/forms/EditHistory.php:141 msgid "Cancel" msgstr "Отменить" @@ -3220,31 +3220,27 @@ msgid "Mood:" msgstr "Настроение:" #: application/forms/EditAudioMD.php:196 -msgid "Replay Gain:" -msgstr "" - -#: application/forms/EditAudioMD.php:204 msgid "BPM:" msgstr "BPM:" -#: application/forms/EditAudioMD.php:215 +#: application/forms/EditAudioMD.php:207 msgid "Copyright:" msgstr "Авторское право:" -#: application/forms/EditAudioMD.php:225 +#: application/forms/EditAudioMD.php:217 msgid "ISRC Number:" msgstr "ISRC номер:" -#: application/forms/EditAudioMD.php:235 +#: application/forms/EditAudioMD.php:227 msgid "Website:" msgstr "Сайт:" -#: application/forms/EditAudioMD.php:245 application/forms/EditUser.php:118 +#: application/forms/EditAudioMD.php:237 application/forms/EditUser.php:118 #: application/forms/Login.php:67 msgid "Language:" msgstr "Язык:" -#: application/forms/EditAudioMD.php:298 +#: application/forms/EditAudioMD.php:290 msgid "Publish..." msgstr "Опубликовать..." diff --git a/legacy/locale/sr_RS/LC_MESSAGES/libretime.po b/legacy/locale/sr_RS/LC_MESSAGES/libretime.po index af30d376e..caf1ce9c8 100644 --- a/legacy/locale/sr_RS/LC_MESSAGES/libretime.po +++ b/legacy/locale/sr_RS/LC_MESSAGES/libretime.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: LibreTime\n" "Report-Msgid-Bugs-To: https://github.com/libretime/libretime/issues\n" -"POT-Creation-Date: 2024-04-29 01:54+0000\n" +"POT-Creation-Date: 2024-05-06 01:56+0000\n" "PO-Revision-Date: 2015-09-05 08:33+0000\n" "Last-Translator: Daniel James \n" "Language-Team: Serbian (Serbia)\n" @@ -2036,14 +2036,14 @@ msgstr "Премештање %s Ставке" #: application/controllers/LocaleController.php:302 #: application/forms/AddTracktype.php:75 application/forms/AddUser.php:108 -#: application/forms/EditAudioMD.php:288 application/forms/EditHistory.php:131 +#: application/forms/EditAudioMD.php:280 application/forms/EditHistory.php:131 #: application/forms/PasswordChange.php:43 application/forms/Preferences.php:35 msgid "Save" msgstr "Сачувај" #: application/controllers/LocaleController.php:303 #: application/controllers/LocaleController.php:327 -#: application/forms/EditAudioMD.php:278 application/forms/EditHistory.php:141 +#: application/forms/EditAudioMD.php:270 application/forms/EditHistory.php:141 msgid "Cancel" msgstr "Одустани" @@ -3203,31 +3203,27 @@ msgid "Mood:" msgstr "Расположење:" #: application/forms/EditAudioMD.php:196 -msgid "Replay Gain:" -msgstr "" - -#: application/forms/EditAudioMD.php:204 msgid "BPM:" msgstr "BPM:" -#: application/forms/EditAudioMD.php:215 +#: application/forms/EditAudioMD.php:207 msgid "Copyright:" msgstr "Ауторско право:" -#: application/forms/EditAudioMD.php:225 +#: application/forms/EditAudioMD.php:217 msgid "ISRC Number:" msgstr "ISRC Број:" -#: application/forms/EditAudioMD.php:235 +#: application/forms/EditAudioMD.php:227 msgid "Website:" msgstr "Веб страница:" -#: application/forms/EditAudioMD.php:245 application/forms/EditUser.php:118 +#: application/forms/EditAudioMD.php:237 application/forms/EditUser.php:118 #: application/forms/Login.php:67 msgid "Language:" msgstr "Језик:" -#: application/forms/EditAudioMD.php:298 +#: application/forms/EditAudioMD.php:290 msgid "Publish..." msgstr "" diff --git a/legacy/locale/sr_RS@latin/LC_MESSAGES/libretime.po b/legacy/locale/sr_RS@latin/LC_MESSAGES/libretime.po index 5c28cf751..af18eaef6 100644 --- a/legacy/locale/sr_RS@latin/LC_MESSAGES/libretime.po +++ b/legacy/locale/sr_RS@latin/LC_MESSAGES/libretime.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: LibreTime\n" "Report-Msgid-Bugs-To: https://github.com/libretime/libretime/issues\n" -"POT-Creation-Date: 2024-04-29 01:54+0000\n" +"POT-Creation-Date: 2024-05-06 01:56+0000\n" "PO-Revision-Date: 2015-09-05 08:33+0000\n" "Last-Translator: Daniel James \n" "Language-Team: Serbian (Latin) (Serbia)\n" @@ -2036,14 +2036,14 @@ msgstr "Premeštanje %s Stavke" #: application/controllers/LocaleController.php:302 #: application/forms/AddTracktype.php:75 application/forms/AddUser.php:108 -#: application/forms/EditAudioMD.php:288 application/forms/EditHistory.php:131 +#: application/forms/EditAudioMD.php:280 application/forms/EditHistory.php:131 #: application/forms/PasswordChange.php:43 application/forms/Preferences.php:35 msgid "Save" msgstr "Sačuvaj" #: application/controllers/LocaleController.php:303 #: application/controllers/LocaleController.php:327 -#: application/forms/EditAudioMD.php:278 application/forms/EditHistory.php:141 +#: application/forms/EditAudioMD.php:270 application/forms/EditHistory.php:141 msgid "Cancel" msgstr "Odustani" @@ -3203,31 +3203,27 @@ msgid "Mood:" msgstr "Raspoloženje:" #: application/forms/EditAudioMD.php:196 -msgid "Replay Gain:" -msgstr "" - -#: application/forms/EditAudioMD.php:204 msgid "BPM:" msgstr "BPM:" -#: application/forms/EditAudioMD.php:215 +#: application/forms/EditAudioMD.php:207 msgid "Copyright:" msgstr "Autorsko pravo:" -#: application/forms/EditAudioMD.php:225 +#: application/forms/EditAudioMD.php:217 msgid "ISRC Number:" msgstr "ISRC Broj:" -#: application/forms/EditAudioMD.php:235 +#: application/forms/EditAudioMD.php:227 msgid "Website:" msgstr "Veb stranica:" -#: application/forms/EditAudioMD.php:245 application/forms/EditUser.php:118 +#: application/forms/EditAudioMD.php:237 application/forms/EditUser.php:118 #: application/forms/Login.php:67 msgid "Language:" msgstr "Jezik:" -#: application/forms/EditAudioMD.php:298 +#: application/forms/EditAudioMD.php:290 msgid "Publish..." msgstr "" diff --git a/legacy/locale/tr_TR/LC_MESSAGES/libretime.po b/legacy/locale/tr_TR/LC_MESSAGES/libretime.po index b8ef51048..4c2f388f9 100644 --- a/legacy/locale/tr_TR/LC_MESSAGES/libretime.po +++ b/legacy/locale/tr_TR/LC_MESSAGES/libretime.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: LibreTime\n" "Report-Msgid-Bugs-To: https://github.com/libretime/libretime/issues\n" -"POT-Creation-Date: 2024-04-29 01:54+0000\n" +"POT-Creation-Date: 2024-05-06 01:56+0000\n" "PO-Revision-Date: 2022-06-28 07:22+0000\n" "Last-Translator: metezd \n" "Language-Team: Turkish \n" @@ -2035,14 +2035,14 @@ msgstr "" #: application/controllers/LocaleController.php:302 #: application/forms/AddTracktype.php:75 application/forms/AddUser.php:108 -#: application/forms/EditAudioMD.php:288 application/forms/EditHistory.php:131 +#: application/forms/EditAudioMD.php:280 application/forms/EditHistory.php:131 #: application/forms/PasswordChange.php:43 application/forms/Preferences.php:35 msgid "Save" msgstr "Kaydet" #: application/controllers/LocaleController.php:303 #: application/controllers/LocaleController.php:327 -#: application/forms/EditAudioMD.php:278 application/forms/EditHistory.php:141 +#: application/forms/EditAudioMD.php:270 application/forms/EditHistory.php:141 msgid "Cancel" msgstr "İptal" @@ -3202,31 +3202,27 @@ msgid "Mood:" msgstr "Ruh Hali:" #: application/forms/EditAudioMD.php:196 -msgid "Replay Gain:" -msgstr "" - -#: application/forms/EditAudioMD.php:204 msgid "BPM:" msgstr "BPM:" -#: application/forms/EditAudioMD.php:215 +#: application/forms/EditAudioMD.php:207 msgid "Copyright:" msgstr "Telif Hakkı:" -#: application/forms/EditAudioMD.php:225 +#: application/forms/EditAudioMD.php:217 msgid "ISRC Number:" msgstr "ISRC No:" -#: application/forms/EditAudioMD.php:235 +#: application/forms/EditAudioMD.php:227 msgid "Website:" msgstr "Websitesi:" -#: application/forms/EditAudioMD.php:245 application/forms/EditUser.php:118 +#: application/forms/EditAudioMD.php:237 application/forms/EditUser.php:118 #: application/forms/Login.php:67 msgid "Language:" msgstr "Dil:" -#: application/forms/EditAudioMD.php:298 +#: application/forms/EditAudioMD.php:290 msgid "Publish..." msgstr "" diff --git a/legacy/locale/uk_UA/LC_MESSAGES/libretime.po b/legacy/locale/uk_UA/LC_MESSAGES/libretime.po index d0c1dfd73..596be6805 100644 --- a/legacy/locale/uk_UA/LC_MESSAGES/libretime.po +++ b/legacy/locale/uk_UA/LC_MESSAGES/libretime.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: LibreTime\n" "Report-Msgid-Bugs-To: https://github.com/libretime/libretime/issues\n" -"POT-Creation-Date: 2024-04-29 01:54+0000\n" +"POT-Creation-Date: 2024-05-06 01:56+0000\n" "PO-Revision-Date: 2024-02-11 23:11+0000\n" "Last-Translator: Ihor Hordiichuk \n" "Language-Team: Ukrainian \n" @@ -2043,14 +2043,14 @@ msgstr "Переміщення %s елементів" #: application/controllers/LocaleController.php:302 #: application/forms/AddTracktype.php:75 application/forms/AddUser.php:108 -#: application/forms/EditAudioMD.php:288 application/forms/EditHistory.php:131 +#: application/forms/EditAudioMD.php:280 application/forms/EditHistory.php:131 #: application/forms/PasswordChange.php:43 application/forms/Preferences.php:35 msgid "Save" msgstr "Зберегти" #: application/controllers/LocaleController.php:303 #: application/controllers/LocaleController.php:327 -#: application/forms/EditAudioMD.php:278 application/forms/EditHistory.php:141 +#: application/forms/EditAudioMD.php:270 application/forms/EditHistory.php:141 msgid "Cancel" msgstr "Відміна" @@ -3212,31 +3212,27 @@ msgid "Mood:" msgstr "Настрій:" #: application/forms/EditAudioMD.php:196 -msgid "Replay Gain:" -msgstr "" - -#: application/forms/EditAudioMD.php:204 msgid "BPM:" msgstr "BPM:" -#: application/forms/EditAudioMD.php:215 +#: application/forms/EditAudioMD.php:207 msgid "Copyright:" msgstr "Авторське право:" -#: application/forms/EditAudioMD.php:225 +#: application/forms/EditAudioMD.php:217 msgid "ISRC Number:" msgstr "Номер ISRC:" -#: application/forms/EditAudioMD.php:235 +#: application/forms/EditAudioMD.php:227 msgid "Website:" msgstr "Веб-сайт:" -#: application/forms/EditAudioMD.php:245 application/forms/EditUser.php:118 +#: application/forms/EditAudioMD.php:237 application/forms/EditUser.php:118 #: application/forms/Login.php:67 msgid "Language:" msgstr "Мова:" -#: application/forms/EditAudioMD.php:298 +#: application/forms/EditAudioMD.php:290 msgid "Publish..." msgstr "Опублікувати..." diff --git a/legacy/locale/zh_CN/LC_MESSAGES/libretime.po b/legacy/locale/zh_CN/LC_MESSAGES/libretime.po index 83e96bcbd..238607b0c 100644 --- a/legacy/locale/zh_CN/LC_MESSAGES/libretime.po +++ b/legacy/locale/zh_CN/LC_MESSAGES/libretime.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: LibreTime\n" "Report-Msgid-Bugs-To: https://github.com/libretime/libretime/issues\n" -"POT-Creation-Date: 2024-04-29 01:54+0000\n" +"POT-Creation-Date: 2024-05-06 01:56+0000\n" "PO-Revision-Date: 2015-09-05 08:33+0000\n" "Last-Translator: Daniel James \n" "Language-Team: Chinese (China)\n" @@ -2036,14 +2036,14 @@ msgstr "移动%s个项目" #: application/controllers/LocaleController.php:302 #: application/forms/AddTracktype.php:75 application/forms/AddUser.php:108 -#: application/forms/EditAudioMD.php:288 application/forms/EditHistory.php:131 +#: application/forms/EditAudioMD.php:280 application/forms/EditHistory.php:131 #: application/forms/PasswordChange.php:43 application/forms/Preferences.php:35 msgid "Save" msgstr "保存" #: application/controllers/LocaleController.php:303 #: application/controllers/LocaleController.php:327 -#: application/forms/EditAudioMD.php:278 application/forms/EditHistory.php:141 +#: application/forms/EditAudioMD.php:270 application/forms/EditHistory.php:141 msgid "Cancel" msgstr "取消" @@ -3203,31 +3203,27 @@ msgid "Mood:" msgstr "情怀：" #: application/forms/EditAudioMD.php:196 -msgid "Replay Gain:" -msgstr "" - -#: application/forms/EditAudioMD.php:204 msgid "BPM:" msgstr "拍子（BPM）：" -#: application/forms/EditAudioMD.php:215 +#: application/forms/EditAudioMD.php:207 msgid "Copyright:" msgstr "版权：" -#: application/forms/EditAudioMD.php:225 +#: application/forms/EditAudioMD.php:217 msgid "ISRC Number:" msgstr "ISRC编号：" -#: application/forms/EditAudioMD.php:235 +#: application/forms/EditAudioMD.php:227 msgid "Website:" msgstr "网站：" -#: application/forms/EditAudioMD.php:245 application/forms/EditUser.php:118 +#: application/forms/EditAudioMD.php:237 application/forms/EditUser.php:118 #: application/forms/Login.php:67 msgid "Language:" msgstr "语言：" -#: application/forms/EditAudioMD.php:298 +#: application/forms/EditAudioMD.php:290 msgid "Publish..." msgstr "" From f77c8dbaaad6615b1cb9e83eb41177b8424e3a60 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 11 May 2024 11:10:18 +0200 Subject: [PATCH 02/29] chore(deps): update dependency friendsofphp/php-cs-fixer to <3.56.2 (#3008) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [friendsofphp/php-cs-fixer](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer) | `<3.54.1` -> `<3.56.2` | [![age](https://developer.mend.io/api/mc/badges/age/packagist/friendsofphp%2fphp-cs-fixer/3.56.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/packagist/friendsofphp%2fphp-cs-fixer/3.56.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/packagist/friendsofphp%2fphp-cs-fixer/3.54.0/3.56.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/packagist/friendsofphp%2fphp-cs-fixer/3.54.0/3.56.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
PHP-CS-Fixer/PHP-CS-Fixer (friendsofphp/php-cs-fixer) ### [`v3.56.1`](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/HEAD/CHANGELOG.md#Changelog-for-v3561) [Compare Source](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/compare/v3.56.0...v3.56.1) - chore: improve PHPDoc typehints ([#​7994](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7994)) - CI: Allow any integer in PHPStan error for Token's constructor ([#​8000](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8000)) - fix: Better array shape in `PhpUnitDedicateAssertFixer` ([#​7999](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7999)) - fix: `ConstantCaseFixer` - do not touch typed constants ([#​7998](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7998)) ### [`v3.56.0`](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/HEAD/CHANGELOG.md#Changelog-for-v3560) [Compare Source](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/compare/v3.55.0...v3.56.0) - feat: `TrailingCommaInMultilineFixer` - handle trailing comma in language constructs ([#​7989](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7989)) - fix: `TrailingCommaInMultilineFixer` - language constructs should be covered by arguments, not parameters ([#​7990](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7990)) - chore: remove invalid comment ([#​7987](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7987)) - DX: Cache optimisation ([#​7985](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7985)) ### [`v3.55.0`](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/HEAD/CHANGELOG.md#Changelog-for-v3550) [Compare Source](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/compare/v3.54.0...v3.55.0) - feat: Introduce `OrderedAttributesFixer` ([#​7395](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7395)) - chore: few SCA fixes and dev-tools update ([#​7969](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7969)) - chore: fix phpdoc types ([#​7977](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7977)) - chore: narrow PHPDoc types ([#​7979](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7979)) - chore: Normalize implicit backslahes in single quoted strings internally ([#​7786](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7786)) - chore: phpdoc - rely on strict list/tuple/assoc instead of array ([#​7978](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7978)) - chore: PhpUnitDataProviderNameFixer - follow config creation pattern ([#​7980](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7980)) - chore: Preg - drop half-support for array-pattern ([#​7976](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7976)) - chore: re-use CodeHasher ([#​7984](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7984)) - chore: RuleSetsTest - assert that Fixer is configurable ([#​7961](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7961)) - chore: sugar syntax ([#​7986](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7986)) - chore: Tokens should be always a list ([#​7698](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7698)) - CI: Ad-hoc fix for MacOS jobs ([#​7970](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7970)) - CI: Fix calculating diff between branches in PRs ([#​7973](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7973)) - DX: allow to enforce cache mechanism by env var ([#​7983](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7983)) - DX: do not typehint fixed-length arrays as lists ([#​7974](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7974)) - DX: Prevent having deprecated fixers listed as successors of other deprecated fixers ([#​7967](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7967)) - DX: Resolve/Ignore PHPStan issues on level 6 + bump to level 7 with new baseline ([#​7971](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7971)) - DX: use `list` type in PHPDoc ([#​7975](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7975)) - fix: `PhpUnitAttributesFixer` - fix for `#[RequiresPhp]` exceeding its constructor parameters ([#​7966](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7966)) - test: don't count comment after class as another classy element ([#​7982](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7982))
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/libretime/libretime). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- legacy/tools/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/legacy/tools/composer.json b/legacy/tools/composer.json index 3137d37b2..4d71fd512 100644 --- a/legacy/tools/composer.json +++ b/legacy/tools/composer.json @@ -1,6 +1,6 @@ { "require-dev": { "php": "^7.4", - "friendsofphp/php-cs-fixer": "<3.54.1" + "friendsofphp/php-cs-fixer": "<3.56.2" } } From 848612ae6fc44860f5547fb78371c4da7ca48ab2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 11 May 2024 09:11:22 +0000 Subject: [PATCH 03/29] chore(deps): update pre-commit hook adamchainz/django-upgrade to v1.17.0 --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 276cc80ac..7c57579fe 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -42,7 +42,7 @@ repos: args: [--py38-plus] - repo: https://github.com/adamchainz/django-upgrade - rev: 1.16.0 + rev: 1.17.0 hooks: - id: django-upgrade args: [--target-version, "4.2"] From 5d2ad4303938055457654e9ab85318c1dccbe2ab Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 13 May 2024 04:13:08 +0000 Subject: [PATCH 04/29] chore(deps): lock file maintenance (legacy/composer.json) --- legacy/composer.lock | 111 +++++++++++++++++++++++++++++++++---------- 1 file changed, 87 insertions(+), 24 deletions(-) diff --git a/legacy/composer.lock b/legacy/composer.lock index 035b67e5d..c1d9113a8 100644 --- a/legacy/composer.lock +++ b/legacy/composer.lock @@ -531,16 +531,16 @@ }, { "name": "paragonie/constant_time_encoding", - "version": "v2.6.3", + "version": "v2.7.0", "source": { "type": "git", "url": "https://github.com/paragonie/constant_time_encoding.git", - "reference": "58c3f47f650c94ec05a151692652a868995d2938" + "reference": "52a0d99e69f56b9ec27ace92ba56897fe6993105" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/58c3f47f650c94ec05a151692652a868995d2938", - "reference": "58c3f47f650c94ec05a151692652a868995d2938", + "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/52a0d99e69f56b9ec27ace92ba56897fe6993105", + "reference": "52a0d99e69f56b9ec27ace92ba56897fe6993105", "shasum": "" }, "require": { @@ -594,7 +594,7 @@ "issues": "https://github.com/paragonie/constant_time_encoding/issues", "source": "https://github.com/paragonie/constant_time_encoding" }, - "time": "2022-06-14T06:56:20+00:00" + "time": "2024-05-08T12:18:48+00:00" }, { "name": "paragonie/random_compat", @@ -1080,16 +1080,16 @@ }, { "name": "symfony/config", - "version": "v5.4.38", + "version": "v5.4.39", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "3dcd47d4bbd9fea4d1210e7a7a0a5ca02d99df14" + "reference": "62cec4a067931552624a9962002c210c502d42fd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/3dcd47d4bbd9fea4d1210e7a7a0a5ca02d99df14", - "reference": "3dcd47d4bbd9fea4d1210e7a7a0a5ca02d99df14", + "url": "https://api.github.com/repos/symfony/config/zipball/62cec4a067931552624a9962002c210c502d42fd", + "reference": "62cec4a067931552624a9962002c210c502d42fd", "shasum": "" }, "require": { @@ -1139,7 +1139,7 @@ "description": "Helps you find, load, combine, autofill and validate configuration values of any kind", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/config/tree/v5.4.38" + "source": "https://github.com/symfony/config/tree/v5.4.39" }, "funding": [ { @@ -1155,7 +1155,7 @@ "type": "tidelift" } ], - "time": "2024-03-22T10:04:40+00:00" + "time": "2024-04-18T08:26:06+00:00" }, { "name": "symfony/deprecation-contracts", @@ -1226,23 +1226,24 @@ }, { "name": "symfony/filesystem", - "version": "v5.4.38", + "version": "v5.4.39", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "899330a01056077271e2f614c7b28b0379a671eb" + "reference": "e6edd875d5d39b03de51f3c3951148cfa79a4d12" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/899330a01056077271e2f614c7b28b0379a671eb", - "reference": "899330a01056077271e2f614c7b28b0379a671eb", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/e6edd875d5d39b03de51f3c3951148cfa79a4d12", + "reference": "e6edd875d5d39b03de51f3c3951148cfa79a4d12", "shasum": "" }, "require": { "php": ">=7.2.5", "symfony/polyfill-ctype": "~1.8", "symfony/polyfill-mbstring": "~1.8", - "symfony/polyfill-php80": "^1.16" + "symfony/polyfill-php80": "^1.16", + "symfony/process": "^5.4|^6.4" }, "type": "library", "autoload": { @@ -1270,7 +1271,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v5.4.38" + "source": "https://github.com/symfony/filesystem/tree/v5.4.39" }, "funding": [ { @@ -1286,7 +1287,7 @@ "type": "tidelift" } ], - "time": "2024-03-21T08:05:07+00:00" + "time": "2024-04-18T08:26:06+00:00" }, { "name": "symfony/polyfill-ctype", @@ -1603,6 +1604,68 @@ ], "time": "2024-01-29T20:11:03+00:00" }, + { + "name": "symfony/process", + "version": "v5.4.39", + "source": { + "type": "git", + "url": "https://github.com/symfony/process.git", + "reference": "85a554acd7c28522241faf2e97b9541247a0d3d5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/process/zipball/85a554acd7c28522241faf2e97b9541247a0d3d5", + "reference": "85a554acd7c28522241faf2e97b9541247a0d3d5", + "shasum": "" + }, + "require": { + "php": ">=7.2.5", + "symfony/polyfill-php80": "^1.16" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Process\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Executes commands in sub-processes", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/process/tree/v5.4.39" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-04-18T08:26:06+00:00" + }, { "name": "zf1s/zend-acl", "version": "1.15.5", @@ -3738,16 +3801,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.28.0", + "version": "1.29.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb" + "reference": "536889f2b340489d328f5ffb7b02bb6b183ddedc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb", - "reference": "cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/536889f2b340489d328f5ffb7b02bb6b183ddedc", + "reference": "536889f2b340489d328f5ffb7b02bb6b183ddedc", "shasum": "" }, "require": { @@ -3779,9 +3842,9 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.28.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.29.0" }, - "time": "2024-04-03T18:51:33+00:00" + "time": "2024-05-06T12:04:23+00:00" }, { "name": "phpunit/dbunit", From 9974b4631d791e54ef38391132b80494528fb99c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 28 May 2024 21:09:39 +0000 Subject: [PATCH 05/29] chore(deps): update pre-commit hook adamchainz/django-upgrade to v1.18.0 --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7c57579fe..a0d806d00 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -42,7 +42,7 @@ repos: args: [--py38-plus] - repo: https://github.com/adamchainz/django-upgrade - rev: 1.17.0 + rev: 1.18.0 hooks: - id: django-upgrade args: [--target-version, "4.2"] From c3e30f1857d636c4725b3ade2212b41221d8dd19 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 30 May 2024 01:58:22 +0000 Subject: [PATCH 06/29] chore(deps): update pre-commit hook codespell-project/codespell to v2.3.0 --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a0d806d00..461b889f9 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -59,7 +59,7 @@ repos: - id: black - repo: https://github.com/codespell-project/codespell - rev: v2.2.6 + rev: v2.3.0 hooks: - id: codespell args: [--ignore-words=.codespellignore] From 6432efd791f8f55e990ecb796e5db96b0d9100c0 Mon Sep 17 00:00:00 2001 From: Kyle Robbertze Date: Wed, 5 Jun 2024 16:54:12 +0100 Subject: [PATCH 07/29] docs: fix typo (#3027) Minor typo that was being picked up by pre-commit --- docs/admin-manual/custom-authentication.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/admin-manual/custom-authentication.md b/docs/admin-manual/custom-authentication.md index c9cde9fe4..cadd9c6f8 100644 --- a/docs/admin-manual/custom-authentication.md +++ b/docs/admin-manual/custom-authentication.md @@ -50,7 +50,7 @@ check them against pam. The above configuration expects a PAM configuration for the `http-libretime` service. -To confiure this you need to create the file `/etc/pam.d/http-libretime` with the following contents. +To configure this you need to create the file `/etc/pam.d/http-libretime` with the following contents. ``` auth required pam_sss.so From 10996e847b0836146f751fd03e58dff3de726020 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 5 Jun 2024 15:55:48 +0000 Subject: [PATCH 08/29] chore(deps): lock file maintenance (legacy/composer.json) --- legacy/composer.lock | 114 ++++++++++--------------------------------- 1 file changed, 27 insertions(+), 87 deletions(-) diff --git a/legacy/composer.lock b/legacy/composer.lock index c1d9113a8..9df936b15 100644 --- a/legacy/composer.lock +++ b/legacy/composer.lock @@ -1080,16 +1080,16 @@ }, { "name": "symfony/config", - "version": "v5.4.39", + "version": "v5.4.40", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "62cec4a067931552624a9962002c210c502d42fd" + "reference": "d4e1db78421163b98dd9971d247fd0df4a57ee5e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/62cec4a067931552624a9962002c210c502d42fd", - "reference": "62cec4a067931552624a9962002c210c502d42fd", + "url": "https://api.github.com/repos/symfony/config/zipball/d4e1db78421163b98dd9971d247fd0df4a57ee5e", + "reference": "d4e1db78421163b98dd9971d247fd0df4a57ee5e", "shasum": "" }, "require": { @@ -1139,7 +1139,7 @@ "description": "Helps you find, load, combine, autofill and validate configuration values of any kind", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/config/tree/v5.4.39" + "source": "https://github.com/symfony/config/tree/v5.4.40" }, "funding": [ { @@ -1155,7 +1155,7 @@ "type": "tidelift" } ], - "time": "2024-04-18T08:26:06+00:00" + "time": "2024-05-31T14:33:22+00:00" }, { "name": "symfony/deprecation-contracts", @@ -1226,23 +1226,25 @@ }, { "name": "symfony/filesystem", - "version": "v5.4.39", + "version": "v5.4.40", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "e6edd875d5d39b03de51f3c3951148cfa79a4d12" + "reference": "26dd9912df6940810ea00f8f53ad48d6a3424995" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/e6edd875d5d39b03de51f3c3951148cfa79a4d12", - "reference": "e6edd875d5d39b03de51f3c3951148cfa79a4d12", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/26dd9912df6940810ea00f8f53ad48d6a3424995", + "reference": "26dd9912df6940810ea00f8f53ad48d6a3424995", "shasum": "" }, "require": { "php": ">=7.2.5", "symfony/polyfill-ctype": "~1.8", "symfony/polyfill-mbstring": "~1.8", - "symfony/polyfill-php80": "^1.16", + "symfony/polyfill-php80": "^1.16" + }, + "require-dev": { "symfony/process": "^5.4|^6.4" }, "type": "library", @@ -1271,7 +1273,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v5.4.39" + "source": "https://github.com/symfony/filesystem/tree/v5.4.40" }, "funding": [ { @@ -1287,7 +1289,7 @@ "type": "tidelift" } ], - "time": "2024-04-18T08:26:06+00:00" + "time": "2024-05-31T14:33:22+00:00" }, { "name": "symfony/polyfill-ctype", @@ -1604,68 +1606,6 @@ ], "time": "2024-01-29T20:11:03+00:00" }, - { - "name": "symfony/process", - "version": "v5.4.39", - "source": { - "type": "git", - "url": "https://github.com/symfony/process.git", - "reference": "85a554acd7c28522241faf2e97b9541247a0d3d5" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/85a554acd7c28522241faf2e97b9541247a0d3d5", - "reference": "85a554acd7c28522241faf2e97b9541247a0d3d5", - "shasum": "" - }, - "require": { - "php": ">=7.2.5", - "symfony/polyfill-php80": "^1.16" - }, - "type": "library", - "autoload": { - "psr-4": { - "Symfony\\Component\\Process\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Executes commands in sub-processes", - "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/process/tree/v5.4.39" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2024-04-18T08:26:06+00:00" - }, { "name": "zf1s/zend-acl", "version": "1.15.5", @@ -3612,16 +3552,16 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "5.4.0", + "version": "5.4.1", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "298d2febfe79d03fe714eb871d5538da55205b1a" + "reference": "9d07b3f7fdcf5efec5d1609cba3c19c5ea2bdc9c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/298d2febfe79d03fe714eb871d5538da55205b1a", - "reference": "298d2febfe79d03fe714eb871d5538da55205b1a", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/9d07b3f7fdcf5efec5d1609cba3c19c5ea2bdc9c", + "reference": "9d07b3f7fdcf5efec5d1609cba3c19c5ea2bdc9c", "shasum": "" }, "require": { @@ -3670,9 +3610,9 @@ "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", "support": { "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.4.0" + "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.4.1" }, - "time": "2024-04-09T21:13:58+00:00" + "time": "2024-05-21T05:55:05+00:00" }, { "name": "phpdocumentor/type-resolver", @@ -3801,16 +3741,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.29.0", + "version": "1.29.1", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "536889f2b340489d328f5ffb7b02bb6b183ddedc" + "reference": "fcaefacf2d5c417e928405b71b400d4ce10daaf4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/536889f2b340489d328f5ffb7b02bb6b183ddedc", - "reference": "536889f2b340489d328f5ffb7b02bb6b183ddedc", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/fcaefacf2d5c417e928405b71b400d4ce10daaf4", + "reference": "fcaefacf2d5c417e928405b71b400d4ce10daaf4", "shasum": "" }, "require": { @@ -3842,9 +3782,9 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.29.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.29.1" }, - "time": "2024-05-06T12:04:23+00:00" + "time": "2024-05-31T08:52:43+00:00" }, { "name": "phpunit/dbunit", From 2b43e51ed140bf307e491f0fcb7b84f95709d604 Mon Sep 17 00:00:00 2001 From: Rob Hailman Date: Wed, 5 Jun 2024 12:01:57 -0400 Subject: [PATCH 09/29] fix: playlist allocates inaccurate time to smartblocks (#3026) ### Description In the existing logic of `retrieveMediaFiles`, the time remaining in show is calculated incorrectly in some scenarios. Each time a duration is subtracted from `showLimit`, it is not the duration of the files just added, but instead the length of all files scheduled. This can cause cases where a smart block set to "time remaining in show" fails to completely fill the program. For example, given a 30 minute show, and a playlist like follows: 1. a 5 minute track 2. another 5 minute track 3. smart block, set to time remaining in show When item 1 is added, `showLimit` is reduced by 5 minutes as expected. When item 2 is added, `showLimit` is reduced by 10 minutes (as both items 1 and 2 are counted). As a result, the smart block is only run to fill 15 minutes, leaving 5 minutes unfilled. This PR resolves this issue, by recalculating `showLimit` from the original duration rather than subtracting from a running total. This change not does implement a new feature and should not require any changes to documentation. ### Testing Notes **What I did:** - On a dev environment, set up a playlist as described above. - Before applying this PR, created a show and scheduled playlist, and confirmed issue was reproducible - Applied PR and repeated, and confirmed show was filled completely. Also repeated this testing with sample data from our production instance. Here is a sample schedule of the "before" case with sample data, showing the issue ![image](https://github.com/libretime/libretime/assets/8541186/f91849fb-606f-410e-bef5-a7abc8e7b7f4) The smartblock that scheduled the music is set to allow last track to overflow, but 3m55s was left unscheduled. Using the same playlist and same track library, here is a sample schedule after the PR applied: ![image](https://github.com/libretime/libretime/assets/8541186/e9d46fbb-50e6-4859-a3de-f5a90a6021c0) As expected, the show is fully scheduled with the last track overflowing. Additionally, I've applied this PR as a hot fix to our production instance, where it has been running for a week without issue. Also performed spot tests of playlists without smart blocks, smart blocks scheduled directly (not in playlists) and autoloading playlists, with no change in behaviour observed as a result of this change. **How you can replicate my testing:** Same test steps as I followed should be able to reproduce issue & validate fix on any instance. ### **Links** Not directly related to issue fixed by #3019, but also addresses the issue of dead air left at end of blocks. Co-authored-by: Kyle Robbertze --- legacy/application/models/Scheduler.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/legacy/application/models/Scheduler.php b/legacy/application/models/Scheduler.php index 8acf411cc..b9109665b 100644 --- a/legacy/application/models/Scheduler.php +++ b/legacy/application/models/Scheduler.php @@ -219,6 +219,7 @@ final class Application_Model_Scheduler // if there is a show we need to set a show limit to pass to smart blocks in case they use time remaining $showInstance = new Application_Model_ShowInstance($show); $showLimit = $showInstance->getSecondsRemaining(); + $originalShowLimit = $showLimit; $files = []; if ($type === 'audioclip') { @@ -310,7 +311,7 @@ final class Application_Model_Scheduler } // if this is a playlist it might contain multiple time remaining smart blocks // since the schedule isn't updated until after this insert we need to keep tally - $showLimit -= $this->timeLengthOfFiles($files); + $showLimit = $originalShowLimit - $this->timeLengthOfFiles($files); } } elseif ($type == 'stream') { // need to return From 23c74119966730bfbc7a65e43b14ecc90924d177 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 7 Jun 2024 21:52:36 +0200 Subject: [PATCH 10/29] chore(deps): update dependency uvicorn to >=0.17.6,<0.31.0 (#3022) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [uvicorn](https://togithub.com/encode/uvicorn) ([changelog](https://togithub.com/encode/uvicorn/blob/master/CHANGELOG.md)) | `>=0.17.6,<0.30.0` -> `>=0.17.6,<0.31.0` | [![age](https://developer.mend.io/api/mc/badges/age/pypi/uvicorn/0.30.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/pypi/uvicorn/0.30.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/pypi/uvicorn/0.29.0/0.30.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/pypi/uvicorn/0.29.0/0.30.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
encode/uvicorn (uvicorn) ### [`v0.30.0`](https://togithub.com/encode/uvicorn/blob/HEAD/CHANGELOG.md#0300-2024-05-28) [Compare Source](https://togithub.com/encode/uvicorn/compare/0.29.0...0.30.0) ##### Added - New multiprocess manager ([#​2183](https://togithub.com/encode/uvicorn/issues/2183)) - Allow `ConfigParser` or a `io.IO[Any]` on `log_config` ([#​1976](https://togithub.com/encode/uvicorn/issues/1976)) ##### Fixed - Suppress side-effects of signal propagation ([#​2317](https://togithub.com/encode/uvicorn/issues/2317)) - Send `content-length` header on 5xx ([#​2304](https://togithub.com/encode/uvicorn/issues/2304)) ##### Deprecated - Deprecate the `uvicorn.workers` module ([#​2302](https://togithub.com/encode/uvicorn/issues/2302))
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/libretime/libretime). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- api/requirements.txt | 2 +- api/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/requirements.txt b/api/requirements.txt index 0637462c7..7ec90958f 100644 --- a/api/requirements.txt +++ b/api/requirements.txt @@ -8,4 +8,4 @@ drf-spectacular>=0.22.1,<0.28 gunicorn>=22.0.0,<22.1 psycopg[c]>=3.1.8,<3.2 requests>=2.31.0,<2.32 -uvicorn[standard]>=0.17.6,<0.30.0 +uvicorn[standard]>=0.17.6,<0.31.0 diff --git a/api/setup.py b/api/setup.py index 84a74e914..87d70441e 100644 --- a/api/setup.py +++ b/api/setup.py @@ -37,7 +37,7 @@ setup( "prod": [ "gunicorn>=22.0.0,<22.1", "psycopg[c]>=3.1.8,<3.2", - "uvicorn[standard]>=0.17.6,<0.30.0", + "uvicorn[standard]>=0.17.6,<0.31.0", ], "dev": [ "django-coverage-plugin>=3.0.0,<4", From 5ed15f9722114e38a7cec140d9c15d7261600edf Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 7 Jun 2024 21:52:47 +0200 Subject: [PATCH 11/29] chore(deps): update dependency friendsofphp/php-cs-fixer to <3.58.2 (#3016) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [friendsofphp/php-cs-fixer](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer) | `<3.56.2` -> `<3.58.2` | [![age](https://developer.mend.io/api/mc/badges/age/packagist/friendsofphp%2fphp-cs-fixer/3.58.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/packagist/friendsofphp%2fphp-cs-fixer/3.58.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/packagist/friendsofphp%2fphp-cs-fixer/3.56.1/3.58.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/packagist/friendsofphp%2fphp-cs-fixer/3.56.1/3.58.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
PHP-CS-Fixer/PHP-CS-Fixer (friendsofphp/php-cs-fixer) ### [`v3.58.1`](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/HEAD/CHANGELOG.md#Changelog-for-v3581) [Compare Source](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/compare/v3.58.0...v3.58.1) - fix: `ConstantCaseFixer` - do not change class constant usages ([#​8055](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8055)) - fix: `PhpUnitTestClassRequiresCoversFixer` - do not add annotation when attribute with leading slash present ([#​8054](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8054)) ### [`v3.58.0`](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/HEAD/CHANGELOG.md#Changelog-for-v3580) [Compare Source](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/compare/v3.57.2...v3.58.0) - chore(doc): Use FQCN for parallel config in documentation ([#​8029](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8029)) - chore: fix typo in `PhpUnitTestClassRequiresCoversFixerTest` ([#​8047](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8047)) - chore: RandomApiMigrationFixer - do not modify configuration property ([#​8033](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8033)) - chore: Tokens::setCode - further improvements to cache ([#​8053](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8053)) - chore: update PHPStan ([#​8045](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8045)) - docs: Add missing imports in a cookbook about creating custom rules ([#​8031](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8031)) - docs: fix deprecated string interpolation style ([#​8036](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8036)) - docs: global_namespace_import - simplify allowed config types ([#​8023](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8023)) - feat(GroupImportFixer): Ability to configure which type of imports should be grouped ([#​8046](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8046)) - fix: clear `Tokens::$blockStartCache` and `Tokens::$blockEndCache` when calling `Tokens::setCode` ([#​8051](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8051)) - fix: correctly handle PHP closing tag with `simplified_null_return` ([#​8049](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8049)) - fix: `ConstantCaseFixer` - do not change namespace ([#​8004](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8004)) - fix: `PhpUnitAttributesFixer` - do not add attribute if already present ([#​8043](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8043)) - fix: `PhpUnitSizeClassFixer` - do not add annotation when there are attributes ([#​8044](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8044)) - fix: `PhpUnitTestClassRequiresCoversFixer` - attribute detection when class is `readonly` ([#​8042](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8042)) ### [`v3.57.2`](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/HEAD/CHANGELOG.md#Changelog-for-v3572) [Compare Source](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/compare/v3.57.1...v3.57.2) - docs: better ConfigurableFixer allowed types ([#​8024](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8024)) - docs: Improve Docker usage example ([#​8021](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8021)) - feat: Report used memory to 2 decimal digits only ([#​8017](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8017)) - fix: Support named args in `ParallelConfigFactory::detect()` ([#​8026](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8026)) - fix: `php_unit_test_class_requires_covers` Attribute detection when class is final ([#​8016](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8016)) ### [`v3.57.1`](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/HEAD/CHANGELOG.md#Changelog-for-v3571) [Compare Source](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/compare/v3.57.0...v3.57.1) - chore: update PHPDoc in `Preg::matchAll` ([#​8012](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8012)) - fix: Runner - handle no files while in parallel runner ([#​8015](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8015)) ### [`v3.57.0`](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/HEAD/CHANGELOG.md#Changelog-for-v3570) [Compare Source](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/compare/v3.56.2...v3.57.0) - feat: Ability to run Fixer with parallel runner 🎉 ([#​7777](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7777)) ### [`v3.56.2`](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/HEAD/CHANGELOG.md#Changelog-for-v3562) [Compare Source](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/compare/v3.56.1...v3.56.2) - chore: update PHPStan ([#​8010](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8010)) - DX: Fix Mess Detector violations ([#​8007](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8007)) - DX: Install PCov extension for local Docker ([#​8006](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8006))
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/libretime/libretime). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- legacy/tools/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/legacy/tools/composer.json b/legacy/tools/composer.json index 4d71fd512..1e7440071 100644 --- a/legacy/tools/composer.json +++ b/legacy/tools/composer.json @@ -1,6 +1,6 @@ { "require-dev": { "php": "^7.4", - "friendsofphp/php-cs-fixer": "<3.56.2" + "friendsofphp/php-cs-fixer": "<3.58.2" } } From f09bae68568a48e739920aef63eafecbc4b4cbad Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 8 Jun 2024 19:12:19 +0000 Subject: [PATCH 12/29] chore(deps): update pre-commit hook asottile/pyupgrade to v3.16.0 --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 461b889f9..777e4db6c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -36,7 +36,7 @@ repos: exclude: ^(legacy/public(?!/js/airtime)|CHANGELOG.md$|.github/release-please-manifest.json) - repo: https://github.com/asottile/pyupgrade - rev: v3.15.2 + rev: v3.16.0 hooks: - id: pyupgrade args: [--py38-plus] From 01253b31fc0731309f019fac0bbe1771aca6ad63 Mon Sep 17 00:00:00 2001 From: libretime-bot Date: Mon, 10 Jun 2024 02:02:19 +0000 Subject: [PATCH 13/29] chore(legacy): update locales --- legacy/locale/cs_CZ/LC_MESSAGES/libretime.po | 8 ++++---- legacy/locale/de_AT/LC_MESSAGES/libretime.po | 8 ++++---- legacy/locale/de_DE/LC_MESSAGES/libretime.po | 8 ++++---- legacy/locale/el_GR/LC_MESSAGES/libretime.po | 8 ++++---- legacy/locale/en_CA/LC_MESSAGES/libretime.po | 8 ++++---- legacy/locale/en_GB/LC_MESSAGES/libretime.po | 8 ++++---- legacy/locale/en_US/LC_MESSAGES/libretime.po | 8 ++++---- legacy/locale/es_ES/LC_MESSAGES/libretime.po | 8 ++++---- legacy/locale/fr_FR/LC_MESSAGES/libretime.po | 8 ++++---- legacy/locale/hr_HR/LC_MESSAGES/libretime.po | 8 ++++---- legacy/locale/hu_HU/LC_MESSAGES/libretime.po | 8 ++++---- legacy/locale/it_IT/LC_MESSAGES/libretime.po | 8 ++++---- legacy/locale/ja_JP/LC_MESSAGES/libretime.po | 8 ++++---- legacy/locale/ko_KR/LC_MESSAGES/libretime.po | 8 ++++---- legacy/locale/nl_NL/LC_MESSAGES/libretime.po | 8 ++++---- legacy/locale/pl_PL/LC_MESSAGES/libretime.po | 8 ++++---- legacy/locale/pt_BR/LC_MESSAGES/libretime.po | 8 ++++---- legacy/locale/ru_RU/LC_MESSAGES/libretime.po | 8 ++++---- legacy/locale/sr_RS/LC_MESSAGES/libretime.po | 8 ++++---- legacy/locale/sr_RS@latin/LC_MESSAGES/libretime.po | 8 ++++---- legacy/locale/tr_TR/LC_MESSAGES/libretime.po | 8 ++++---- legacy/locale/uk_UA/LC_MESSAGES/libretime.po | 8 ++++---- legacy/locale/zh_CN/LC_MESSAGES/libretime.po | 8 ++++---- 23 files changed, 92 insertions(+), 92 deletions(-) diff --git a/legacy/locale/cs_CZ/LC_MESSAGES/libretime.po b/legacy/locale/cs_CZ/LC_MESSAGES/libretime.po index 232c09a6d..1fb2d5200 100644 --- a/legacy/locale/cs_CZ/LC_MESSAGES/libretime.po +++ b/legacy/locale/cs_CZ/LC_MESSAGES/libretime.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: LibreTime\n" "Report-Msgid-Bugs-To: https://github.com/libretime/libretime/issues\n" -"POT-Creation-Date: 2024-05-06 01:56+0000\n" +"POT-Creation-Date: 2024-06-10 02:02+0000\n" "PO-Revision-Date: 2015-09-05 08:33+0000\n" "Last-Translator: Daniel James \n" "Language-Team: Czech (Czech Republic)\n" @@ -3926,8 +3926,8 @@ msgstr "Program, který si prohlížíte, je zastaralý!" msgid "The schedule you're viewing is out of date! (instance mismatch)" msgstr "Program který si prohlížíte je zastaralý!" -#: application/models/Scheduler.php:138 application/models/Scheduler.php:491 -#: application/models/Scheduler.php:529 application/models/Scheduler.php:568 +#: application/models/Scheduler.php:138 application/models/Scheduler.php:492 +#: application/models/Scheduler.php:530 application/models/Scheduler.php:569 msgid "The schedule you're viewing is out of date!" msgstr "Program který si prohlížíte je zastaralý! " @@ -3958,7 +3958,7 @@ msgstr "" msgid "Cannot schedule a playlist that contains missing files." msgstr "Nelze naplánovat playlist, který obsahuje chybějící soubory." -#: application/models/Scheduler.php:228 application/models/Scheduler.php:320 +#: application/models/Scheduler.php:229 application/models/Scheduler.php:321 msgid "A selected File does not exist!" msgstr "Vybraný soubor neexistuje!" diff --git a/legacy/locale/de_AT/LC_MESSAGES/libretime.po b/legacy/locale/de_AT/LC_MESSAGES/libretime.po index 1dd0784c2..1af6977bd 100644 --- a/legacy/locale/de_AT/LC_MESSAGES/libretime.po +++ b/legacy/locale/de_AT/LC_MESSAGES/libretime.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: LibreTime\n" "Report-Msgid-Bugs-To: https://github.com/libretime/libretime/issues\n" -"POT-Creation-Date: 2024-05-06 01:56+0000\n" +"POT-Creation-Date: 2024-06-10 02:02+0000\n" "PO-Revision-Date: 2021-10-17 08:09+0000\n" "Last-Translator: Kyle Robbertze \n" "Language-Team: German (Austria) \n" @@ -3936,8 +3936,8 @@ msgstr "Der Kalender den sie sehen ist nicht mehr aktuell! (Kalender falsch eing msgid "The schedule you're viewing is out of date! (instance mismatch)" msgstr "Der Kalender den sie sehen ist nicht mehr aktuell! (Objekt falsch eingepasst)" -#: application/models/Scheduler.php:138 application/models/Scheduler.php:491 -#: application/models/Scheduler.php:529 application/models/Scheduler.php:568 +#: application/models/Scheduler.php:138 application/models/Scheduler.php:492 +#: application/models/Scheduler.php:530 application/models/Scheduler.php:569 msgid "The schedule you're viewing is out of date!" msgstr "Der Kalender den sie sehen ist nicht mehr aktuell." @@ -3968,7 +3968,7 @@ msgstr "" msgid "Cannot schedule a playlist that contains missing files." msgstr "" -#: application/models/Scheduler.php:228 application/models/Scheduler.php:320 +#: application/models/Scheduler.php:229 application/models/Scheduler.php:321 msgid "A selected File does not exist!" msgstr "Eine der gewählten Dateien existiert nicht!" diff --git a/legacy/locale/de_DE/LC_MESSAGES/libretime.po b/legacy/locale/de_DE/LC_MESSAGES/libretime.po index 1efff356f..32a807719 100644 --- a/legacy/locale/de_DE/LC_MESSAGES/libretime.po +++ b/legacy/locale/de_DE/LC_MESSAGES/libretime.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: LibreTime\n" "Report-Msgid-Bugs-To: https://github.com/libretime/libretime/issues\n" -"POT-Creation-Date: 2024-05-06 01:56+0000\n" +"POT-Creation-Date: 2024-06-10 02:02+0000\n" "PO-Revision-Date: 2024-01-19 16:00+0000\n" "Last-Translator: Domenik Töfflinger \n" "Language-Team: German \n" @@ -3939,8 +3939,8 @@ msgstr "Der Kalender den sie sehen ist nicht mehr aktuell!(Kalender falsch zugeo msgid "The schedule you're viewing is out of date! (instance mismatch)" msgstr "Der Kalender den sie sehen ist nicht mehr aktuell! (Instanz falsch zugeordnet)" -#: application/models/Scheduler.php:138 application/models/Scheduler.php:491 -#: application/models/Scheduler.php:529 application/models/Scheduler.php:568 +#: application/models/Scheduler.php:138 application/models/Scheduler.php:492 +#: application/models/Scheduler.php:530 application/models/Scheduler.php:569 msgid "The schedule you're viewing is out of date!" msgstr "Der Kalender den sie sehen ist nicht mehr aktuell!" @@ -3971,7 +3971,7 @@ msgstr "" msgid "Cannot schedule a playlist that contains missing files." msgstr "" -#: application/models/Scheduler.php:228 application/models/Scheduler.php:320 +#: application/models/Scheduler.php:229 application/models/Scheduler.php:321 msgid "A selected File does not exist!" msgstr "Eine der gewählten Dateien existiert nicht!" diff --git a/legacy/locale/el_GR/LC_MESSAGES/libretime.po b/legacy/locale/el_GR/LC_MESSAGES/libretime.po index 06ea5a803..5a30e5116 100644 --- a/legacy/locale/el_GR/LC_MESSAGES/libretime.po +++ b/legacy/locale/el_GR/LC_MESSAGES/libretime.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: LibreTime\n" "Report-Msgid-Bugs-To: https://github.com/libretime/libretime/issues\n" -"POT-Creation-Date: 2024-05-06 01:56+0000\n" +"POT-Creation-Date: 2024-06-10 02:02+0000\n" "PO-Revision-Date: 2021-10-17 08:09+0000\n" "Last-Translator: Kyle Robbertze \n" "Language-Team: Greek \n" @@ -3927,8 +3927,8 @@ msgstr "Το πρόγραμμα που βλέπετε δεν είναι έγκυ msgid "The schedule you're viewing is out of date! (instance mismatch)" msgstr "Το πρόγραμμα που βλέπετε δεν είναι ενημερωμένο! (αναντιστοιχία παραδείγματος)" -#: application/models/Scheduler.php:138 application/models/Scheduler.php:491 -#: application/models/Scheduler.php:529 application/models/Scheduler.php:568 +#: application/models/Scheduler.php:138 application/models/Scheduler.php:492 +#: application/models/Scheduler.php:530 application/models/Scheduler.php:569 msgid "The schedule you're viewing is out of date!" msgstr "Το πρόγραμμα που βλέπετε δεν είναι ενημερωμένο!" @@ -3959,7 +3959,7 @@ msgstr "" msgid "Cannot schedule a playlist that contains missing files." msgstr "" -#: application/models/Scheduler.php:228 application/models/Scheduler.php:320 +#: application/models/Scheduler.php:229 application/models/Scheduler.php:321 msgid "A selected File does not exist!" msgstr "Ένα επιλεγμένο αρχείο δεν υπάρχει!" diff --git a/legacy/locale/en_CA/LC_MESSAGES/libretime.po b/legacy/locale/en_CA/LC_MESSAGES/libretime.po index 06cc3d7e2..71f6f35f7 100644 --- a/legacy/locale/en_CA/LC_MESSAGES/libretime.po +++ b/legacy/locale/en_CA/LC_MESSAGES/libretime.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: LibreTime\n" "Report-Msgid-Bugs-To: https://github.com/libretime/libretime/issues\n" -"POT-Creation-Date: 2024-05-06 01:56+0000\n" +"POT-Creation-Date: 2024-06-10 02:02+0000\n" "PO-Revision-Date: 2015-09-05 08:33+0000\n" "Last-Translator: Daniel James \n" "Language-Team: English (Canada)\n" @@ -3926,8 +3926,8 @@ msgstr "The schedule you're viewing is out of date! (sched mismatch)" msgid "The schedule you're viewing is out of date! (instance mismatch)" msgstr "The schedule you're viewing is out of date! (instance mismatch)" -#: application/models/Scheduler.php:138 application/models/Scheduler.php:491 -#: application/models/Scheduler.php:529 application/models/Scheduler.php:568 +#: application/models/Scheduler.php:138 application/models/Scheduler.php:492 +#: application/models/Scheduler.php:530 application/models/Scheduler.php:569 msgid "The schedule you're viewing is out of date!" msgstr "The schedule you're viewing is out of date!" @@ -3958,7 +3958,7 @@ msgstr "" msgid "Cannot schedule a playlist that contains missing files." msgstr "" -#: application/models/Scheduler.php:228 application/models/Scheduler.php:320 +#: application/models/Scheduler.php:229 application/models/Scheduler.php:321 msgid "A selected File does not exist!" msgstr "A selected File does not exist!" diff --git a/legacy/locale/en_GB/LC_MESSAGES/libretime.po b/legacy/locale/en_GB/LC_MESSAGES/libretime.po index bfff21366..961aed02a 100644 --- a/legacy/locale/en_GB/LC_MESSAGES/libretime.po +++ b/legacy/locale/en_GB/LC_MESSAGES/libretime.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: LibreTime\n" "Report-Msgid-Bugs-To: https://github.com/libretime/libretime/issues\n" -"POT-Creation-Date: 2024-05-06 01:56+0000\n" +"POT-Creation-Date: 2024-06-10 02:02+0000\n" "PO-Revision-Date: 2022-07-14 09:18+0000\n" "Last-Translator: Kyle Robbertze \n" "Language-Team: English (United Kingdom) \n" @@ -3943,8 +3943,8 @@ msgstr "The schedule you're viewing is out of date! (sched mismatch)" msgid "The schedule you're viewing is out of date! (instance mismatch)" msgstr "The schedule you're viewing is out of date! (instance mismatch)" -#: application/models/Scheduler.php:138 application/models/Scheduler.php:491 -#: application/models/Scheduler.php:529 application/models/Scheduler.php:568 +#: application/models/Scheduler.php:138 application/models/Scheduler.php:492 +#: application/models/Scheduler.php:530 application/models/Scheduler.php:569 msgid "The schedule you're viewing is out of date!" msgstr "The schedule you're viewing is out of date!" @@ -3975,7 +3975,7 @@ msgstr "" msgid "Cannot schedule a playlist that contains missing files." msgstr "Cannot schedule a playlist that contains missing files." -#: application/models/Scheduler.php:228 application/models/Scheduler.php:320 +#: application/models/Scheduler.php:229 application/models/Scheduler.php:321 msgid "A selected File does not exist!" msgstr "A selected File does not exist!" diff --git a/legacy/locale/en_US/LC_MESSAGES/libretime.po b/legacy/locale/en_US/LC_MESSAGES/libretime.po index 54df756c6..452e6f452 100644 --- a/legacy/locale/en_US/LC_MESSAGES/libretime.po +++ b/legacy/locale/en_US/LC_MESSAGES/libretime.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: LibreTime\n" "Report-Msgid-Bugs-To: https://github.com/libretime/libretime/issues\n" -"POT-Creation-Date: 2024-05-06 01:56+0000\n" +"POT-Creation-Date: 2024-06-10 02:02+0000\n" "PO-Revision-Date: 2023-05-21 17:52+0000\n" "Last-Translator: Zachary Klosko \n" "Language-Team: English (United States) \n" @@ -3927,8 +3927,8 @@ msgstr "The schedule you're viewing is out of date! (sched mismatch)" msgid "The schedule you're viewing is out of date! (instance mismatch)" msgstr "The schedule you're viewing is out of date! (instance mismatch)" -#: application/models/Scheduler.php:138 application/models/Scheduler.php:491 -#: application/models/Scheduler.php:529 application/models/Scheduler.php:568 +#: application/models/Scheduler.php:138 application/models/Scheduler.php:492 +#: application/models/Scheduler.php:530 application/models/Scheduler.php:569 msgid "The schedule you're viewing is out of date!" msgstr "The schedule you're viewing is out of date!" @@ -3959,7 +3959,7 @@ msgstr "" msgid "Cannot schedule a playlist that contains missing files." msgstr "" -#: application/models/Scheduler.php:228 application/models/Scheduler.php:320 +#: application/models/Scheduler.php:229 application/models/Scheduler.php:321 msgid "A selected File does not exist!" msgstr "A selected File does not exist!" diff --git a/legacy/locale/es_ES/LC_MESSAGES/libretime.po b/legacy/locale/es_ES/LC_MESSAGES/libretime.po index 8963038a5..0108fa235 100644 --- a/legacy/locale/es_ES/LC_MESSAGES/libretime.po +++ b/legacy/locale/es_ES/LC_MESSAGES/libretime.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: LibreTime\n" "Report-Msgid-Bugs-To: https://github.com/libretime/libretime/issues\n" -"POT-Creation-Date: 2024-05-06 01:56+0000\n" +"POT-Creation-Date: 2024-06-10 02:02+0000\n" "PO-Revision-Date: 2024-04-23 09:07+0000\n" "Last-Translator: gallegonovato \n" "Language-Team: Spanish \n" @@ -3952,8 +3952,8 @@ msgstr "¡El calendario que tienes a la vista no está actualizado! (sched misma msgid "The schedule you're viewing is out of date! (instance mismatch)" msgstr "¡La programación que estás viendo está desactualizada! (desfase de instancia)" -#: application/models/Scheduler.php:138 application/models/Scheduler.php:491 -#: application/models/Scheduler.php:529 application/models/Scheduler.php:568 +#: application/models/Scheduler.php:138 application/models/Scheduler.php:492 +#: application/models/Scheduler.php:530 application/models/Scheduler.php:569 msgid "The schedule you're viewing is out of date!" msgstr "¡La programación que estás viendo está desactualizada!" @@ -3984,7 +3984,7 @@ msgstr "¡El contenido de los programas enlazados no se puede cambiar mientras s msgid "Cannot schedule a playlist that contains missing files." msgstr "No se puede programar una lista de reproducción que contenga archivos perdidos." -#: application/models/Scheduler.php:228 application/models/Scheduler.php:320 +#: application/models/Scheduler.php:229 application/models/Scheduler.php:321 msgid "A selected File does not exist!" msgstr "¡Un Archivo seleccionado no existe!" diff --git a/legacy/locale/fr_FR/LC_MESSAGES/libretime.po b/legacy/locale/fr_FR/LC_MESSAGES/libretime.po index 9443699a4..d2df4d64b 100644 --- a/legacy/locale/fr_FR/LC_MESSAGES/libretime.po +++ b/legacy/locale/fr_FR/LC_MESSAGES/libretime.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: LibreTime\n" "Report-Msgid-Bugs-To: https://github.com/libretime/libretime/issues\n" -"POT-Creation-Date: 2024-05-06 01:56+0000\n" +"POT-Creation-Date: 2024-06-10 02:02+0000\n" "PO-Revision-Date: 2023-03-06 23:45+0000\n" "Last-Translator: \"Jonas L.\" \n" "Language-Team: French \n" @@ -3950,8 +3950,8 @@ msgstr "Le calendrier que vous consultez n'est pas à jour ! (décalage calend msgid "The schedule you're viewing is out of date! (instance mismatch)" msgstr "La programmation que vous consultez n'est pas à jour ! (décalage d'instance)" -#: application/models/Scheduler.php:138 application/models/Scheduler.php:491 -#: application/models/Scheduler.php:529 application/models/Scheduler.php:568 +#: application/models/Scheduler.php:138 application/models/Scheduler.php:492 +#: application/models/Scheduler.php:530 application/models/Scheduler.php:569 msgid "The schedule you're viewing is out of date!" msgstr "Le calendrier que vous consultez n'est pas à jour !" @@ -3982,7 +3982,7 @@ msgstr "Le contenu des émissions liées ne peut pas être changé en cours de d msgid "Cannot schedule a playlist that contains missing files." msgstr "Vous ne pouvez pas programmer une liste de lecture qui contient des fichiers manquants." -#: application/models/Scheduler.php:228 application/models/Scheduler.php:320 +#: application/models/Scheduler.php:229 application/models/Scheduler.php:321 msgid "A selected File does not exist!" msgstr "Un fichier sélectionne n'existe pas !" diff --git a/legacy/locale/hr_HR/LC_MESSAGES/libretime.po b/legacy/locale/hr_HR/LC_MESSAGES/libretime.po index 308734cf9..23b667861 100644 --- a/legacy/locale/hr_HR/LC_MESSAGES/libretime.po +++ b/legacy/locale/hr_HR/LC_MESSAGES/libretime.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: LibreTime\n" "Report-Msgid-Bugs-To: https://github.com/libretime/libretime/issues\n" -"POT-Creation-Date: 2024-05-06 01:56+0000\n" +"POT-Creation-Date: 2024-06-10 02:02+0000\n" "PO-Revision-Date: 2023-10-29 05:18+0000\n" "Last-Translator: Milo Ivir \n" "Language-Team: Croatian \n" @@ -3938,8 +3938,8 @@ msgstr "Raspored koji gledaš nije aktualan! (neusklađenost rasporeda)" msgid "The schedule you're viewing is out of date! (instance mismatch)" msgstr "Raspored koji gledaš nije aktualan! (neusklađenost instance)" -#: application/models/Scheduler.php:138 application/models/Scheduler.php:491 -#: application/models/Scheduler.php:529 application/models/Scheduler.php:568 +#: application/models/Scheduler.php:138 application/models/Scheduler.php:492 +#: application/models/Scheduler.php:530 application/models/Scheduler.php:569 msgid "The schedule you're viewing is out of date!" msgstr "Raspored koji gledaš nije aktualan!" @@ -3970,7 +3970,7 @@ msgstr "" msgid "Cannot schedule a playlist that contains missing files." msgstr "Nije moguće zakazati playlistu koja sadrži nedostajuće datoteke." -#: application/models/Scheduler.php:228 application/models/Scheduler.php:320 +#: application/models/Scheduler.php:229 application/models/Scheduler.php:321 msgid "A selected File does not exist!" msgstr "Odabrana Datoteka ne postoji!" diff --git a/legacy/locale/hu_HU/LC_MESSAGES/libretime.po b/legacy/locale/hu_HU/LC_MESSAGES/libretime.po index ed7ccf58a..7c5f58c62 100644 --- a/legacy/locale/hu_HU/LC_MESSAGES/libretime.po +++ b/legacy/locale/hu_HU/LC_MESSAGES/libretime.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: LibreTime\n" "Report-Msgid-Bugs-To: https://github.com/libretime/libretime/issues\n" -"POT-Creation-Date: 2024-05-06 01:56+0000\n" +"POT-Creation-Date: 2024-06-10 02:02+0000\n" "PO-Revision-Date: 2021-12-27 20:52+0000\n" "Last-Translator: f3rr31 <5920873@disroot.org>\n" "Language-Team: Hungarian \n" @@ -3963,8 +3963,8 @@ msgstr "A megtekintett ütemterv elavult! (ütem eltérés)" msgid "The schedule you're viewing is out of date! (instance mismatch)" msgstr "A megtekintett ütemterv elavult! (példány eltérés)" -#: application/models/Scheduler.php:138 application/models/Scheduler.php:491 -#: application/models/Scheduler.php:529 application/models/Scheduler.php:568 +#: application/models/Scheduler.php:138 application/models/Scheduler.php:492 +#: application/models/Scheduler.php:530 application/models/Scheduler.php:569 msgid "The schedule you're viewing is out of date!" msgstr "A megtekintett ütemterv időpontja elavult!" @@ -3995,7 +3995,7 @@ msgstr "A hivatkozott műsorok tartalma nem módosítható adás közben!" msgid "Cannot schedule a playlist that contains missing files." msgstr "Nem lehet ütemezni olyan lejátszási listát amely hiányzó fájlokat tartalmaz." -#: application/models/Scheduler.php:228 application/models/Scheduler.php:320 +#: application/models/Scheduler.php:229 application/models/Scheduler.php:321 msgid "A selected File does not exist!" msgstr "Egy kiválasztott fájl nem létezik!" diff --git a/legacy/locale/it_IT/LC_MESSAGES/libretime.po b/legacy/locale/it_IT/LC_MESSAGES/libretime.po index b9a1cc247..9d34032e7 100644 --- a/legacy/locale/it_IT/LC_MESSAGES/libretime.po +++ b/legacy/locale/it_IT/LC_MESSAGES/libretime.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: LibreTime\n" "Report-Msgid-Bugs-To: https://github.com/libretime/libretime/issues\n" -"POT-Creation-Date: 2024-05-06 01:56+0000\n" +"POT-Creation-Date: 2024-06-10 02:02+0000\n" "PO-Revision-Date: 2023-12-27 23:06+0000\n" "Last-Translator: Maurizio Castelvetro \n" "Language-Team: Italian \n" @@ -3930,8 +3930,8 @@ msgstr "Il programma che sta visionando è fuori data! (disadattamento dell'or msgid "The schedule you're viewing is out of date! (instance mismatch)" msgstr "Il programma che sta visionando è fuori data! (disadattamento dell'esempio)" -#: application/models/Scheduler.php:138 application/models/Scheduler.php:491 -#: application/models/Scheduler.php:529 application/models/Scheduler.php:568 +#: application/models/Scheduler.php:138 application/models/Scheduler.php:492 +#: application/models/Scheduler.php:530 application/models/Scheduler.php:569 msgid "The schedule you're viewing is out of date!" msgstr "Il programma che sta visionando è fuori data!" @@ -3962,7 +3962,7 @@ msgstr "" msgid "Cannot schedule a playlist that contains missing files." msgstr "" -#: application/models/Scheduler.php:228 application/models/Scheduler.php:320 +#: application/models/Scheduler.php:229 application/models/Scheduler.php:321 msgid "A selected File does not exist!" msgstr "Il File selezionato non esiste!" diff --git a/legacy/locale/ja_JP/LC_MESSAGES/libretime.po b/legacy/locale/ja_JP/LC_MESSAGES/libretime.po index fbd7bb40a..5f42481cc 100644 --- a/legacy/locale/ja_JP/LC_MESSAGES/libretime.po +++ b/legacy/locale/ja_JP/LC_MESSAGES/libretime.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: LibreTime\n" "Report-Msgid-Bugs-To: https://github.com/libretime/libretime/issues\n" -"POT-Creation-Date: 2024-05-06 01:56+0000\n" +"POT-Creation-Date: 2024-06-10 02:02+0000\n" "PO-Revision-Date: 2021-10-17 08:09+0000\n" "Last-Translator: Kyle Robbertze \n" "Language-Team: Japanese \n" @@ -3926,8 +3926,8 @@ msgstr "参照中のスケジュールはの有効ではありません。" msgid "The schedule you're viewing is out of date! (instance mismatch)" msgstr "参照中のスケジュールは有効ではありません。" -#: application/models/Scheduler.php:138 application/models/Scheduler.php:491 -#: application/models/Scheduler.php:529 application/models/Scheduler.php:568 +#: application/models/Scheduler.php:138 application/models/Scheduler.php:492 +#: application/models/Scheduler.php:530 application/models/Scheduler.php:569 msgid "The schedule you're viewing is out of date!" msgstr "参照中のスケジュールは有効ではありません。" @@ -3958,7 +3958,7 @@ msgstr "" msgid "Cannot schedule a playlist that contains missing files." msgstr "" -#: application/models/Scheduler.php:228 application/models/Scheduler.php:320 +#: application/models/Scheduler.php:229 application/models/Scheduler.php:321 msgid "A selected File does not exist!" msgstr "選択したファイルは存在しません。" diff --git a/legacy/locale/ko_KR/LC_MESSAGES/libretime.po b/legacy/locale/ko_KR/LC_MESSAGES/libretime.po index a38096876..7137d3bcd 100644 --- a/legacy/locale/ko_KR/LC_MESSAGES/libretime.po +++ b/legacy/locale/ko_KR/LC_MESSAGES/libretime.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: LibreTime\n" "Report-Msgid-Bugs-To: https://github.com/libretime/libretime/issues\n" -"POT-Creation-Date: 2024-05-06 01:56+0000\n" +"POT-Creation-Date: 2024-06-10 02:02+0000\n" "PO-Revision-Date: 2015-09-05 08:33+0000\n" "Last-Translator: Daniel James \n" "Language-Team: Korean (Korea)\n" @@ -3923,8 +3923,8 @@ msgstr "현재 보고 계신 스케쥴이 맞지 않습니다(sched mismatch)" msgid "The schedule you're viewing is out of date! (instance mismatch)" msgstr "현재 보고 계신 스케쥴이 맞지 않습니다(instance mismatch)" -#: application/models/Scheduler.php:138 application/models/Scheduler.php:491 -#: application/models/Scheduler.php:529 application/models/Scheduler.php:568 +#: application/models/Scheduler.php:138 application/models/Scheduler.php:492 +#: application/models/Scheduler.php:530 application/models/Scheduler.php:569 msgid "The schedule you're viewing is out of date!" msgstr "현재 보고 계신 스케쥴이 맞지 않습니다" @@ -3955,7 +3955,7 @@ msgstr "" msgid "Cannot schedule a playlist that contains missing files." msgstr "" -#: application/models/Scheduler.php:228 application/models/Scheduler.php:320 +#: application/models/Scheduler.php:229 application/models/Scheduler.php:321 msgid "A selected File does not exist!" msgstr "선택하신 파일이 존재 하지 않습니다" diff --git a/legacy/locale/nl_NL/LC_MESSAGES/libretime.po b/legacy/locale/nl_NL/LC_MESSAGES/libretime.po index d5b063adb..70b2d6683 100644 --- a/legacy/locale/nl_NL/LC_MESSAGES/libretime.po +++ b/legacy/locale/nl_NL/LC_MESSAGES/libretime.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: LibreTime\n" "Report-Msgid-Bugs-To: https://github.com/libretime/libretime/issues\n" -"POT-Creation-Date: 2024-05-06 01:56+0000\n" +"POT-Creation-Date: 2024-06-10 02:02+0000\n" "PO-Revision-Date: 2024-03-17 07:32+0000\n" "Last-Translator: Mikachu \n" "Language-Team: Dutch \n" @@ -3951,8 +3951,8 @@ msgstr "Het schema dat u aan het bekijken bent is verouderd! (geplande wanverhou msgid "The schedule you're viewing is out of date! (instance mismatch)" msgstr "Het schema dat u aan het bekijken bent is verouderd! (exemplaar wanverhouding)" -#: application/models/Scheduler.php:138 application/models/Scheduler.php:491 -#: application/models/Scheduler.php:529 application/models/Scheduler.php:568 +#: application/models/Scheduler.php:138 application/models/Scheduler.php:492 +#: application/models/Scheduler.php:530 application/models/Scheduler.php:569 msgid "The schedule you're viewing is out of date!" msgstr "Het schema dat u aan het bekijken bent is verouderd!" @@ -3983,7 +3983,7 @@ msgstr "De inhoud van gelinkte shows kan niet worden gewijzigd tijdens de uitzen msgid "Cannot schedule a playlist that contains missing files." msgstr "Niet gepland een afspeellijst die ontbrekende bestanden bevat." -#: application/models/Scheduler.php:228 application/models/Scheduler.php:320 +#: application/models/Scheduler.php:229 application/models/Scheduler.php:321 msgid "A selected File does not exist!" msgstr "Een geselecteerd bestand bestaat niet!" diff --git a/legacy/locale/pl_PL/LC_MESSAGES/libretime.po b/legacy/locale/pl_PL/LC_MESSAGES/libretime.po index 263e76367..128bb13cc 100644 --- a/legacy/locale/pl_PL/LC_MESSAGES/libretime.po +++ b/legacy/locale/pl_PL/LC_MESSAGES/libretime.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: LibreTime\n" "Report-Msgid-Bugs-To: https://github.com/libretime/libretime/issues\n" -"POT-Creation-Date: 2024-05-06 01:56+0000\n" +"POT-Creation-Date: 2024-06-10 02:02+0000\n" "PO-Revision-Date: 2023-10-12 10:01+0000\n" "Last-Translator: Piotr Strebski \n" "Language-Team: Polish \n" @@ -3927,8 +3927,8 @@ msgstr "Harmonogram, który przeglądasz jest nieaktualny! (błędne dopasowanie msgid "The schedule you're viewing is out of date! (instance mismatch)" msgstr "Harmonogram, który przeglądasz jest nieaktualny! (błędne dopasowanie instancji)" -#: application/models/Scheduler.php:138 application/models/Scheduler.php:491 -#: application/models/Scheduler.php:529 application/models/Scheduler.php:568 +#: application/models/Scheduler.php:138 application/models/Scheduler.php:492 +#: application/models/Scheduler.php:530 application/models/Scheduler.php:569 msgid "The schedule you're viewing is out of date!" msgstr "Harmonogram, który przeglądasz jest nieaktualny!" @@ -3959,7 +3959,7 @@ msgstr "" msgid "Cannot schedule a playlist that contains missing files." msgstr "" -#: application/models/Scheduler.php:228 application/models/Scheduler.php:320 +#: application/models/Scheduler.php:229 application/models/Scheduler.php:321 msgid "A selected File does not exist!" msgstr "Wybrany plik nie istnieje!" diff --git a/legacy/locale/pt_BR/LC_MESSAGES/libretime.po b/legacy/locale/pt_BR/LC_MESSAGES/libretime.po index 156689401..da0e3d255 100644 --- a/legacy/locale/pt_BR/LC_MESSAGES/libretime.po +++ b/legacy/locale/pt_BR/LC_MESSAGES/libretime.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: LibreTime\n" "Report-Msgid-Bugs-To: https://github.com/libretime/libretime/issues\n" -"POT-Creation-Date: 2024-05-06 01:56+0000\n" +"POT-Creation-Date: 2024-06-10 02:02+0000\n" "PO-Revision-Date: 2023-03-26 18:38+0000\n" "Last-Translator: Felipe Nogueira \n" "Language-Team: Portuguese (Brazil) \n" @@ -3928,8 +3928,8 @@ msgstr "A programação que você está vendo está desatualizada! (programaçã msgid "The schedule you're viewing is out of date! (instance mismatch)" msgstr "A programação que você está vendo está desatualizada! (instância incompatível)" -#: application/models/Scheduler.php:138 application/models/Scheduler.php:491 -#: application/models/Scheduler.php:529 application/models/Scheduler.php:568 +#: application/models/Scheduler.php:138 application/models/Scheduler.php:492 +#: application/models/Scheduler.php:530 application/models/Scheduler.php:569 msgid "The schedule you're viewing is out of date!" msgstr "A programação que você está vendo está desatualizada!" @@ -3960,7 +3960,7 @@ msgstr "" msgid "Cannot schedule a playlist that contains missing files." msgstr "" -#: application/models/Scheduler.php:228 application/models/Scheduler.php:320 +#: application/models/Scheduler.php:229 application/models/Scheduler.php:321 msgid "A selected File does not exist!" msgstr "Um dos arquivos selecionados não existe!" diff --git a/legacy/locale/ru_RU/LC_MESSAGES/libretime.po b/legacy/locale/ru_RU/LC_MESSAGES/libretime.po index ad8a6e33c..78b6557e4 100644 --- a/legacy/locale/ru_RU/LC_MESSAGES/libretime.po +++ b/legacy/locale/ru_RU/LC_MESSAGES/libretime.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: LibreTime\n" "Report-Msgid-Bugs-To: https://github.com/libretime/libretime/issues\n" -"POT-Creation-Date: 2024-05-06 01:56+0000\n" +"POT-Creation-Date: 2024-06-10 02:02+0000\n" "PO-Revision-Date: 2022-06-05 10:17+0000\n" "Last-Translator: МАН69К \n" "Language-Team: Russian \n" @@ -3952,8 +3952,8 @@ msgstr "Расписание, которое вы просматриваете - msgid "The schedule you're viewing is out of date! (instance mismatch)" msgstr "Расписание, которое вы просматриваете - устарело! (Несоответствие экземпляров)" -#: application/models/Scheduler.php:138 application/models/Scheduler.php:491 -#: application/models/Scheduler.php:529 application/models/Scheduler.php:568 +#: application/models/Scheduler.php:138 application/models/Scheduler.php:492 +#: application/models/Scheduler.php:530 application/models/Scheduler.php:569 msgid "The schedule you're viewing is out of date!" msgstr "Расписание, которое вы просматриваете - устарело!" @@ -3984,7 +3984,7 @@ msgstr "Контент в связанных Программах не може msgid "Cannot schedule a playlist that contains missing files." msgstr "Нельзя запланировать Плейлист, которой содержит отсутствующие файлы." -#: application/models/Scheduler.php:228 application/models/Scheduler.php:320 +#: application/models/Scheduler.php:229 application/models/Scheduler.php:321 msgid "A selected File does not exist!" msgstr "Выбранный файл не существует!" diff --git a/legacy/locale/sr_RS/LC_MESSAGES/libretime.po b/legacy/locale/sr_RS/LC_MESSAGES/libretime.po index caf1ce9c8..994b3e14c 100644 --- a/legacy/locale/sr_RS/LC_MESSAGES/libretime.po +++ b/legacy/locale/sr_RS/LC_MESSAGES/libretime.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: LibreTime\n" "Report-Msgid-Bugs-To: https://github.com/libretime/libretime/issues\n" -"POT-Creation-Date: 2024-05-06 01:56+0000\n" +"POT-Creation-Date: 2024-06-10 02:02+0000\n" "PO-Revision-Date: 2015-09-05 08:33+0000\n" "Last-Translator: Daniel James \n" "Language-Team: Serbian (Serbia)\n" @@ -3925,8 +3925,8 @@ msgstr "Застарео се прегледан распоред! (неваже msgid "The schedule you're viewing is out of date! (instance mismatch)" msgstr "Застарео се прегледан распоред! (пример неусклађеност)" -#: application/models/Scheduler.php:138 application/models/Scheduler.php:491 -#: application/models/Scheduler.php:529 application/models/Scheduler.php:568 +#: application/models/Scheduler.php:138 application/models/Scheduler.php:492 +#: application/models/Scheduler.php:530 application/models/Scheduler.php:569 msgid "The schedule you're viewing is out of date!" msgstr "Застарео се прегледан распоред!" @@ -3957,7 +3957,7 @@ msgstr "" msgid "Cannot schedule a playlist that contains missing files." msgstr "" -#: application/models/Scheduler.php:228 application/models/Scheduler.php:320 +#: application/models/Scheduler.php:229 application/models/Scheduler.php:321 msgid "A selected File does not exist!" msgstr "Изабрани Фајл не постоји!" diff --git a/legacy/locale/sr_RS@latin/LC_MESSAGES/libretime.po b/legacy/locale/sr_RS@latin/LC_MESSAGES/libretime.po index af18eaef6..266ca2f61 100644 --- a/legacy/locale/sr_RS@latin/LC_MESSAGES/libretime.po +++ b/legacy/locale/sr_RS@latin/LC_MESSAGES/libretime.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: LibreTime\n" "Report-Msgid-Bugs-To: https://github.com/libretime/libretime/issues\n" -"POT-Creation-Date: 2024-05-06 01:56+0000\n" +"POT-Creation-Date: 2024-06-10 02:02+0000\n" "PO-Revision-Date: 2015-09-05 08:33+0000\n" "Last-Translator: Daniel James \n" "Language-Team: Serbian (Latin) (Serbia)\n" @@ -3925,8 +3925,8 @@ msgstr "Zastareo se pregledan raspored! (nevažeći raspored)" msgid "The schedule you're viewing is out of date! (instance mismatch)" msgstr "Zastareo se pregledan raspored! (primer neusklađenost)" -#: application/models/Scheduler.php:138 application/models/Scheduler.php:491 -#: application/models/Scheduler.php:529 application/models/Scheduler.php:568 +#: application/models/Scheduler.php:138 application/models/Scheduler.php:492 +#: application/models/Scheduler.php:530 application/models/Scheduler.php:569 msgid "The schedule you're viewing is out of date!" msgstr "Zastareo se pregledan raspored!" @@ -3957,7 +3957,7 @@ msgstr "" msgid "Cannot schedule a playlist that contains missing files." msgstr "" -#: application/models/Scheduler.php:228 application/models/Scheduler.php:320 +#: application/models/Scheduler.php:229 application/models/Scheduler.php:321 msgid "A selected File does not exist!" msgstr "Izabrani Fajl ne postoji!" diff --git a/legacy/locale/tr_TR/LC_MESSAGES/libretime.po b/legacy/locale/tr_TR/LC_MESSAGES/libretime.po index 4c2f388f9..472065304 100644 --- a/legacy/locale/tr_TR/LC_MESSAGES/libretime.po +++ b/legacy/locale/tr_TR/LC_MESSAGES/libretime.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: LibreTime\n" "Report-Msgid-Bugs-To: https://github.com/libretime/libretime/issues\n" -"POT-Creation-Date: 2024-05-06 01:56+0000\n" +"POT-Creation-Date: 2024-06-10 02:02+0000\n" "PO-Revision-Date: 2022-06-28 07:22+0000\n" "Last-Translator: metezd \n" "Language-Team: Turkish \n" @@ -3924,8 +3924,8 @@ msgstr "" msgid "The schedule you're viewing is out of date! (instance mismatch)" msgstr "" -#: application/models/Scheduler.php:138 application/models/Scheduler.php:491 -#: application/models/Scheduler.php:529 application/models/Scheduler.php:568 +#: application/models/Scheduler.php:138 application/models/Scheduler.php:492 +#: application/models/Scheduler.php:530 application/models/Scheduler.php:569 msgid "The schedule you're viewing is out of date!" msgstr "" @@ -3956,7 +3956,7 @@ msgstr "" msgid "Cannot schedule a playlist that contains missing files." msgstr "" -#: application/models/Scheduler.php:228 application/models/Scheduler.php:320 +#: application/models/Scheduler.php:229 application/models/Scheduler.php:321 msgid "A selected File does not exist!" msgstr "" diff --git a/legacy/locale/uk_UA/LC_MESSAGES/libretime.po b/legacy/locale/uk_UA/LC_MESSAGES/libretime.po index 596be6805..91022d9e1 100644 --- a/legacy/locale/uk_UA/LC_MESSAGES/libretime.po +++ b/legacy/locale/uk_UA/LC_MESSAGES/libretime.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: LibreTime\n" "Report-Msgid-Bugs-To: https://github.com/libretime/libretime/issues\n" -"POT-Creation-Date: 2024-05-06 01:56+0000\n" +"POT-Creation-Date: 2024-06-10 02:02+0000\n" "PO-Revision-Date: 2024-02-11 23:11+0000\n" "Last-Translator: Ihor Hordiichuk \n" "Language-Team: Ukrainian \n" @@ -3946,8 +3946,8 @@ msgstr "Розклад, який ви переглядаєте, застарів msgid "The schedule you're viewing is out of date! (instance mismatch)" msgstr "Розклад, який ви переглядаєте, застарів! (невідповідність екземплярів)" -#: application/models/Scheduler.php:138 application/models/Scheduler.php:491 -#: application/models/Scheduler.php:529 application/models/Scheduler.php:568 +#: application/models/Scheduler.php:138 application/models/Scheduler.php:492 +#: application/models/Scheduler.php:530 application/models/Scheduler.php:569 msgid "The schedule you're viewing is out of date!" msgstr "Розклад, який ви переглядаєте, застарів!" @@ -3978,7 +3978,7 @@ msgstr "Вміст пов’язаних програм не можна змін msgid "Cannot schedule a playlist that contains missing files." msgstr "Неможливо запланувати плейлист, який містить відсутні файли." -#: application/models/Scheduler.php:228 application/models/Scheduler.php:320 +#: application/models/Scheduler.php:229 application/models/Scheduler.php:321 msgid "A selected File does not exist!" msgstr "Вибраний файл не існує!" diff --git a/legacy/locale/zh_CN/LC_MESSAGES/libretime.po b/legacy/locale/zh_CN/LC_MESSAGES/libretime.po index 238607b0c..3087edef7 100644 --- a/legacy/locale/zh_CN/LC_MESSAGES/libretime.po +++ b/legacy/locale/zh_CN/LC_MESSAGES/libretime.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: LibreTime\n" "Report-Msgid-Bugs-To: https://github.com/libretime/libretime/issues\n" -"POT-Creation-Date: 2024-05-06 01:56+0000\n" +"POT-Creation-Date: 2024-06-10 02:02+0000\n" "PO-Revision-Date: 2015-09-05 08:33+0000\n" "Last-Translator: Daniel James \n" "Language-Team: Chinese (China)\n" @@ -3925,8 +3925,8 @@ msgstr "当前节目内容表（内容部分）需要刷新" msgid "The schedule you're viewing is out of date! (instance mismatch)" msgstr "当前节目内容表（节目已更改）需要刷新" -#: application/models/Scheduler.php:138 application/models/Scheduler.php:491 -#: application/models/Scheduler.php:529 application/models/Scheduler.php:568 +#: application/models/Scheduler.php:138 application/models/Scheduler.php:492 +#: application/models/Scheduler.php:530 application/models/Scheduler.php:569 msgid "The schedule you're viewing is out of date!" msgstr "当前节目内容需要刷新！" @@ -3957,7 +3957,7 @@ msgstr "" msgid "Cannot schedule a playlist that contains missing files." msgstr "" -#: application/models/Scheduler.php:228 application/models/Scheduler.php:320 +#: application/models/Scheduler.php:229 application/models/Scheduler.php:321 msgid "A selected File does not exist!" msgstr "某个选中的文件不存在。" From 826aac1c054f5dbe744fbf85f3508c1f3857b937 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 18 Jun 2024 09:18:21 +0100 Subject: [PATCH 14/29] chore(deps): lock file maintenance (legacy/composer.json) (#3033) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Update | Change | |---|---| | lockFileMaintenance | All locks refreshed | 🔧 This Pull Request updates lock files to use the latest dependency versions. --- ### Configuration 📅 **Schedule**: Branch creation - "after 4am and before 5am on monday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://togithub.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/libretime/libretime). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- legacy/composer.lock | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/legacy/composer.lock b/legacy/composer.lock index 9df936b15..f31e18de4 100644 --- a/legacy/composer.lock +++ b/legacy/composer.lock @@ -3440,16 +3440,16 @@ }, { "name": "myclabs/deep-copy", - "version": "1.11.1", + "version": "1.12.0", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c" + "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", - "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c", + "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c", "shasum": "" }, "require": { @@ -3457,11 +3457,12 @@ }, "conflict": { "doctrine/collections": "<1.6.8", - "doctrine/common": "<2.13.3 || >=3,<3.2.2" + "doctrine/common": "<2.13.3 || >=3 <3.2.2" }, "require-dev": { "doctrine/collections": "^1.6.8", "doctrine/common": "^2.13.3 || ^3.2.2", + "phpspec/prophecy": "^1.10", "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13" }, "type": "library", @@ -3487,7 +3488,7 @@ ], "support": { "issues": "https://github.com/myclabs/DeepCopy/issues", - "source": "https://github.com/myclabs/DeepCopy/tree/1.11.1" + "source": "https://github.com/myclabs/DeepCopy/tree/1.12.0" }, "funding": [ { @@ -3495,7 +3496,7 @@ "type": "tidelift" } ], - "time": "2023-03-08T13:26:56+00:00" + "time": "2024-06-12T14:39:25+00:00" }, { "name": "phpdocumentor/reflection-common", From 02cd85a845529fba51c0254370e456d7f286b4db Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 18 Jun 2024 08:19:39 +0000 Subject: [PATCH 15/29] chore(deps): update docker/bake-action action to v5 --- .github/workflows/container.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml index d3838269f..88afb8e35 100644 --- a/.github/workflows/container.yml +++ b/.github/workflows/container.yml @@ -86,7 +86,7 @@ jobs: echo "LIBRETIME_VERSION=$(cat VERSION | tr -d [:blank:])" >> $GITHUB_ENV - name: Build - uses: docker/bake-action@v4 + uses: docker/bake-action@v5 with: pull: true push: ${{ github.event_name == 'push' }} From 13a8e38beb047546cb8696ecd88d7cb7b67c78e0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 19 Jun 2024 14:52:00 +0000 Subject: [PATCH 16/29] chore(deps): update docker/build-push-action action to v6 --- .github/workflows/dev-tools.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dev-tools.yml b/.github/workflows/dev-tools.yml index 3f038a8ed..7bee6258f 100644 --- a/.github/workflows/dev-tools.yml +++ b/.github/workflows/dev-tools.yml @@ -78,7 +78,7 @@ jobs: EOF - name: Build and push - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . push: ${{ github.repository_owner == 'libretime' }} From 451652bc4002b142ab9cf33ae517451c4966134f Mon Sep 17 00:00:00 2001 From: dakriy Date: Sat, 22 Jun 2024 02:19:21 -0700 Subject: [PATCH 17/29] feat(legacy): add current date macro to string block criteria (#3013) ### Description It is useful to be able to automatically filter tracks to a certain date or day when scheduling tracks for playback. This adds the ability to do just that in any string filter with the `date{format}` macro. Closes: #3012 --- docs/user-manual/playlists.md | 1 + legacy/application/models/Block.php | 15 +++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/docs/user-manual/playlists.md b/docs/user-manual/playlists.md index 4cf99aaa5..d7e5ab107 100644 --- a/docs/user-manual/playlists.md +++ b/docs/user-manual/playlists.md @@ -37,6 +37,7 @@ Smart blocks are automatically filled with media files from the LibreTime librar To create a smart block, click the **Smartblocks** button on the left sidebar, and select **New** from the toolbar. Like a playlist, smart blocks can have a title and description, which you can edit. This helps you find relevant smart blocks in searches. Fill out the smart block's **Name**, **Search Criteria**, and **Limit to** sections. The search criteria can be any one of LibreTime's metadata categories, such as **Title**, **Creator** or **Genre**. The modifier depends on whether the metadata in question contains letters or numbers. For example, **Title** has modifiers including _contains_ and _starts with_, whereas the modifiers for **BPM** include _is greater than_ and _is in the range_. +To filter tracks using today's date information, use the `now{}` macro. Format characters are listed in the [php documentation](https://www.php.net/manual/en/datetime.format.php). For example, to filter to tracks with a **Title** that ends in `Instrumental Jan 2024` where `Jan 2024` is the current month and year, add a criteria for **Title** with a modifier of **ends with** and a value of `Instrumental now{M Y}`. If you have a large number of files which meet the criteria that you specify, you may wish to limit the duration of the smart block using the **Limit to** field, so that it fits within the show you have in mind. Select **hours**, **minutes** or **items** from the drop-down menu, and click the **Generate** button again, if it's a static smart block. Then click the **Save** button. diff --git a/legacy/application/models/Block.php b/legacy/application/models/Block.php index 343f8d476..ddbcba45b 100644 --- a/legacy/application/models/Block.php +++ b/legacy/application/models/Block.php @@ -1612,6 +1612,19 @@ SQL; return $storedCrit; } + private function resolveDate($value) + { + if (!is_string($value)) { + return $value; + } + + return preg_replace_callback( + '/now{(.*?)}/', + fn ($matches) => date($matches[1]), + $value + ); + } + // this function return list of propel object public function getListofFilesMeetCriteria($showLimit = null) { @@ -1677,6 +1690,8 @@ SQL; $spCriteriaExtra = $criteria['extra']; } + $spCriteriaValue = $this->resolveDate($spCriteriaValue); + if ($spCriteriaModifier == 'starts with') { $spCriteriaValue = "{$spCriteriaValue}%"; } elseif ($spCriteriaModifier == 'ends with') { From e5a8baafa8c833c65f01abb7964da09176f39b4d Mon Sep 17 00:00:00 2001 From: Jonas L Date: Sat, 22 Jun 2024 11:44:35 +0200 Subject: [PATCH 18/29] chore: fix broken link check (#3039) Only show organizations avatars. --- .github/workflows/housekeeping.yml | 1 - README.md | 19 ++----------------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/.github/workflows/housekeeping.yml b/.github/workflows/housekeeping.yml index 6263002be..4f86d4d4a 100644 --- a/.github/workflows/housekeeping.yml +++ b/.github/workflows/housekeeping.yml @@ -54,7 +54,6 @@ jobs: '**/*.md' --require-https --exclude-all-private - --exclude-mail --exclude 'example\.(com|org)' --exclude '\$server_name\$request_uri' --exclude '%7Bvars.version%7D' diff --git a/README.md b/README.md index d4b05741d..c27a86838 100644 --- a/README.md +++ b/README.md @@ -52,23 +52,8 @@ Become a financial contributor and help us sustain our community on [Support](https://opencollective.com/libretime/contribute) this project with your organization. Your logo will show up here with a link to your website. - - - - - - - - - - - - - - - - - + + ## License From f12392e276d767767b5cc0a854a442bbd6f171dd Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 22 Jun 2024 11:45:37 +0200 Subject: [PATCH 19/29] chore(deps): update dependency django-cors-headers to >=3.14.0,<4.5 (#3036) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [django-cors-headers](https://togithub.com/adamchainz/django-cors-headers) ([changelog](https://togithub.com/adamchainz/django-cors-headers/blob/main/CHANGELOG.rst)) | `>=3.14.0,<4.4` -> `>=3.14.0,<4.5` | [![age](https://developer.mend.io/api/mc/badges/age/pypi/django-cors-headers/4.4.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/pypi/django-cors-headers/4.4.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/pypi/django-cors-headers/4.3.1/4.4.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/pypi/django-cors-headers/4.3.1/4.4.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
adamchainz/django-cors-headers (django-cors-headers) ### [`v4.4.0`](https://togithub.com/adamchainz/django-cors-headers/blob/HEAD/CHANGELOG.rst#440-2024-06-19) [Compare Source](https://togithub.com/adamchainz/django-cors-headers/compare/4.3.1...4.4.0) - Support Django 5.1.
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/libretime/libretime). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- api/requirements.txt | 2 +- api/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/requirements.txt b/api/requirements.txt index 7ec90958f..10bdc8313 100644 --- a/api/requirements.txt +++ b/api/requirements.txt @@ -1,6 +1,6 @@ # Please do not edit this file, edit the setup.py file! # This file is auto-generated by tools/extract_requirements.py. -django-cors-headers>=3.14.0,<4.4 +django-cors-headers>=3.14.0,<4.5 django-filter>=2.4.0,<24.3 django>=4.2.0,<4.3 djangorestframework>=3.14.0,<3.16 diff --git a/api/setup.py b/api/setup.py index 87d70441e..451292be5 100644 --- a/api/setup.py +++ b/api/setup.py @@ -26,7 +26,7 @@ setup( ] }, install_requires=[ - "django-cors-headers>=3.14.0,<4.4", + "django-cors-headers>=3.14.0,<4.5", "django-filter>=2.4.0,<24.3", "django>=4.2.0,<4.3", "djangorestframework>=3.14.0,<3.16", From 7f3f31860178cbd572091d9a6a44a1ed1c5723d0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 22 Jun 2024 11:45:50 +0200 Subject: [PATCH 20/29] chore(deps): update dependency friendsofphp/php-cs-fixer to <3.59.4 (#3030) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [friendsofphp/php-cs-fixer](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer) | `<3.58.2` -> `<3.59.4` | [![age](https://developer.mend.io/api/mc/badges/age/packagist/friendsofphp%2fphp-cs-fixer/3.59.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/packagist/friendsofphp%2fphp-cs-fixer/3.59.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/packagist/friendsofphp%2fphp-cs-fixer/3.58.1/3.59.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/packagist/friendsofphp%2fphp-cs-fixer/3.58.1/3.59.3?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
PHP-CS-Fixer/PHP-CS-Fixer (friendsofphp/php-cs-fixer) ### [`v3.59.3`](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/HEAD/CHANGELOG.md#Changelog-for-v3593) [Compare Source](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/compare/v3.59.2...v3.59.3) - refactor: refactor to templated trait+interface ([#​7988](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7988)) ### [`v3.59.2`](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/HEAD/CHANGELOG.md#Changelog-for-v3592) [Compare Source](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/compare/v3.59.1...v3.59.2) - fix: "list" is reserved type ([#​8087](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8087)) - chore: add missing type in method prototype ([#​8088](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8088)) - CI: bump Ubuntu version ([#​8086](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8086)) - deps: bump infection to unblock PHPUnit 11, and few more as chore ([#​8083](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8083)) ### [`v3.59.1`](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/HEAD/CHANGELOG.md#Changelog-for-v3591) [Compare Source](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/compare/v3.59.0...v3.59.1) - fix: Bump React's JSON decoder buffer size ([#​8068](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8068)) - docs: options - handle enums in dicts ([#​8082](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8082)) ### [`v3.59.0`](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/HEAD/CHANGELOG.md#Changelog-for-v3590) [Compare Source](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/compare/v3.58.1...v3.59.0) - feat(Docker): Multi-arch build (support for `arm64`) ([#​8079](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8079)) - feat: `@PhpCsFixer` ruleset - normalise implicit backslashes in single quoted strings ([#​7965](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7965)) - feat: `SimpleToComplexStringVariableFixer` - support variable being an array ([#​8064](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8064)) - fix: Look up for PHPDoc's variable name by only chars allowed in the variables ([#​8062](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8062)) - fix: Update `PhpUnitTestCaseStaticMethodCallsFixer::STATIC_METHODS` ([#​8073](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8073)) - fix: `native_constant_invocation` - array constants with native constant names ([#​8008](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8008)) - chore: update PHPStan ([#​8060](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8060)) - CI: Update PHPStan to 1.11.4 ([#​8074](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8074)) - docs: don't expose list as config type for dicts ([#​8081](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8081)) - docs: Make wording in `final_class` docs less dismissive ([#​8065](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8065)) - docs: Update 1-bug_report.yml ([#​8067](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8067)) - DX: Remove version from Docker Compose files ([#​8061](https://togithub.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/8061))
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/libretime/libretime). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- legacy/tools/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/legacy/tools/composer.json b/legacy/tools/composer.json index 1e7440071..ea7b1a218 100644 --- a/legacy/tools/composer.json +++ b/legacy/tools/composer.json @@ -1,6 +1,6 @@ { "require-dev": { "php": "^7.4", - "friendsofphp/php-cs-fixer": "<3.58.2" + "friendsofphp/php-cs-fixer": "<3.59.4" } } From 4642b6c08ef813ab5dc7354f73141239f5c145e0 Mon Sep 17 00:00:00 2001 From: dakriy Date: Sat, 22 Jun 2024 02:51:59 -0700 Subject: [PATCH 21/29] feat(legacy): add filename block criteria (#3015) ### Description Adds filename block criteria because sometimes you just need the filename and the ID3 tags won't do. Closes #3014 --- legacy/application/assets.json | 2 +- .../application/forms/SmartBlockCriteria.php | 278 +++--------------- legacy/application/models/Block.php | 172 ++--------- legacy/application/models/Criteria.php | 210 +++++++++++++ .../js/airtime/playlist/smart_blockbuilder.js | 1 + 5 files changed, 269 insertions(+), 394 deletions(-) create mode 100644 legacy/application/models/Criteria.php diff --git a/legacy/application/assets.json b/legacy/application/assets.json index 1e0504fcf..dbd8041e6 100644 --- a/legacy/application/assets.json +++ b/legacy/application/assets.json @@ -73,7 +73,7 @@ "js/airtime/nowplaying/register.js": "7d1e5d38eee510c22e408077155ab672", "js/airtime/player/player.js": "76a78bfc1bac0c5479916d9d4641a5b1", "js/airtime/player/playerhtml5.js": "058b061891abf4b3ee827c8e83996611", - "js/airtime/playlist/smart_blockbuilder.js": "36337e7e025d89976d754e34fc914887", + "js/airtime/playlist/smart_blockbuilder.js": "9e6bbad77150a589a6efd3b7da80a03b", "js/airtime/playouthistory/configuretemplate.js": "44386f366d2baca3039f8c4cb9cd4422", "js/airtime/playouthistory/historytable.js": "7e84ee76011ecf8f21abdd483487a45e", "js/airtime/playouthistory/template.js": "742af1a411aef1745fa2ad3082499452", diff --git a/legacy/application/forms/SmartBlockCriteria.php b/legacy/application/forms/SmartBlockCriteria.php index 52f0a4a3b..c1d0f3df6 100644 --- a/legacy/application/forms/SmartBlockCriteria.php +++ b/legacy/application/forms/SmartBlockCriteria.php @@ -2,149 +2,11 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm { - private $criteriaOptions; - private $stringCriteriaOptions; - private $numericCriteriaOptions; - private $dateTimeCriteriaOptions; private $timePeriodCriteriaOptions; private $sortOptions; private $limitOptions; - private $isOrNotCriteriaOptions; private $trackTypeOptions; - /* We need to know if the criteria value will be a string - * or numeric value in order to populate the modifier - * select list - */ - private $criteriaTypes = [ - 0 => '', - 'album_title' => 's', - 'bit_rate' => 'n', - 'bpm' => 'n', - 'composer' => 's', - 'conductor' => 's', - 'copyright' => 's', - 'cuein' => 'n', - 'cueout' => 'n', - 'description' => 's', - 'artist_name' => 's', - 'encoded_by' => 's', - 'utime' => 'd', - 'mtime' => 'd', - 'lptime' => 'd', - 'genre' => 's', - 'isrc_number' => 's', - 'label' => 's', - 'language' => 's', - 'length' => 'n', - 'mime' => 's', - 'mood' => 's', - 'owner_id' => 's', - 'replay_gain' => 'n', - 'sample_rate' => 'n', - 'track_title' => 's', - 'track_number' => 'n', - 'info_url' => 's', - 'year' => 'n', - 'track_type_id' => 'tt', - ]; - - private function getCriteriaOptions($option = null) - { - if (!isset($this->criteriaOptions)) { - $this->criteriaOptions = [ - 0 => _('Select criteria'), - 'album_title' => _('Album'), - 'bit_rate' => _('Bit Rate (Kbps)'), - 'bpm' => _('BPM'), - 'composer' => _('Composer'), - 'conductor' => _('Conductor'), - 'copyright' => _('Copyright'), - 'cuein' => _('Cue In'), - 'cueout' => _('Cue Out'), - 'description' => _('Description'), - 'artist_name' => _('Creator'), - 'encoded_by' => _('Encoded By'), - 'genre' => _('Genre'), - 'isrc_number' => _('ISRC'), - 'label' => _('Label'), - 'language' => _('Language'), - 'mtime' => _('Last Modified'), - 'lptime' => _('Last Played'), - 'length' => _('Length'), - 'track_type_id' => _('Track Type'), - 'mime' => _('Mime'), - 'mood' => _('Mood'), - 'owner_id' => _('Owner'), - 'replay_gain' => _('Replay Gain'), - 'sample_rate' => _('Sample Rate (kHz)'), - 'track_title' => _('Title'), - 'track_number' => _('Track Number'), - 'utime' => _('Uploaded'), - 'info_url' => _('Website'), - 'year' => _('Year'), - ]; - } - - if (is_null($option)) { - return $this->criteriaOptions; - } - - return $this->criteriaOptions[$option]; - } - - private function getStringCriteriaOptions() - { - if (!isset($this->stringCriteriaOptions)) { - $this->stringCriteriaOptions = [ - '0' => _('Select modifier'), - 'contains' => _('contains'), - 'does not contain' => _('does not contain'), - 'is' => _('is'), - 'is not' => _('is not'), - 'starts with' => _('starts with'), - 'ends with' => _('ends with'), - ]; - } - - return $this->stringCriteriaOptions; - } - - private function getNumericCriteriaOptions() - { - if (!isset($this->numericCriteriaOptions)) { - $this->numericCriteriaOptions = [ - '0' => _('Select modifier'), - 'is' => _('is'), - 'is not' => _('is not'), - 'is greater than' => _('is greater than'), - 'is less than' => _('is less than'), - 'is in the range' => _('is in the range'), - ]; - } - - return $this->numericCriteriaOptions; - } - - private function getDateTimeCriteriaOptions() - { - if (!isset($this->dateTimeCriteriaOptions)) { - $this->dateTimeCriteriaOptions = [ - '0' => _('Select modifier'), - 'before' => _('before'), - 'after' => _('after'), - 'between' => _('between'), - 'is' => _('is'), - 'is not' => _('is not'), - 'is greater than' => _('is greater than'), - 'is less than' => _('is less than'), - 'is in the range' => _('is in the range'), - ]; - } - - return $this->dateTimeCriteriaOptions; - } - private function getTimePeriodCriteriaOptions() { if (!isset($this->timePeriodCriteriaOptions)) { @@ -191,19 +53,6 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm return $this->sortOptions; } - private function getIsNotOptions() - { - if (!isset($this->isOrNotCriteriaOptions)) { - $this->isOrNotCriteriaOptions = [ - '0' => _('Select modifier'), - 'is' => _('is'), - 'is not' => _('is not'), - ]; - } - - return $this->isOrNotCriteriaOptions; - } - private function getTracktypeOptions() { if (!isset($this->trackTypeOptions)) { @@ -297,7 +146,7 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm } // the way the everything is currently built it setups 25 smartblock criteria forms and then disables them // but this creates 29 elements - $numElements = count($this->getCriteriaOptions()); + $numElements = count(BlockCriteria::displayCriteria()); // loop through once for each potential criteria option ie album, composer, track // criteria from different groups are separated already by the getCriteriaGrouped call @@ -335,7 +184,7 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm $criteria->setAttrib('class', 'input_select sp_input_select' . $invisible) ->setValue('Select criteria') ->setDecorators(['viewHelper']) - ->setMultiOptions($this->getCriteriaOptions()); + ->setMultiOptions(BlockCriteria::displayCriteria()); // if this isn't the first criteria and there isn't an entry for it already disable it if ($i != 0 && !isset($criteriaKeys[$i])) { $criteria->setAttrib('disabled', 'disabled'); @@ -344,8 +193,9 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm // the j loop starts at 0 and grows for each item matching the same criteria // look up the criteria type using the criteriaTypes function from above based upon the criteria value if (isset($criteriaKeys[$i])) { - $criteriaType = $this->criteriaTypes[$storedCrit['crit'][$criteriaKeys[$i]][$j]['criteria']]; - $criteria->setValue($storedCrit['crit'][$criteriaKeys[$i]][$j]['criteria']); + $bCriteria = BlockCriteria::get($storedCrit['crit'][$criteriaKeys[$i]][$j]['criteria']); + $criteriaType = $bCriteria->type; + $criteria->setValue($bCriteria->key); } $this->addElement($criteria); @@ -361,18 +211,10 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm } // determine the modifier based upon criteria type which is looked up based upon an array if (isset($criteriaKeys[$i])) { - if ($criteriaType == 's') { - $criteriaModifers->setMultiOptions($this->getStringCriteriaOptions()); - } elseif ($criteriaType == 'd') { - $criteriaModifers->setMultiOptions($this->getDateTimeCriteriaOptions()); - } elseif ($criteriaType == 'tt') { - $criteriaModifers->setMultiOptions($this->getIsNotOptions()); - } else { - $criteriaModifers->setMultiOptions($this->getNumericCriteriaOptions()); - } + $criteriaModifers->setMultiOptions($bCriteria->displayModifiers()); $criteriaModifers->setValue($storedCrit['crit'][$criteriaKeys[$i]][$j]['modifier']); } else { - $criteriaModifers->setMultiOptions(['0' => _('Select modifier')]); + $criteriaModifers->setMultiOptions(CriteriaModifier::mapToDisplay([])); } $this->addElement($criteriaModifers); @@ -381,7 +223,7 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm if (isset($criteriaKeys[$i])) { $modifierTest = (string) $storedCrit['crit'][$criteriaKeys[$i]][$j]['modifier']; if ( - isset($criteriaType) && $criteriaType == 'tt' + isset($criteriaType) && $criteriaType == ModifierType::TRACK_TYPE && preg_match('/is|is not/', $modifierTest) == 1 ) { $criteriaValue = new Zend_Form_Element_Select('sp_criteria_value_' . $i . '_' . $j); @@ -412,14 +254,14 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm $relativeDateTime = false; $modifierTest = (string) $storedCrit['crit'][$criteriaKeys[$i]][$j]['modifier']; if ( - isset($criteriaType) && $criteriaType == 'd' + isset($criteriaType) && $criteriaType == ModifierType::DATE && preg_match('/before|after|between/', $modifierTest) == 1 ) { // set relativeDatetime boolean to true so that the datetime select is displayed below $relativeDateTime = true; $criteriaValue->setValue(filter_var($storedCrit['crit'][$criteriaKeys[$i]][$j]['value'], FILTER_SANITIZE_NUMBER_INT)); } elseif ( - isset($criteriaType) && $criteriaType == 'tt' + isset($criteriaType) && $criteriaType == ModifierType::TRACK_TYPE && preg_match('/is|is not/', $modifierTest) == 1 ) { // set relativeDatetime boolean to true so that the datetime select is displayed below @@ -455,7 +297,7 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm // check if the value is stored and it is a relative datetime field if ( isset($criteriaKeys[$i], $storedCrit['crit'][$criteriaKeys[$i]][$j]['value'], $criteriaType) - && $criteriaType == 'd' + && $criteriaType == ModifierType::DATE && preg_match('/before|after|between/', $modifierTest) == 1 ) { // need to remove any leading numbers stored in the database @@ -478,7 +320,7 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm ->setDecorators(['viewHelper']); if (isset($criteriaKeys[$i], $storedCrit['crit'][$criteriaKeys[$i]][$j]['extra'])) { // need to check if this is a relative date time value - if (isset($criteriaType) && $criteriaType == 'd' && $modifierTest == 'between') { + if (isset($criteriaType) && $criteriaType == ModifierType::DATE && $modifierTest == 'between') { // the criteria value will be a number followed by time unit and ago so set input to number part $criteriaExtra->setValue(filter_var($storedCrit['crit'][$criteriaKeys[$i]][$j]['extra'], FILTER_SANITIZE_NUMBER_INT)); } else { @@ -610,28 +452,21 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm foreach ($data['criteria'] as $critKey => $d) { $count = 1; foreach ($d as $modKey => $modInfo) { + $critMod = $critKey . '_' . $modKey; + $blockCriteria = BlockCriteria::get($modInfo['sp_criteria_field']); if ($modKey == 0) { - $eleCrit = $this->getElement('sp_criteria_field_' . $critKey . '_' . $modKey); - $eleCrit->setValue($this->getCriteriaOptions($modInfo['sp_criteria_field'])); + $eleCrit = $this->getElement('sp_criteria_field_' . $critMod); + $eleCrit->setValue($blockCriteria->display); $eleCrit->setAttrib('disabled', null); - $eleMod = $this->getElement('sp_criteria_modifier_' . $critKey . '_' . $modKey); - $criteriaType = $this->criteriaTypes[$modInfo['sp_criteria_field']]; - if ($criteriaType == 's') { - $eleMod->setMultiOptions($this->getStringCriteriaOptions()); - } elseif ($criteriaType == 'n') { - $eleMod->setMultiOptions($this->getNumericCriteriaOptions()); - } elseif ($criteriaType == 'd') { - $eleMod->setMultiOptions($this->getDateTimeCriteriaOptions()); - } elseif ($criteriaType == 'tt') { - $eleMod->setMultiOptions($this->getIsNotOptions()); - } else { - $eleMod->setMultiOptions(['0' => _('Select modifier')]); - } + $eleMod = $this->getElement('sp_criteria_modifier_' . $critMod); + + $eleMod->setMultiOptions($blockCriteria->displayModifiers()); + $eleMod->setValue($modInfo['sp_criteria_modifier']); $eleMod->setAttrib('disabled', null); - $eleDatetime = $this->getElement('sp_criteria_datetime_select_' . $critKey . '_' . $modKey); + $eleDatetime = $this->getElement('sp_criteria_datetime_select_' . $critMod); if ($this->enableDateTimeUnit($eleMod->getValue())) { $eleDatetime->setAttrib('enabled', 'enabled'); $eleDatetime->setValue($modInfo['sp_criteria_datetime_select']); @@ -639,17 +474,17 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm } else { $eleDatetime->setAttrib('disabled', 'disabled'); } - $eleValue = $this->getElement('sp_criteria_value_' . $critKey . '_' . $modKey); + $eleValue = $this->getElement('sp_criteria_value_' . $critMod); $eleValue->setValue($modInfo['sp_criteria_value']); $eleValue->setAttrib('disabled', null); if (isset($modInfo['sp_criteria_extra'])) { - $eleExtra = $this->getElement('sp_criteria_extra_' . $critKey . '_' . $modKey); + $eleExtra = $this->getElement('sp_criteria_extra_' . $critMod); $eleExtra->setValue($modInfo['sp_criteria_extra']); $eleValue->setAttrib('class', 'input_text sp_extra_input_text'); $eleExtra->setAttrib('disabled', null); } - $eleExtraDatetime = $this->getElement('sp_criteria_extra_datetime_select_' . $critKey . '_' . $modKey); + $eleExtraDatetime = $this->getElement('sp_criteria_extra_datetime_select_' . $critMod); if ($eleMod->getValue() == 'between') { $eleExtraDatetime->setAttrib('enabled', 'enabled'); $eleExtraDatetime->setValue($modInfo['sp_criteria_extra_datetime_select']); @@ -658,45 +493,34 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm $eleExtraDatetime->setAttrib('disabled', 'disabled'); } } else { - $criteria = new Zend_Form_Element_Select('sp_criteria_field_' . $critKey . '_' . $modKey); + $criteria = new Zend_Form_Element_Select('sp_criteria_field_' . $critMod); $criteria->setAttrib('class', 'input_select sp_input_select sp-invisible') ->setValue('Select criteria') ->setDecorators(['viewHelper']) - ->setMultiOptions($this->getCriteriaOptions()); + ->setMultiOptions(BlockCriteria::displayCriteria()); - $criteriaType = $this->criteriaTypes[$modInfo['sp_criteria_field']]; - $criteria->setValue($this->getCriteriaOptions($modInfo['sp_criteria_field'])); + $criteria->setValue($blockCriteria->display); $this->addElement($criteria); // MODIFIER - $criteriaModifers = new Zend_Form_Element_Select('sp_criteria_modifier_' . $critKey . '_' . $modKey); + $criteriaModifers = new Zend_Form_Element_Select('sp_criteria_modifier_' . $critMod); $criteriaModifers->setValue('Select modifier') ->setAttrib('class', 'input_select sp_input_select') ->setDecorators(['viewHelper']); - if ($criteriaType == 's') { - $criteriaModifers->setMultiOptions($this->getStringCriteriaOptions()); - } elseif ($criteriaType == 'n') { - $criteriaModifers->setMultiOptions($this->getNumericCriteriaOptions()); - } elseif ($criteriaType == 'd') { - $criteriaModifers->setMultiOptions($this->getDateTimeCriteriaOptions()); - } elseif ($criteriaType == 'tt') { - $criteriaModifers->setMultiOptions($this->getIsNotOptions()); - } else { - $criteriaModifers->setMultiOptions(['0' => _('Select modifier')]); - } + $criteriaModifers->setMultiOptions($blockCriteria->displayModifiers()); $criteriaModifers->setValue($modInfo['sp_criteria_modifier']); $this->addElement($criteriaModifers); // VALUE - $criteriaValue = new Zend_Form_Element_Text('sp_criteria_value_' . $critKey . '_' . $modKey); + $criteriaValue = new Zend_Form_Element_Text('sp_criteria_value_' . $critMod); $criteriaValue->setAttrib('class', 'input_text sp_input_text') ->setDecorators(['viewHelper']); $criteriaValue->setValue($modInfo['sp_criteria_value']); $this->addElement($criteriaValue); // DATETIME UNIT SELECT - $criteriaDatetimeSelect = new Zend_Form_Element_Select('sp_criteria_datetime_select_' . $critKey . '_' . $modKey); + $criteriaDatetimeSelect = new Zend_Form_Element_Select('sp_criteria_datetime_select_' . $critMod); $criteriaDatetimeSelect->setAttrib('class', 'input_select sp_input_select') ->setDecorators(['viewHelper']); if ($this->enableDateTimeUnit($criteriaValue->getValue())) { @@ -708,7 +532,7 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm $criteriaDatetimeSelect->setAttrib('disabled', 'disabled'); } // EXTRA - $criteriaExtra = new Zend_Form_Element_Text('sp_criteria_extra_' . $critKey . '_' . $modKey); + $criteriaExtra = new Zend_Form_Element_Text('sp_criteria_extra_' . $critMod); $criteriaExtra->setAttrib('class', 'input_text sp_extra_input_text') ->setDecorators(['viewHelper']); if (isset($modInfo['sp_criteria_extra'])) { @@ -721,7 +545,7 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm // EXTRA DATETIME UNIT SELECT - $criteriaExtraDatetimeSelect = new Zend_Form_Element_Select('sp_criteria_extra_datetime_select_' . $critKey . '_' . $modKey); + $criteriaExtraDatetimeSelect = new Zend_Form_Element_Select('sp_criteria_extra_datetime_select_' . $critMod); $criteriaExtraDatetimeSelect->setAttrib('class', 'input_select sp_input_select') ->setDecorators(['viewHelper']); if ($criteriaValue->getValue() == 'between') { @@ -761,45 +585,13 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm { $isValid = true; $data = $this->preValidation($params); - $criteria2PeerMap = [ - 0 => 'Select criteria', - 'album_title' => 'DbAlbumTitle', - 'artist_name' => 'DbArtistName', - 'bit_rate' => 'DbBitRate', - 'bpm' => 'DbBpm', - 'composer' => 'DbComposer', - 'conductor' => 'DbConductor', - 'copyright' => 'DbCopyright', - 'cuein' => 'DbCuein', - 'cueout' => 'DbCueout', - 'description' => 'DbDescription', - 'encoded_by' => 'DbEncodedBy', - 'utime' => 'DbUtime', - 'mtime' => 'DbMtime', - 'lptime' => 'DbLPtime', - 'genre' => 'DbGenre', - 'info_url' => 'DbInfoUrl', - 'isrc_number' => 'DbIsrcNumber', - 'label' => 'DbLabel', - 'language' => 'DbLanguage', - 'length' => 'DbLength', - 'mime' => 'DbMime', - 'mood' => 'DbMood', - 'owner_id' => 'DbOwnerId', - 'replay_gain' => 'DbReplayGain', - 'sample_rate' => 'DbSampleRate', - 'track_title' => 'DbTrackTitle', - 'track_number' => 'DbTrackNumber', - 'year' => 'DbYear', - 'track_type_id' => 'DbTrackTypeId', - ]; + $allCriteria = BlockCriteria::criteriaMap(); // things we need to check // 1. limit value shouldn't be empty and has upperbound of 24 hrs // 2. sp_criteria or sp_criteria_modifier shouldn't be 0 // 3. validate formate according to DB column type $multiplier = 1; - $result = 0; // validation start if ($data['etc']['sp_limit_options'] == 'hours') { @@ -840,7 +632,7 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm $element->addError(_('You must select Criteria and Modifier')); $isValid = false; } else { - $column = CcFilesPeer::getTableMap()->getColumnByPhpName($criteria2PeerMap[$d['sp_criteria_field']]); + $column = CcFilesPeer::getTableMap()->getColumnByPhpName($allCriteria[$d['sp_criteria_field']]->peer); // validation on type of column if (in_array($d['sp_criteria_field'], ['length', 'cuein', 'cueout'])) { if (!preg_match('/^(\d{2}):(\d{2}):(\d{2})/', $d['sp_criteria_value'])) { diff --git a/legacy/application/models/Block.php b/legacy/application/models/Block.php index ddbcba45b..82cba1b48 100644 --- a/legacy/application/models/Block.php +++ b/legacy/application/models/Block.php @@ -41,51 +41,18 @@ class Application_Model_Block implements Application_Model_LibraryEditable ]; private static $modifier2CriteriaMap = [ - 'contains' => Criteria::ILIKE, - 'does not contain' => Criteria::NOT_ILIKE, - 'is' => Criteria::EQUAL, - 'is not' => Criteria::NOT_EQUAL, - 'starts with' => Criteria::ILIKE, - 'ends with' => Criteria::ILIKE, - 'is greater than' => Criteria::GREATER_THAN, - 'is less than' => Criteria::LESS_THAN, - 'is in the range' => Criteria::CUSTOM, - 'before' => Criteria::CUSTOM, - 'after' => Criteria::CUSTOM, - 'between' => Criteria::CUSTOM, - ]; - - private static $criteria2PeerMap = [ - 0 => 'Select criteria', - 'album_title' => 'DbAlbumTitle', - 'artist_name' => 'DbArtistName', - 'bit_rate' => 'DbBitRate', - 'bpm' => 'DbBpm', - 'composer' => 'DbComposer', - 'conductor' => 'DbConductor', - 'copyright' => 'DbCopyright', - 'cuein' => 'DbCuein', - 'cueout' => 'DbCueout', - 'description' => 'DbDescription', - 'encoded_by' => 'DbEncodedBy', - 'utime' => 'DbUtime', - 'mtime' => 'DbMtime', - 'lptime' => 'DbLPtime', - 'genre' => 'DbGenre', - 'info_url' => 'DbInfoUrl', - 'isrc_number' => 'DbIsrcNumber', - 'label' => 'DbLabel', - 'language' => 'DbLanguage', - 'length' => 'DbLength', - 'mime' => 'DbMime', - 'mood' => 'DbMood', - 'owner_id' => 'DbOwnerId', - 'replay_gain' => 'DbReplayGain', - 'sample_rate' => 'DbSampleRate', - 'track_title' => 'DbTrackTitle', - 'track_number' => 'DbTrackNumber', - 'year' => 'DbYear', - 'track_type_id' => 'DbTrackTypeId', + CriteriaModifier::CONTAINS => Criteria::ILIKE, + CriteriaModifier::DOES_NOT_CONTAIN => Criteria::NOT_ILIKE, + CriteriaModifier::IS => Criteria::EQUAL, + CriteriaModifier::IS_NOT => Criteria::NOT_EQUAL, + CriteriaModifier::STARTS_WITH => Criteria::ILIKE, + CriteriaModifier::ENDS_WITH => Criteria::ILIKE, + CriteriaModifier::IS_GREATER_THAN => Criteria::GREATER_THAN, + CriteriaModifier::IS_LESS_THAN => Criteria::LESS_THAN, + CriteriaModifier::IS_IN_THE_RANGE => Criteria::CUSTOM, + CriteriaModifier::BEFORE => Criteria::CUSTOM, + CriteriaModifier::AFTER => Criteria::CUSTOM, + CriteriaModifier::BETWEEN => Criteria::CUSTOM, ]; public function __construct($id = null, $con = null) @@ -1424,57 +1391,8 @@ SQL; */ public function getCriteria() { - $criteriaOptions = [ - 0 => _('Select criteria'), - 'album_title' => _('Album'), - 'bit_rate' => _('Bit Rate (Kbps)'), - 'bpm' => _('BPM'), - 'composer' => _('Composer'), - 'conductor' => _('Conductor'), - 'copyright' => _('Copyright'), - 'cuein' => _('Cue In'), - 'cueout' => _('Cue Out'), - 'description' => _('Description'), - 'artist_name' => _('Creator'), - 'encoded_by' => _('Encoded By'), - 'genre' => _('Genre'), - 'isrc_number' => _('ISRC'), - 'label' => _('Label'), - 'language' => _('Language'), - 'utime' => _('Upload Time'), - 'mtime' => _('Last Modified'), - 'lptime' => _('Last Played'), - 'length' => _('Length'), - 'track_type_id' => _('Track Type'), - 'mime' => _('Mime'), - 'mood' => _('Mood'), - 'owner_id' => _('Owner'), - 'replay_gain' => _('Replay Gain'), - 'sample_rate' => _('Sample Rate (kHz)'), - 'track_title' => _('Title'), - 'track_number' => _('Track Number'), - 'utime' => _('Uploaded'), - 'info_url' => _('Website'), - 'year' => _('Year'), - ]; - - $modifierOptions = [ - '0' => _('Select modifier'), - 'contains' => _('contains'), - 'does not contain' => _('does not contain'), - 'is' => _('is'), - 'is not' => _('is not'), - 'starts with' => _('starts with'), - 'ends with' => _('ends with'), - 'before' => _('before'), - 'after' => _('after'), - 'between' => _('between'), - 'is' => _('is'), - 'is not' => _('is not'), - 'is greater than' => _('is greater than'), - 'is less than' => _('is less than'), - 'is in the range' => _('is in the range'), - ]; + $allCriteria = BlockCriteria::criteriaMap(); + $allOptions = CriteriaModifier::mapToDisplay(); // Load criteria from db $out = CcBlockcriteriaQuery::create()->orderByDbCriteria()->findByDbBlockId($this->id); @@ -1500,14 +1418,15 @@ SQL; } elseif ($criteria == 'sort') { $storedCrit['sort'] = ['value' => $value]; } else { + $c = $allCriteria[$criteria]; $storedCrit['crit'][$criteria][] = [ 'criteria' => $criteria, 'value' => $value, 'modifier' => $modifier, 'extra' => $extra, 'criteria_group' => $criteriagroup, - 'display_name' => $criteriaOptions[$criteria], - 'display_modifier' => $modifierOptions[$modifier], + 'display_name' => $c->display, + 'display_modifier' => $allOptions[$modifier], ]; } } @@ -1522,57 +1441,8 @@ SQL; */ public function getCriteriaGrouped() { - $criteriaOptions = [ - 0 => _('Select criteria'), - 'album_title' => _('Album'), - 'bit_rate' => _('Bit Rate (Kbps)'), - 'bpm' => _('BPM'), - 'composer' => _('Composer'), - 'conductor' => _('Conductor'), - 'copyright' => _('Copyright'), - 'cuein' => _('Cue In'), - 'cueout' => _('Cue Out'), - 'description' => _('Description'), - 'artist_name' => _('Creator'), - 'encoded_by' => _('Encoded By'), - 'genre' => _('Genre'), - 'isrc_number' => _('ISRC'), - 'label' => _('Label'), - 'language' => _('Language'), - 'utime' => _('Upload Time'), - 'mtime' => _('Last Modified'), - 'lptime' => _('Last Played'), - 'length' => _('Length'), - 'track_type_id' => _('Track Type'), - 'mime' => _('Mime'), - 'mood' => _('Mood'), - 'owner_id' => _('Owner'), - 'replay_gain' => _('Replay Gain'), - 'sample_rate' => _('Sample Rate (kHz)'), - 'track_title' => _('Title'), - 'track_number' => _('Track Number'), - 'utime' => _('Uploaded'), - 'info_url' => _('Website'), - 'year' => _('Year'), - ]; - - $modifierOptions = [ - '0' => _('Select modifier'), - 'contains' => _('contains'), - 'does not contain' => _('does not contain'), - 'is' => _('is'), - 'is not' => _('is not'), - 'starts with' => _('starts with'), - 'ends with' => _('ends with'), - 'before' => _('before'), - 'after' => _('after'), - 'between' => _('between'), - 'is' => _('is'), - 'is not' => _('is not'), - 'is greater than' => _('is greater than'), - 'is less than' => _('is less than'), - 'is in the range' => _('is in the range'), - ]; + $criteriaOptions = BlockCriteria::displayCriteria(); + $modifierOptions = CriteriaModifier::mapToDisplay(); // Load criteria from db $out = CcBlockcriteriaQuery::create()->orderByDbCriteria()->findByDbBlockId($this->id); @@ -1633,6 +1503,8 @@ SQL; $qry = CcFilesQuery::create(); $qry->useFkOwnerQuery('subj', 'left join'); + $allCriteria = BlockCriteria::criteriaMap(); + // Logging::info($storedCrit); if (isset($storedCrit['crit'])) { foreach ($storedCrit['crit'] as $crit) { @@ -1649,7 +1521,7 @@ SQL; $spCriteria = $criteria['criteria']; $spCriteriaModifier = $criteria['modifier']; - $column = CcFilesPeer::getTableMap()->getColumnByPhpName(self::$criteria2PeerMap[$spCriteria]); + $column = CcFilesPeer::getTableMap()->getColumnByPhpName($allCriteria[$spCriteria]->peer); // data should already be in UTC, do we have to do anything special here anymore? if ($column->getType() == PropelColumnTypes::TIMESTAMP) { diff --git a/legacy/application/models/Criteria.php b/legacy/application/models/Criteria.php new file mode 100644 index 000000000..909e60256 --- /dev/null +++ b/legacy/application/models/Criteria.php @@ -0,0 +1,210 @@ + _('Select modifier')]; + + foreach ($modifiers as $m) { + $arr[$m] = _($m); + } + + return $arr; + } + + public const ALL = [ + CriteriaModifier::CONTAINS, + CriteriaModifier::DOES_NOT_CONTAIN, + CriteriaModifier::IS, + CriteriaModifier::IS_NOT, + CriteriaModifier::STARTS_WITH, + CriteriaModifier::ENDS_WITH, + CriteriaModifier::BEFORE, + CriteriaModifier::AFTER, + CriteriaModifier::BETWEEN, + CriteriaModifier::IS_GREATER_THAN, + CriteriaModifier::IS_LESS_THAN, + CriteriaModifier::IS_IN_THE_RANGE, + ]; + + public const FOR_STRING = [ + CriteriaModifier::CONTAINS, + CriteriaModifier::DOES_NOT_CONTAIN, + CriteriaModifier::IS, + CriteriaModifier::IS_NOT, + CriteriaModifier::STARTS_WITH, + CriteriaModifier::ENDS_WITH, + ]; + + public const FOR_NUMBER = [ + CriteriaModifier::IS, + CriteriaModifier::IS_NOT, + CriteriaModifier::IS_GREATER_THAN, + CriteriaModifier::IS_LESS_THAN, + CriteriaModifier::IS_IN_THE_RANGE, + ]; + + public const FOR_DATE = [ + CriteriaModifier::BEFORE, + CriteriaModifier::AFTER, + CriteriaModifier::BETWEEN, + CriteriaModifier::IS, + CriteriaModifier::IS_NOT, + CriteriaModifier::IS_GREATER_THAN, + CriteriaModifier::IS_LESS_THAN, + CriteriaModifier::IS_IN_THE_RANGE, + ]; + + public const FOR_TRACK_TYPE = [ + CriteriaModifier::IS, + CriteriaModifier::IS_NOT, + ]; +} + +class BlockCriteria +{ + public string $key; + public string $type; + public string $peer; + public string $display; + + public function __construct(string $key, string $type, string $peer, string $display) + { + $this->key = $key; + $this->type = $type; + $this->peer = $peer; + $this->display = $display; + } + + public function getModifiers(): array + { + $modifiers = []; + + switch ($this->type) { + case ModifierType::STRING: + $modifiers = CriteriaModifier::FOR_STRING; + + break; + + case ModifierType::DATE: + $modifiers = CriteriaModifier::FOR_DATE; + + break; + + case ModifierType::NUMBER: + $modifiers = CriteriaModifier::FOR_NUMBER; + + break; + + case ModifierType::TRACK_TYPE: + $modifiers = CriteriaModifier::FOR_TRACK_TYPE; + + break; + } + + return $modifiers; + } + + public function displayModifiers(): array + { + return CriteriaModifier::mapToDisplay(self::getModifiers()); + } + + private static array $allCriteria; + + /** + * After adding a new criteria don't forget to also add it into smart_blockbuilder.js. + * + * @return BlockCriteria[] + */ + public static function allCriteria(): array + { + if (!isset(BlockCriteria::$allCriteria)) { + BlockCriteria::$allCriteria = [ + new BlockCriteria('album_title', ModifierType::STRING, 'DbAlbumTitle', _('Album')), + new BlockCriteria('artist_name', ModifierType::STRING, 'DbArtistName', _('Creator')), + new BlockCriteria('bit_rate', ModifierType::NUMBER, 'DbBitRate', _('Bit Rate (Kbps)')), + new BlockCriteria('bpm', ModifierType::NUMBER, 'DbBpm', _('BPM')), + new BlockCriteria('composer', ModifierType::STRING, 'DbComposer', _('Composer')), + new BlockCriteria('conductor', ModifierType::STRING, 'DbConductor', _('Conductor')), + new BlockCriteria('copyright', ModifierType::STRING, 'DbCopyright', _('Copyright')), + new BlockCriteria('cuein', ModifierType::NUMBER, 'DbCuein', _('Cue In')), + new BlockCriteria('cueout', ModifierType::NUMBER, 'DbCueout', _('Cue Out')), + new BlockCriteria('description', ModifierType::STRING, 'DbDescription', _('Description')), + new BlockCriteria('encoded_by', ModifierType::STRING, 'DbEncodedBy', _('Encoded By')), + new BlockCriteria('utime', ModifierType::DATE, 'DbUtime', _('Uploaded')), + new BlockCriteria('mtime', ModifierType::DATE, 'DbMtime', _('Last Modified')), + new BlockCriteria('lptime', ModifierType::DATE, 'DbLPtime', _('Last Played')), + new BlockCriteria('genre', ModifierType::STRING, 'DbGenre', _('Genre')), + new BlockCriteria('info_url', ModifierType::STRING, 'DbInfoUrl', _('Website')), + new BlockCriteria('isrc_number', ModifierType::STRING, 'DbIsrcNumber', _('ISRC')), + new BlockCriteria('label', ModifierType::STRING, 'DbLabel', _('Label')), + new BlockCriteria('language', ModifierType::STRING, 'DbLanguage', _('Language')), + new BlockCriteria('length', ModifierType::NUMBER, 'DbLength', _('Length')), + new BlockCriteria('mime', ModifierType::STRING, 'DbMime', _('Mime')), + new BlockCriteria('mood', ModifierType::STRING, 'DbMood', _('Mood')), + new BlockCriteria('owner_id', ModifierType::STRING, 'DbOwnerId', _('Owner')), + new BlockCriteria('replay_gain', ModifierType::NUMBER, 'DbReplayGain', _('Replay Gain')), + new BlockCriteria('sample_rate', ModifierType::NUMBER, 'DbSampleRate', _('Sample Rate (kHz)')), + new BlockCriteria('track_title', ModifierType::STRING, 'DbTrackTitle', _('Title')), + new BlockCriteria('track_number', ModifierType::NUMBER, 'DbTrackNumber', _('Track Number')), + new BlockCriteria('year', ModifierType::NUMBER, 'DbYear', _('Year')), + new BlockCriteria('track_type_id', ModifierType::TRACK_TYPE, 'DbTrackTypeId', _('Track Type')), + new BlockCriteria('filepath', ModifierType::STRING, 'DbFilepath', _('File Name')), + ]; + } + + return BlockCriteria::$allCriteria; + } + + public static function displayCriteria(): array + { + $arr = [0 => _('Select criteria')]; + + foreach (self::allCriteria() as $c) { + $arr[$c->key] = $c->display; + } + + return $arr; + } + + /** + * @return BlockCriteria[] + */ + public static function criteriaMap(): array + { + $arr = []; + foreach (self::allCriteria() as $i) { + $arr[$i->key] = $i; + } + + return $arr; + } + + public static function get(string $key): BlockCriteria + { + return self::criteriaMap()[$key]; + } +} diff --git a/legacy/public/js/airtime/playlist/smart_blockbuilder.js b/legacy/public/js/airtime/playlist/smart_blockbuilder.js index 0c4ff36be..aa8843186 100644 --- a/legacy/public/js/airtime/playlist/smart_blockbuilder.js +++ b/legacy/public/js/airtime/playlist/smart_blockbuilder.js @@ -1102,6 +1102,7 @@ var criteriaTypes = { info_url: "s", year: "n", track_type_id: "tt", + filepath: "s", }; var stringCriteriaOptions = { From d99d6e1a68f20b3f4255296cd22ac80a90adc020 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20One=C8=9B?= Date: Sat, 22 Jun 2024 14:18:50 +0300 Subject: [PATCH 22/29] perf: optimize the api image health check (#3038) ### Description Having curl installed in the API container improves operations and the efficiency of the health check. Launching python to do a single http call is an overkill. Co-authored-by: Jonas L --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index eb074eee7..b138599ce 100644 --- a/Dockerfile +++ b/Dockerfile @@ -141,6 +141,7 @@ FROM python-base as libretime-api RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + curl \ gcc \ libc6-dev \ libpq-dev \ @@ -174,8 +175,7 @@ CMD ["/usr/local/bin/gunicorn", \ ARG LIBRETIME_VERSION ENV LIBRETIME_VERSION=$LIBRETIME_VERSION -HEALTHCHECK CMD ["python3", "-c", \ - "import requests; requests.get('http://localhost:9001/api/v2/version').raise_for_status()"] +HEALTHCHECK CMD ["curl", "--fail", "http://localhost:9001/api/v2/version"] #======================================================================================# # Worker # From 6958070eecd9507a28b7c43f7fe572ed1eef9811 Mon Sep 17 00:00:00 2001 From: Jonas L Date: Sat, 22 Jun 2024 13:31:13 +0200 Subject: [PATCH 23/29] test: ensure the context cleanup is executed (#3040) See https://pylint.readthedocs.io/en/latest/user_guide/messages/warning/contextmanager-generator-missing-cleanup.html --- playout/tests/liquidsoap/client/conftest.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/playout/tests/liquidsoap/client/conftest.py b/playout/tests/liquidsoap/client/conftest.py index 87bbeed00..e44ff837b 100644 --- a/playout/tests/liquidsoap/client/conftest.py +++ b/playout/tests/liquidsoap/client/conftest.py @@ -119,9 +119,10 @@ def run_liq_server( if process.poll() is not None: pytest.fail(process.stdout.read()) - yield manager - - process.terminate() + try: + yield manager + finally: + process.terminate() @pytest.fixture( From c96f78df9f0d1caaccf07728c2c2f766da34dc2d Mon Sep 17 00:00:00 2001 From: Jonas L Date: Sat, 22 Jun 2024 16:33:23 +0200 Subject: [PATCH 24/29] fix: pin pip version to <21.4 to allow installing pytz (celery) (#3041) Related to https://github.com/libretime/libretime/issues/2983 --- install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install b/install index e4793ada2..0464c2a4b 100755 --- a/install +++ b/install @@ -605,7 +605,7 @@ info "creating python3 venv" python3 -m venv "$VENV_DIR" info "upgrading python3 tools" -$VENV_DIR/bin/pip install --upgrade pip setuptools wheel +$VENV_DIR/bin/pip install --upgrade "pip<21.4" setuptools wheel # Install Shared and API client ######################################################################################## From 4e0953d513ae44b048499c9c84aea83a5e3e8f91 Mon Sep 17 00:00:00 2001 From: Jonas L Date: Sat, 22 Jun 2024 17:18:16 +0200 Subject: [PATCH 25/29] refactor: remove non existent asset file (#3042) The file is non existent. Added in c669d3cb47a3092ac27fb3995f0dc72955f0740d Removed in ea2a6b3f68c59d98986b6d3f4c9b70137366990f --- legacy/application/controllers/LoginController.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/legacy/application/controllers/LoginController.php b/legacy/application/controllers/LoginController.php index 02d3844c0..387f34e02 100644 --- a/legacy/application/controllers/LoginController.php +++ b/legacy/application/controllers/LoginController.php @@ -108,8 +108,6 @@ class LoginController extends Zend_Controller_Action public function passwordRestoreAction() { - $this->view->headScript()->appendFile(Assets::url('js/airtime/login/password-restore.js'), 'text/javascript'); - $request = $this->getRequest(); $stationLocale = Application_Model_Preference::GetDefaultLocale(); From 646bc817246a1e3e0d8107c2b69d726681c643b6 Mon Sep 17 00:00:00 2001 From: Jonas L Date: Sat, 22 Jun 2024 17:35:30 +0200 Subject: [PATCH 26/29] fix: pin pip version to <24.1 to allow installing pytz (celery) (#3043) Related to https://github.com/libretime/libretime/issues/2983 --- install | 2 +- tools/python.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/install b/install index 0464c2a4b..68149ddf1 100755 --- a/install +++ b/install @@ -605,7 +605,7 @@ info "creating python3 venv" python3 -m venv "$VENV_DIR" info "upgrading python3 tools" -$VENV_DIR/bin/pip install --upgrade "pip<21.4" setuptools wheel +$VENV_DIR/bin/pip install --upgrade "pip<24.1" setuptools wheel # Install Shared and API client ######################################################################################## diff --git a/tools/python.mk b/tools/python.mk index 039dcfa94..2892e71a0 100644 --- a/tools/python.mk +++ b/tools/python.mk @@ -12,7 +12,7 @@ VENV = .venv install: $(VENV) $(VENV): python3 -m venv $(VENV) - $(VENV)/bin/pip install --upgrade pip setuptools wheel + $(VENV)/bin/pip install --upgrade "pip<24.1" setuptools wheel $(VENV)/bin/pip install --prefer-binary \ --requirement ../tools/python-requirements.txt \ $(PIP_INSTALL) From 97b2f0e257d41adf6018a44750c7670ed9ab24ca Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 22 Jun 2024 17:47:09 +0200 Subject: [PATCH 27/29] chore(deps): update dependency requests to >=2.32.2,<2.33 [security] (#3032) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [requests](https://requests.readthedocs.io) ([source](https://togithub.com/psf/requests), [changelog](https://togithub.com/psf/requests/blob/master/HISTORY.md)) | `>=2.31.0,<2.32` -> `>=2.32.2,<2.33` | [![age](https://developer.mend.io/api/mc/badges/age/pypi/requests/2.32.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/pypi/requests/2.32.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/pypi/requests/2.31.0/2.32.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/pypi/requests/2.31.0/2.32.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | ### GitHub Vulnerability Alerts #### [CVE-2024-35195](https://togithub.com/psf/requests/security/advisories/GHSA-9wx4-h78v-vm56) When making requests through a Requests `Session`, if the first request is made with `verify=False` to disable cert verification, all subsequent requests to the same origin will continue to ignore cert verification regardless of changes to the value of `verify`. This behavior will continue for the lifecycle of the connection in the connection pool. ### Remediation Any of these options can be used to remediate the current issue, we highly recommend upgrading as the preferred mitigation. * Upgrade to `requests>=2.32.0`. * For `requests<2.32.0`, avoid setting `verify=False` for the first request to a host while using a Requests Session. * For `requests<2.32.0`, call `close()` on `Session` objects to clear existing connections if `verify=False` is used. ### Related Links * [https://github.com/psf/requests/pull/6655](https://togithub.com/psf/requests/pull/6655) --- ### Release Notes
psf/requests (requests) ### [`v2.32.2`](https://togithub.com/psf/requests/blob/HEAD/HISTORY.md#2322-2024-05-21) [Compare Source](https://togithub.com/psf/requests/compare/v2.32.1...v2.32.2) **Deprecations** - To provide a more stable migration for custom HTTPAdapters impacted by the CVE changes in 2.32.0, we've renamed `_get_connection` to a new public API, `get_connection_with_tls_context`. Existing custom HTTPAdapters will need to migrate their code to use this new API. `get_connection` is considered deprecated in all versions of Requests>=2.32.0. A minimal (2-line) example has been provided in the linked PR to ease migration, but we strongly urge users to evaluate if their custom adapter is subject to the same issue described in CVE-2024-35195. ([#​6710](https://togithub.com/psf/requests/issues/6710)) ### [`v2.32.1`](https://togithub.com/psf/requests/blob/HEAD/HISTORY.md#2321-2024-05-20) [Compare Source](https://togithub.com/psf/requests/compare/v2.32.0...v2.32.1) **Bugfixes** - Add missing test certs to the sdist distributed on PyPI. ### [`v2.32.0`](https://togithub.com/psf/requests/blob/HEAD/HISTORY.md#2320-2024-05-20) [Compare Source](https://togithub.com/psf/requests/compare/v2.31.0...v2.32.0) **Security** - Fixed an issue where setting `verify=False` on the first request from a Session will cause subsequent requests to the *same origin* to also ignore cert verification, regardless of the value of `verify`. (https://github.com/psf/requests/security/advisories/GHSA-9wx4-h78v-vm56) **Improvements** - `verify=True` now reuses a global SSLContext which should improve request time variance between first and subsequent requests. It should also minimize certificate load time on Windows systems when using a Python version built with OpenSSL 3.x. ([#​6667](https://togithub.com/psf/requests/issues/6667)) - Requests now supports optional use of character detection (`chardet` or `charset_normalizer`) when repackaged or vendored. This enables `pip` and other projects to minimize their vendoring surface area. The `Response.text()` and `apparent_encoding` APIs will default to `utf-8` if neither library is present. ([#​6702](https://togithub.com/psf/requests/issues/6702)) **Bugfixes** - Fixed bug in length detection where emoji length was incorrectly calculated in the request content-length. ([#​6589](https://togithub.com/psf/requests/issues/6589)) - Fixed deserialization bug in JSONDecodeError. ([#​6629](https://togithub.com/psf/requests/issues/6629)) - Fixed bug where an extra leading `/` (path separator) could lead urllib3 to unnecessarily reparse the request URI. ([#​6644](https://togithub.com/psf/requests/issues/6644)) **Deprecations** - Requests has officially added support for CPython 3.12 ([#​6503](https://togithub.com/psf/requests/issues/6503)) - Requests has officially added support for PyPy 3.9 and 3.10 ([#​6641](https://togithub.com/psf/requests/issues/6641)) - Requests has officially dropped support for CPython 3.7 ([#​6642](https://togithub.com/psf/requests/issues/6642)) - Requests has officially dropped support for PyPy 3.7 and 3.8 ([#​6641](https://togithub.com/psf/requests/issues/6641)) **Documentation** - Various typo fixes and doc improvements. **Packaging** - Requests has started adopting some modern packaging practices. The source files for the projects (formerly `requests`) is now located in `src/requests` in the Requests sdist. ([#​6506](https://togithub.com/psf/requests/issues/6506)) - Starting in Requests 2.33.0, Requests will migrate to a PEP 517 build system using `hatchling`. This should not impact the average user, but extremely old versions of packaging utilities may have issues with the new packaging format.
--- ### Configuration 📅 **Schedule**: Branch creation - "" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/libretime/libretime). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- analyzer/requirements.txt | 2 +- analyzer/setup.py | 2 +- api-client/requirements.txt | 2 +- api-client/setup.py | 2 +- api/requirements.txt | 2 +- api/setup.py | 2 +- playout/requirements.txt | 2 +- playout/setup.py | 2 +- worker/requirements.txt | 2 +- worker/setup.py | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/analyzer/requirements.txt b/analyzer/requirements.txt index 9ae5fe0db..617ef6a0b 100644 --- a/analyzer/requirements.txt +++ b/analyzer/requirements.txt @@ -2,5 +2,5 @@ # This file is auto-generated by tools/extract_requirements.py. mutagen>=1.45.1,<1.48 pika>=1.0.0,<1.4 -requests>=2.31.0,<2.32 +requests>=2.32.2,<2.33 typing_extensions diff --git a/analyzer/setup.py b/analyzer/setup.py index e587b668d..a309830fa 100644 --- a/analyzer/setup.py +++ b/analyzer/setup.py @@ -24,7 +24,7 @@ setup( install_requires=[ "mutagen>=1.45.1,<1.48", "pika>=1.0.0,<1.4", - "requests>=2.31.0,<2.32", + "requests>=2.32.2,<2.33", "typing_extensions", ], extras_require={ diff --git a/api-client/requirements.txt b/api-client/requirements.txt index 434d2c7eb..645acbb03 100644 --- a/api-client/requirements.txt +++ b/api-client/requirements.txt @@ -1,4 +1,4 @@ # Please do not edit this file, edit the setup.py file! # This file is auto-generated by tools/extract_requirements.py. python-dateutil>=2.8.1,<2.10 -requests>=2.31.0,<2.32 +requests>=2.32.2,<2.33 diff --git a/api-client/setup.py b/api-client/setup.py index efb99f785..9acdb7225 100644 --- a/api-client/setup.py +++ b/api-client/setup.py @@ -19,7 +19,7 @@ setup( python_requires=">=3.8", install_requires=[ "python-dateutil>=2.8.1,<2.10", - "requests>=2.31.0,<2.32", + "requests>=2.32.2,<2.33", ], extras_require={ "dev": [ diff --git a/api/requirements.txt b/api/requirements.txt index 10bdc8313..6be0c53c2 100644 --- a/api/requirements.txt +++ b/api/requirements.txt @@ -7,5 +7,5 @@ djangorestframework>=3.14.0,<3.16 drf-spectacular>=0.22.1,<0.28 gunicorn>=22.0.0,<22.1 psycopg[c]>=3.1.8,<3.2 -requests>=2.31.0,<2.32 +requests>=2.32.2,<2.33 uvicorn[standard]>=0.17.6,<0.31.0 diff --git a/api/setup.py b/api/setup.py index 451292be5..e8744a555 100644 --- a/api/setup.py +++ b/api/setup.py @@ -31,7 +31,7 @@ setup( "django>=4.2.0,<4.3", "djangorestframework>=3.14.0,<3.16", "drf-spectacular>=0.22.1,<0.28", - "requests>=2.31.0,<2.32", + "requests>=2.32.2,<2.33", ], extras_require={ "prod": [ diff --git a/playout/requirements.txt b/playout/requirements.txt index 35c1c882a..84e5410cb 100644 --- a/playout/requirements.txt +++ b/playout/requirements.txt @@ -6,5 +6,5 @@ kombu==4.6.11 lxml>=4.5.0,<6.0.0 mutagen>=1.45.1,<1.48 python-dateutil>=2.8.1,<2.10 -requests>=2.31.0,<2.32 +requests>=2.32.2,<2.33 typing-extensions diff --git a/playout/setup.py b/playout/setup.py index 5949dbe0b..2aaca8299 100644 --- a/playout/setup.py +++ b/playout/setup.py @@ -31,7 +31,7 @@ setup( "lxml>=4.5.0,<6.0.0", "mutagen>=1.45.1,<1.48", "python-dateutil>=2.8.1,<2.10", - "requests>=2.31.0,<2.32", + "requests>=2.32.2,<2.33", "typing-extensions", ], extras_require={ diff --git a/worker/requirements.txt b/worker/requirements.txt index cd16b809d..df2cfb21b 100644 --- a/worker/requirements.txt +++ b/worker/requirements.txt @@ -3,4 +3,4 @@ celery==4.4.7 kombu==4.6.11 mutagen>=1.45.1,<1.48 -requests>=2.31.0,<2.32 +requests>=2.32.2,<2.33 diff --git a/worker/setup.py b/worker/setup.py index c56fbec02..4e176d2d4 100644 --- a/worker/setup.py +++ b/worker/setup.py @@ -25,7 +25,7 @@ setup( "celery==4.4.7", "kombu==4.6.11", "mutagen>=1.45.1,<1.48", - "requests>=2.31.0,<2.32", + "requests>=2.32.2,<2.33", ], extras_require={ "dev": [ From 96842144257855df86085b052ed8ff87562bc049 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20One=C8=9B?= Date: Sat, 22 Jun 2024 19:10:55 +0300 Subject: [PATCH 28/29] perf: optimize the rabbitmq health check (#3037) ### Description Running `rabbitmq-diagnostics` every 30s is a resource intensive operation wasting cpu cycles. --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 3a619248d..18ea43bc6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,7 +16,7 @@ services: RABBITMQ_DEFAULT_USER: ${RABBITMQ_DEFAULT_USER:-libretime} RABBITMQ_DEFAULT_PASS: ${RABBITMQ_DEFAULT_PASS:-libretime} # Change me ! healthcheck: - test: rabbitmq-diagnostics -q ping + test: nc -z 127.0.0.1 5672 playout: image: ghcr.io/libretime/libretime-playout:${LIBRETIME_VERSION:-latest} From 60db15e8e5a572d4d9cfe854219e12bc25232618 Mon Sep 17 00:00:00 2001 From: libretime-bot <103514846+libretime-bot@users.noreply.github.com> Date: Sat, 22 Jun 2024 18:16:49 +0200 Subject: [PATCH 29/29] chore(main): release 4.2.0 (#3028) :robot: I have created a release *beep* *boop* --- ## [4.2.0](https://github.com/libretime/libretime/compare/4.1.0...4.2.0) (2024-06-22) ### Features * **legacy:** add current date macro to string block criteria ([#3013](https://github.com/libretime/libretime/issues/3013)) ([451652b](https://github.com/libretime/libretime/commit/451652bc4002b142ab9cf33ae517451c4966134f)) * **legacy:** add filename block criteria ([#3015](https://github.com/libretime/libretime/issues/3015)) ([4642b6c](https://github.com/libretime/libretime/commit/4642b6c08ef813ab5dc7354f73141239f5c145e0)) ### Bug Fixes * pin pip version to <24.1 to allow installing pytz (celery) ([#3043](https://github.com/libretime/libretime/issues/3043)) ([646bc81](https://github.com/libretime/libretime/commit/646bc817246a1e3e0d8107c2b69d726681c643b6)) * playlist allocates inaccurate time to smartblocks ([#3026](https://github.com/libretime/libretime/issues/3026)) ([2b43e51](https://github.com/libretime/libretime/commit/2b43e51ed140bf307e491f0fcb7b84f95709d604)) ### Performance Improvements * optimize the api image health check ([#3038](https://github.com/libretime/libretime/issues/3038)) ([d99d6e1](https://github.com/libretime/libretime/commit/d99d6e1a68f20b3f4255296cd22ac80a90adc020)) * optimize the rabbitmq health check ([#3037](https://github.com/libretime/libretime/issues/3037)) ([9684214](https://github.com/libretime/libretime/commit/96842144257855df86085b052ed8ff87562bc049)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- .github/release-please-manifest.json | 2 +- CHANGELOG.md | 20 ++++++++++++++++++++ analyzer/setup.py | 2 +- api-client/setup.py | 2 +- api/setup.py | 2 +- playout/setup.py | 2 +- shared/setup.py | 2 +- worker/setup.py | 2 +- 8 files changed, 27 insertions(+), 7 deletions(-) diff --git a/.github/release-please-manifest.json b/.github/release-please-manifest.json index 44b10ef87..6fa3b724b 100644 --- a/.github/release-please-manifest.json +++ b/.github/release-please-manifest.json @@ -1 +1 @@ -{".":"4.1.0"} +{".":"4.2.0"} diff --git a/CHANGELOG.md b/CHANGELOG.md index c8010a8b2..c06102d34 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,25 @@ # Changelog +## [4.2.0](https://github.com/libretime/libretime/compare/4.1.0...4.2.0) (2024-06-22) + + +### Features + +* **legacy:** add current date macro to string block criteria ([#3013](https://github.com/libretime/libretime/issues/3013)) ([451652b](https://github.com/libretime/libretime/commit/451652bc4002b142ab9cf33ae517451c4966134f)) +* **legacy:** add filename block criteria ([#3015](https://github.com/libretime/libretime/issues/3015)) ([4642b6c](https://github.com/libretime/libretime/commit/4642b6c08ef813ab5dc7354f73141239f5c145e0)) + + +### Bug Fixes + +* pin pip version to <24.1 to allow installing pytz (celery) ([#3043](https://github.com/libretime/libretime/issues/3043)) ([646bc81](https://github.com/libretime/libretime/commit/646bc817246a1e3e0d8107c2b69d726681c643b6)) +* playlist allocates inaccurate time to smartblocks ([#3026](https://github.com/libretime/libretime/issues/3026)) ([2b43e51](https://github.com/libretime/libretime/commit/2b43e51ed140bf307e491f0fcb7b84f95709d604)) + + +### Performance Improvements + +* optimize the api image health check ([#3038](https://github.com/libretime/libretime/issues/3038)) ([d99d6e1](https://github.com/libretime/libretime/commit/d99d6e1a68f20b3f4255296cd22ac80a90adc020)) +* optimize the rabbitmq health check ([#3037](https://github.com/libretime/libretime/issues/3037)) ([9684214](https://github.com/libretime/libretime/commit/96842144257855df86085b052ed8ff87562bc049)) + ## [4.1.0](https://github.com/libretime/libretime/compare/4.0.0...4.1.0) (2024-05-05) diff --git a/analyzer/setup.py b/analyzer/setup.py index a309830fa..c7b93b7a9 100644 --- a/analyzer/setup.py +++ b/analyzer/setup.py @@ -1,6 +1,6 @@ from setuptools import find_packages, setup -version = "4.1.0" # x-release-please-version +version = "4.2.0" # x-release-please-version setup( name="libretime-analyzer", diff --git a/api-client/setup.py b/api-client/setup.py index 9acdb7225..4025b8dea 100644 --- a/api-client/setup.py +++ b/api-client/setup.py @@ -1,6 +1,6 @@ from setuptools import find_packages, setup -version = "4.1.0" # x-release-please-version +version = "4.2.0" # x-release-please-version setup( name="libretime-api-client", diff --git a/api/setup.py b/api/setup.py index e8744a555..f9d2a2e6e 100644 --- a/api/setup.py +++ b/api/setup.py @@ -1,6 +1,6 @@ from setuptools import find_packages, setup -version = "4.1.0" # x-release-please-version +version = "4.2.0" # x-release-please-version setup( name="libretime-api", diff --git a/playout/setup.py b/playout/setup.py index 2aaca8299..d66ff8f6a 100644 --- a/playout/setup.py +++ b/playout/setup.py @@ -1,6 +1,6 @@ from setuptools import find_packages, setup -version = "4.1.0" # x-release-please-version +version = "4.2.0" # x-release-please-version setup( name="libretime-playout", diff --git a/shared/setup.py b/shared/setup.py index bada030c8..b997ad81e 100644 --- a/shared/setup.py +++ b/shared/setup.py @@ -1,6 +1,6 @@ from setuptools import find_packages, setup -version = "4.1.0" # x-release-please-version +version = "4.2.0" # x-release-please-version setup( name="libretime-shared", diff --git a/worker/setup.py b/worker/setup.py index 4e176d2d4..ce3e73509 100644 --- a/worker/setup.py +++ b/worker/setup.py @@ -1,6 +1,6 @@ from setuptools import find_packages, setup -version = "4.1.0" # x-release-please-version +version = "4.2.0" # x-release-please-version setup( name="libretime-worker",