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/.github/workflows/container.yml b/.github/workflows/container.yml index 9f18d6266..32174a727 100644 --- a/.github/workflows/container.yml +++ b/.github/workflows/container.yml @@ -90,7 +90,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' }} 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' }} 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/.pre-commit-config.yaml b/.pre-commit-config.yaml index 276cc80ac..777e4db6c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -36,13 +36,13 @@ 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] - repo: https://github.com/adamchainz/django-upgrade - rev: 1.16.0 + rev: 1.18.0 hooks: - id: django-upgrade args: [--target-version, "4.2"] @@ -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] 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/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 # 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 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..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", @@ -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..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", @@ -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 0637462c7..6be0c53c2 100644 --- a/api/requirements.txt +++ b/api/requirements.txt @@ -1,11 +1,11 @@ # 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 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 +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 84a74e914..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", @@ -26,18 +26,18 @@ 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", "drf-spectacular>=0.22.1,<0.28", - "requests>=2.31.0,<2.32", + "requests>=2.32.2,<2.33", ], extras_require={ "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", 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} 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 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/install b/install index e4793ada2..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 setuptools wheel +$VENV_DIR/bin/pip install --upgrade "pip<24.1" setuptools wheel # Install Shared and API client ######################################################################################## 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/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(); 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 343f8d476..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); @@ -1612,6 +1482,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) { @@ -1620,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) { @@ -1636,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) { @@ -1677,6 +1562,8 @@ SQL; $spCriteriaExtra = $criteria['extra']; } + $spCriteriaValue = $this->resolveDate($spCriteriaValue); + if ($spCriteriaModifier == 'starts with') { $spCriteriaValue = "{$spCriteriaValue}%"; } elseif ($spCriteriaModifier == 'ends with') { 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/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 diff --git a/legacy/composer.lock b/legacy/composer.lock index 035b67e5d..f31e18de4 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.40", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "3dcd47d4bbd9fea4d1210e7a7a0a5ca02d99df14" + "reference": "d4e1db78421163b98dd9971d247fd0df4a57ee5e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/3dcd47d4bbd9fea4d1210e7a7a0a5ca02d99df14", - "reference": "3dcd47d4bbd9fea4d1210e7a7a0a5ca02d99df14", + "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.38" + "source": "https://github.com/symfony/config/tree/v5.4.40" }, "funding": [ { @@ -1155,7 +1155,7 @@ "type": "tidelift" } ], - "time": "2024-03-22T10:04:40+00:00" + "time": "2024-05-31T14:33:22+00:00" }, { "name": "symfony/deprecation-contracts", @@ -1226,16 +1226,16 @@ }, { "name": "symfony/filesystem", - "version": "v5.4.38", + "version": "v5.4.40", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "899330a01056077271e2f614c7b28b0379a671eb" + "reference": "26dd9912df6940810ea00f8f53ad48d6a3424995" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/899330a01056077271e2f614c7b28b0379a671eb", - "reference": "899330a01056077271e2f614c7b28b0379a671eb", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/26dd9912df6940810ea00f8f53ad48d6a3424995", + "reference": "26dd9912df6940810ea00f8f53ad48d6a3424995", "shasum": "" }, "require": { @@ -1244,6 +1244,9 @@ "symfony/polyfill-mbstring": "~1.8", "symfony/polyfill-php80": "^1.16" }, + "require-dev": { + "symfony/process": "^5.4|^6.4" + }, "type": "library", "autoload": { "psr-4": { @@ -1270,7 +1273,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.40" }, "funding": [ { @@ -1286,7 +1289,7 @@ "type": "tidelift" } ], - "time": "2024-03-21T08:05:07+00:00" + "time": "2024-05-31T14:33:22+00:00" }, { "name": "symfony/polyfill-ctype", @@ -3437,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": { @@ -3454,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", @@ -3484,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": [ { @@ -3492,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", @@ -3549,16 +3553,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": { @@ -3607,9 +3611,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", @@ -3738,16 +3742,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.28.0", + "version": "1.29.1", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb" + "reference": "fcaefacf2d5c417e928405b71b400d4ce10daaf4" }, "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/fcaefacf2d5c417e928405b71b400d4ce10daaf4", + "reference": "fcaefacf2d5c417e928405b71b400d4ce10daaf4", "shasum": "" }, "require": { @@ -3779,9 +3783,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.1" }, - "time": "2024-04-03T18:51:33+00:00" + "time": "2024-05-31T08:52:43+00:00" }, { "name": "phpunit/dbunit", diff --git a/legacy/locale/cs_CZ/LC_MESSAGES/libretime.po b/legacy/locale/cs_CZ/LC_MESSAGES/libretime.po index 98f75a63e..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-04-29 01:54+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" @@ -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 "" @@ -3930,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ý! " @@ -3962,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 83366095f..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-04-29 01:54+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" @@ -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 "" @@ -3940,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." @@ -3972,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 6d149936a..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-04-29 01:54+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" @@ -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..." @@ -3943,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!" @@ -3975,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 63b16fd2e..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-04-29 01:54+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" @@ -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 "" @@ -3931,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 "Το πρόγραμμα που βλέπετε δεν είναι ενημερωμένο!" @@ -3963,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 bf8c28af6..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-04-29 01:54+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" @@ -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 "" @@ -3930,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!" @@ -3962,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 4a08b9f41..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-04-29 01:54+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" @@ -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 "" @@ -3947,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!" @@ -3979,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 bc43a73b3..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-04-29 01:54+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" @@ -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 "" @@ -3931,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!" @@ -3963,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 823e75df7..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-04-29 01:54+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" @@ -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..." @@ -3956,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!" @@ -3988,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!" @@ -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..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-04-29 01:54+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" @@ -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..." @@ -3954,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 !" @@ -3986,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 d7a76fcf7..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-04-29 01:54+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" @@ -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 …" @@ -3942,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!" @@ -3974,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 3c1ef3887..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-04-29 01:54+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" @@ -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..." @@ -3967,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!" @@ -3999,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 5febbbfef..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-04-29 01:54+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" @@ -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 "" @@ -3934,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!" @@ -3966,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 35408ce72..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-04-29 01:54+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" @@ -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 "" @@ -3930,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 "参照中のスケジュールは有効ではありません。" @@ -3962,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 6c69cbf5a..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-04-29 01:54+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" @@ -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 "" @@ -3927,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 "현재 보고 계신 스케쥴이 맞지 않습니다" @@ -3959,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 0af27ba8d..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-04-29 01:54+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" @@ -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..." @@ -3955,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!" @@ -3987,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 46a28c778..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-04-29 01:54+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" @@ -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 "" @@ -3931,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!" @@ -3963,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 67ffd961a..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-04-29 01:54+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" @@ -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 "" @@ -3932,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!" @@ -3964,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 ca62e4bc7..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-04-29 01:54+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" @@ -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 "Опубликовать..." @@ -3956,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 "Расписание, которое вы просматриваете - устарело!" @@ -3988,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 af30d376e..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-04-29 01:54+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" @@ -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 "" @@ -3929,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 "Застарео се прегледан распоред!" @@ -3961,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 5c28cf751..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-04-29 01:54+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" @@ -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 "" @@ -3929,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!" @@ -3961,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 b8ef51048..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-04-29 01:54+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" @@ -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 "" @@ -3928,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 "" @@ -3960,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 d0c1dfd73..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-04-29 01:54+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" @@ -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 "Опублікувати..." @@ -3950,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 "Розклад, який ви переглядаєте, застарів!" @@ -3982,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 83e96bcbd..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-04-29 01:54+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" @@ -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 "" @@ -3929,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 "当前节目内容需要刷新！" @@ -3961,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/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 = { diff --git a/legacy/tools/composer.json b/legacy/tools/composer.json index 3137d37b2..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.54.1" + "friendsofphp/php-cs-fixer": "<3.59.4" } } 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..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", @@ -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/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( 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/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) 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..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", @@ -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": [