diff --git a/composer.lock b/composer.lock index b9244678..2384aa3d 100644 --- a/composer.lock +++ b/composer.lock @@ -167,16 +167,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.293.5", + "version": "3.293.7", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "f2002e52b382b45231da3f9552033f769acfebd8" + "reference": "3bf86ba8b9bbea2b298f89e6f5edc58de276690b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/f2002e52b382b45231da3f9552033f769acfebd8", - "reference": "f2002e52b382b45231da3f9552033f769acfebd8", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/3bf86ba8b9bbea2b298f89e6f5edc58de276690b", + "reference": "3bf86ba8b9bbea2b298f89e6f5edc58de276690b", "shasum": "" }, "require": { @@ -256,9 +256,9 @@ "support": { "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "issues": "https://github.com/aws/aws-sdk-php/issues", - "source": "https://github.com/aws/aws-sdk-php/tree/3.293.5" + "source": "https://github.com/aws/aws-sdk-php/tree/3.293.7" }, - "time": "2023-12-06T19:09:15+00:00" + "time": "2023-12-08T19:11:21+00:00" }, { "name": "caxy/php-htmldiff", @@ -4868,27 +4868,27 @@ }, { "name": "drupal/phpmailer_smtp", - "version": "2.2.3", + "version": "2.2.4", "source": { "type": "git", "url": "https://git.drupalcode.org/project/phpmailer_smtp.git", - "reference": "2.2.3" + "reference": "2.2.4" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/phpmailer_smtp-2.2.3.zip", - "reference": "2.2.3", - "shasum": "756dc23f91cdffbeb41888723ab73186effa2e22" + "url": "https://ftp.drupal.org/files/projects/phpmailer_smtp-2.2.4.zip", + "reference": "2.2.4", + "shasum": "df6dfc187d5ad686920da375958c408bcac83ce2" }, "require": { "drupal/core": "^8.8 || ^9 || ^10", - "phpmailer/phpmailer": "^6.8.0" + "phpmailer/phpmailer": "^6.9.1" }, "type": "drupal-module", "extra": { "drupal": { - "version": "2.2.3", - "datestamp": "1680739568", + "version": "2.2.4", + "datestamp": "1701992698", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -4979,24 +4979,30 @@ }, { "name": "drupal/s3fs", - "version": "3.3.0", + "version": "3.4.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/s3fs.git", - "reference": "8.x-3.3" + "reference": "8.x-3.4" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/s3fs-8.x-3.3.zip", - "reference": "8.x-3.3", - "shasum": "91707c0af135a509c8ba9c2e3882978ca99806f7" + "url": "https://ftp.drupal.org/files/projects/s3fs-8.x-3.4.zip", + "reference": "8.x-3.4", + "shasum": "4b31c7a34a892cf70476327e1d5c1cf2e99c20a0" }, "require": { "aws/aws-sdk-php": "^3.18", - "drupal/core": "^8.8 || ^9 || ~10.0.0 || ~10.1.0" + "drupal/core": "^8.8 || ^9 || ~10.0.0 || ~10.1.0 || ~10.2.0" }, "require-dev": { - "drush/drush": "^10 || ^11" + "drupal/advagg": "^4.0 || ^5.0 || ^6.0", + "drush/drush": "^10 || ^11 || ^12", + "mglaman/phpstan-drupal": "^1.1", + "phpstan/extension-installer": "^1.2", + "phpstan/phpstan": "^1.9", + "phpstan/phpstan-deprecation-rules": "^1.1", + "phpstan/phpstan-phpunit": "^1.3" }, "suggest": { "doctrine/cache": "~1.4" @@ -5004,8 +5010,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-3.3", - "datestamp": "1699858909", + "version": "8.x-3.4", + "datestamp": "1701992779", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -6585,12 +6591,12 @@ "source": { "type": "git", "url": "https://github.com/markaspot/markaspot.git", - "reference": "6a1559a2fb19bce81288b7e7da865dc4cec0a671" + "reference": "40110dc532f2ecc3e312c1d029a6c757fa87488b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/markaspot/markaspot/zipball/6a1559a2fb19bce81288b7e7da865dc4cec0a671", - "reference": "6a1559a2fb19bce81288b7e7da865dc4cec0a671", + "url": "https://api.github.com/repos/markaspot/markaspot/zipball/40110dc532f2ecc3e312c1d029a6c757fa87488b", + "reference": "40110dc532f2ecc3e312c1d029a6c757fa87488b", "shasum": "" }, "require": { @@ -6707,7 +6713,7 @@ "issues": "https://github.com/markaspot/markaspot/issues", "source": "https://github.com/markaspot/markaspot/tree/10.6.x-dev" }, - "time": "2023-12-07T07:00:19+00:00" + "time": "2023-12-09T05:15:44+00:00" }, { "name": "markbaker/complex", @@ -13352,16 +13358,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.10.47", + "version": "1.10.48", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "84dbb33b520ea28b6cf5676a3941f4bae1c1ff39" + "reference": "087ed4b5f4a7a6e8f3bbdfbfe98ce5c181380bc6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/84dbb33b520ea28b6cf5676a3941f4bae1c1ff39", - "reference": "84dbb33b520ea28b6cf5676a3941f4bae1c1ff39", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/087ed4b5f4a7a6e8f3bbdfbfe98ce5c181380bc6", + "reference": "087ed4b5f4a7a6e8f3bbdfbfe98ce5c181380bc6", "shasum": "" }, "require": { @@ -13410,7 +13416,7 @@ "type": "tidelift" } ], - "time": "2023-12-01T15:19:17+00:00" + "time": "2023-12-08T14:34:28+00:00" }, { "name": "phpstan/phpstan-deprecation-rules", @@ -13645,16 +13651,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.7.2", + "version": "3.8.0", "source": { "type": "git", - "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879" + "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", + "reference": "5805f7a4e4958dbb5e944ef1e6edae0a303765e7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/ed8e00df0a83aa96acf703f8c2979ff33341f879", - "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/5805f7a4e4958dbb5e944ef1e6edae0a303765e7", + "reference": "5805f7a4e4958dbb5e944ef1e6edae0a303765e7", "shasum": "" }, "require": { @@ -13664,7 +13670,7 @@ "php": ">=5.4.0" }, "require-dev": { - "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0" + "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0" }, "bin": [ "bin/phpcs", @@ -13683,22 +13689,45 @@ "authors": [ { "name": "Greg Sherwood", - "role": "lead" + "role": "Former lead" + }, + { + "name": "Juliette Reinders Folmer", + "role": "Current lead" + }, + { + "name": "Contributors", + "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer/graphs/contributors" } ], "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", - "homepage": "https://github.com/squizlabs/PHP_CodeSniffer", + "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer", "keywords": [ "phpcs", "standards", "static analysis" ], "support": { - "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues", - "source": "https://github.com/squizlabs/PHP_CodeSniffer", - "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki" + "issues": "https://github.com/PHPCSStandards/PHP_CodeSniffer/issues", + "security": "https://github.com/PHPCSStandards/PHP_CodeSniffer/security/policy", + "source": "https://github.com/PHPCSStandards/PHP_CodeSniffer", + "wiki": "https://github.com/PHPCSStandards/PHP_CodeSniffer/wiki" }, - "time": "2023-02-22T23:07:41+00:00" + "funding": [ + { + "url": "https://github.com/PHPCSStandards", + "type": "github" + }, + { + "url": "https://github.com/jrfnl", + "type": "github" + }, + { + "url": "https://opencollective.com/php_codesniffer", + "type": "open_collective" + } + ], + "time": "2023-12-08T12:32:31+00:00" } ], "aliases": [], diff --git a/config/sync/markaspot_map.settings.yml b/config/sync/markaspot_map.settings.yml index 96939732..24b910cb 100644 --- a/config/sync/markaspot_map.settings.yml +++ b/config/sync/markaspot_map.settings.yml @@ -7,7 +7,7 @@ timeline_date_format: 'ddd dd.mm.yy' timeline_period: P1D timeline_fps: '15' nid_selector: 'article ' -zoom_initial: '15' +zoom_initial: '10' center_lat: '40.73' center_lng: '-73.93' request_list_path: /requests diff --git a/scripts/georeport-client.sh b/scripts/georeport-client.sh index e8aa7a2f..074f236f 100755 --- a/scripts/georeport-client.sh +++ b/scripts/georeport-client.sh @@ -21,7 +21,7 @@ RADIUS_IN_DEGREES=$(awk "BEGIN {print ($RADIUS / 111.32)}") # Retrieve the services list from the server services_json=$(curl -s -w '\n%{http_code}\n' http://$VIRTUAL_HOST/georeport/v2/services.json) -echo $services_json; +# echo $services_json; # Check for errors in the response response_code=$(echo "$services_json" | tail -n 1) if [ "$response_code" != "200" ]; then diff --git a/scripts/import.sh b/scripts/import.sh index 170ce132..33a62cc6 100755 --- a/scripts/import.sh +++ b/scripts/import.sh @@ -4,7 +4,7 @@ cd "$(dirname "$0")/.." # Install and enable required modules -composer require drupal/migrate_tools drupal/migrate_plus drupal/migrate_source_csv --update-no-dev +composer require drupal/migrate_tools drupal/migrate_plus drupal/migrate_source_csv --update-no-dev --quiet drush en markaspot_default_content -y drush en migrate_tools migrate_plus migrate_source_csv -y @@ -41,4 +41,4 @@ drush cim --source "$source_path" --partial -y # Disable and uninstall the modules drush pmu migrate_source_csv migrate_plus migrate_tools markaspot_default_content -y -composer remove drupal/migrate_tools drupal/migrate_plus drupal/migrate_source_csv +composer remove drupal/migrate_tools drupal/migrate_plus drupal/migrate_source_csv --quiet diff --git a/scripts/start.sh b/scripts/start.sh index 78b6c1c5..51a8678a 100755 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -16,7 +16,7 @@ if [ "$1" = "-h" ] || [ "$1" = "--help" ]; then fi printf "\e[32mInstall all libraries with composer..\e[0m\n" -composer install --no-dev +composer install --no-dev --quiet if [ "$ENVIRONMENT" != "prod" ]; then @@ -119,6 +119,8 @@ if [ "$ENVIRONMENT" != "prod" ]; then read city_name echo "Please enter the country name:" read country_name + echo "Please enter the locale (format as 'language_country', e.g. 'en_US'):" + read locale if ! get_city_info "$city_name" "$country_name"; then echo "City not found or not entered. Please enter the latitude:" diff --git a/scripts/translate.sh b/scripts/translate.sh index d719ee76..4d27bdbf 100755 --- a/scripts/translate.sh +++ b/scripts/translate.sh @@ -1,33 +1,43 @@ #!/bin/sh -if [ -z "$1" ] - then +# Default to German if no language is supplied +if [ -z "$1" ]; then echo "No language supplied, defaulting to German (de)" language="de" - else +else language="$1" fi +# Determine the Drupal version +drupal_version=$(drush status drupal-version --format=string) +if [ -z "$drupal_version" ]; then + echo "Error: Unable to determine Drupal version." + exit 1 +fi + printf "\e[36mImporting translation for $language...\e[0m\n" drush language-add $language -# Download .po file -printf "\e[36mDownloading .po file...\e[0m\n" -wget "https://ftp.drupal.org/files/translations/10.x/drupal/drupal-$language.po" -P ../translations -# Import .po file -drush locale:import $language ../translations/drupal-$language.po +# Check if the .po file was downloaded successfully +if [ -f "$translations_dir/drupal-$drupal_version.$language.po" ]; then -# Set the working directory to the script's parent directory -cd "$(dirname "$0")/.." + # Set the working directory to the script's parent directory + cd "$(dirname "$0")/.." + # Set configuration for the language + drush config:set language.types negotiation.language_interface.enabled.$language 1 -y + drush config:set language.types negotiation.language_interface.method_id language-browser -y + drush config:set language.administration negotiation.language_administration_language $language -y + drush user:modify 1 --langcode=$language -drush config:set language.types negotiation.language_interface.enabled.$language 1 -y -drush config:set language.types negotiation.language_interface.method_id language-browser -y -drush config:set system.site default_langcode $language -y + drush config:set system.site default_langcode $language -y + # Enable multilingual support + printf "\e[36mEnabling translatable Taxonomy Terms for multilingual Georeport Services...\e[0m\n" + drush en markaspot_language + drush cr -# Enable multilingual support -printf "\e[36mEnabling translatable Taxonmy Terms for multilingual Georeport Services...\e[0m\n" -drush en markaspot_language -drush cr +else + echo "Error: .po file not found. Download failed or incorrect language code." +fi