diff --git a/App/Dataclasses/DatabaseFolkTuneDetails.php b/App/Dataclasses/DatabaseFolkTuneDetails.php index 02f4fbb..0559a0e 100644 --- a/App/Dataclasses/DatabaseFolkTuneDetails.php +++ b/App/Dataclasses/DatabaseFolkTuneDetails.php @@ -65,15 +65,18 @@ K: {$this->Parts[$counter]->KeySignature}"; public function BuildSimple(): string { - $builder = "X: {$this->ID} -L: 1/4"; - - $builder .= " -M: {$this->Parts[0]->TimeSignature}"; - $previousTimeSignature = $this->Parts[0]->TimeSignature; - - $builder .= " -{$this->Parts[0]->ABCNotation}"; - return $builder; + $notation = $this->Parts[0]->ABCNotation; + $notation = preg_replace( + pattern: "/\r|\n/", + replacement: "", + subject: $notation + ); + + return " +X: {$this->ID} +L: 1/4 +K: {$this->Parts[0]->KeySignature} +M: {$this->Parts[0]->TimeSignature} +{$notation}"; } } \ No newline at end of file diff --git a/Localisation/en-GB.yaml b/Localisation/en-GB.yaml index 04cd07a..86e39ce 100644 --- a/Localisation/en-GB.yaml +++ b/Localisation/en-GB.yaml @@ -30,6 +30,7 @@ Created At: Created At ################################################## # D ################################################## +Dance Overview: Dance Overview Dances for: Dances for Description: Description @@ -93,6 +94,7 @@ Logout: Logout My Bookmarked Tunes: My Bookmarked Tunes My Disliked Tunes: My Disliked Tunes My Liked Tunes: My Liked Tunes +My Tune Sets: My Tune Sets My Uploaded Tunes: My Uploaded Tunes @@ -102,6 +104,7 @@ My Uploaded Tunes: My Uploaded Tunes ################################################## New Password: New Password Number of Parts: Number of Parts +Number of Steps: Number of Steps @@ -127,6 +130,7 @@ Password: Password ################################################## # R ################################################## +Rating: Rating @@ -144,6 +148,7 @@ Summary: Summary ################################################## Time Signature: Time Signature Title: Title +Tune Overview: Tune Overview diff --git a/composer.lock b/composer.lock index d5fa915..b5b20c1 100644 --- a/composer.lock +++ b/composer.lock @@ -8,16 +8,16 @@ "packages": [ { "name": "algolia/algoliasearch-client-php", - "version": "4.13.0", + "version": "4.13.1", "source": { "type": "git", "url": "https://github.com/algolia/algoliasearch-client-php.git", - "reference": "ddc6ab3710c5527d0637cf991601ac7979197d94" + "reference": "7b43e116e29b7f708a7ed751a116193ef50a550b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/algolia/algoliasearch-client-php/zipball/ddc6ab3710c5527d0637cf991601ac7979197d94", - "reference": "ddc6ab3710c5527d0637cf991601ac7979197d94", + "url": "https://api.github.com/repos/algolia/algoliasearch-client-php/zipball/7b43e116e29b7f708a7ed751a116193ef50a550b", + "reference": "7b43e116e29b7f708a7ed751a116193ef50a550b", "shasum": "" }, "require": { @@ -25,7 +25,7 @@ "ext-json": "*", "ext-mbstring": "*", "guzzlehttp/psr7": "^2.0", - "php": ">=8.1", + "php": ">=8.1 !=8.3.0", "psr/http-message": "^1.1 || ^2.0", "psr/log": "^1.0 || ^2.0 || ^3.0", "psr/simple-cache": "^1.0 || ^2.0 || ^3.0" @@ -69,9 +69,9 @@ ], "support": { "issues": "https://github.com/algolia/algoliasearch-client-php/issues", - "source": "https://github.com/algolia/algoliasearch-client-php/tree/4.13.0" + "source": "https://github.com/algolia/algoliasearch-client-php/tree/4.13.1" }, - "time": "2025-01-22T12:32:40+00:00" + "time": "2025-02-05T13:18:32+00:00" }, { "name": "aura/sqlquery", @@ -422,16 +422,16 @@ }, { "name": "google/auth", - "version": "v1.45.1", + "version": "v1.45.3", "source": { "type": "git", "url": "https://github.com/googleapis/google-auth-library-php.git", - "reference": "86e9d937632a96b09dc40444c7cb68eb778a6ea6" + "reference": "000d9439f430c6e56cba105c5ab750f5f7d69ea8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-auth-library-php/zipball/86e9d937632a96b09dc40444c7cb68eb778a6ea6", - "reference": "86e9d937632a96b09dc40444c7cb68eb778a6ea6", + "url": "https://api.github.com/repos/googleapis/google-auth-library-php/zipball/000d9439f430c6e56cba105c5ab750f5f7d69ea8", + "reference": "000d9439f430c6e56cba105c5ab750f5f7d69ea8", "shasum": "" }, "require": { @@ -468,7 +468,7 @@ "Apache-2.0" ], "description": "Google Auth Library for PHP", - "homepage": "http://github.com/google/google-auth-library-php", + "homepage": "https://github.com/google/google-auth-library-php", "keywords": [ "Authentication", "google", @@ -477,9 +477,9 @@ "support": { "docs": "https://googleapis.github.io/google-auth-library-php/main/", "issues": "https://github.com/googleapis/google-auth-library-php/issues", - "source": "https://github.com/googleapis/google-auth-library-php/tree/v1.45.1" + "source": "https://github.com/googleapis/google-auth-library-php/tree/v1.45.3" }, - "time": "2025-01-22T23:27:35+00:00" + "time": "2025-01-29T18:17:08+00:00" }, { "name": "google/cloud-recaptcha-enterprise", @@ -533,16 +533,16 @@ }, { "name": "google/common-protos", - "version": "4.9.0", + "version": "4.10.0", "source": { "type": "git", "url": "https://github.com/googleapis/common-protos-php.git", - "reference": "a2d1a583819286db5ef9403c6a2bfa29c9636c46" + "reference": "88bb76504910ddfe8fec457b622145c5731ab8ea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/common-protos-php/zipball/a2d1a583819286db5ef9403c6a2bfa29c9636c46", - "reference": "a2d1a583819286db5ef9403c6a2bfa29c9636c46", + "url": "https://api.github.com/repos/googleapis/common-protos-php/zipball/88bb76504910ddfe8fec457b622145c5731ab8ea", + "reference": "88bb76504910ddfe8fec457b622145c5731ab8ea", "shasum": "" }, "require": { @@ -586,9 +586,9 @@ "google" ], "support": { - "source": "https://github.com/googleapis/common-protos-php/tree/v4.9.0" + "source": "https://github.com/googleapis/common-protos-php/tree/v4.10.0" }, - "time": "2025-01-11T02:14:50+00:00" + "time": "2025-02-03T23:47:57+00:00" }, { "name": "google/gax", @@ -2052,16 +2052,16 @@ }, { "name": "symfony/yaml", - "version": "v7.2.0", + "version": "v7.2.3", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "099581e99f557e9f16b43c5916c26380b54abb22" + "reference": "ac238f173df0c9c1120f862d0f599e17535a87ec" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/099581e99f557e9f16b43c5916c26380b54abb22", - "reference": "099581e99f557e9f16b43c5916c26380b54abb22", + "url": "https://api.github.com/repos/symfony/yaml/zipball/ac238f173df0c9c1120f862d0f599e17535a87ec", + "reference": "ac238f173df0c9c1120f862d0f599e17535a87ec", "shasum": "" }, "require": { @@ -2104,7 +2104,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v7.2.0" + "source": "https://github.com/symfony/yaml/tree/v7.2.3" }, "funding": [ { @@ -2120,7 +2120,7 @@ "type": "tidelift" } ], - "time": "2024-10-23T06:56:12+00:00" + "time": "2025-01-07T12:55:42+00:00" }, { "name": "twig/twig",