From 6b1c533e190a5e5d93d6610e56b77ac76a52a4ce Mon Sep 17 00:00:00 2001 From: Divesh Pahuja Date: Thu, 7 Sep 2023 16:57:39 +0200 Subject: [PATCH 1/2] [Codeception] use lowest dependency (#46) * [Codeception] use lowest dependency - resolves #37 * remove minimum stability --- .github/workflows/codeception.yaml | 8 ++++---- composer.json | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/codeception.yaml b/.github/workflows/codeception.yaml index 0234e5c..109b422 100644 --- a/.github/workflows/codeception.yaml +++ b/.github/workflows/codeception.yaml @@ -34,13 +34,13 @@ jobs: runs-on: "ubuntu-20.04" continue-on-error: ${{ matrix.experimental }} env: - PIMCORE_TEST_DB_DSN: "mysql://root@127.0.0.1:33006/pimcore_test?serverVersion=${{ matrix.server_version }}" + PIMCORE_TEST_DB_DSN: "mysql://root@127.0.0.1:33006/pimcore_test" strategy: matrix: include: - - { php-version: 8.1, database: "mariadb:10.7", server_version: "10.7.7-MariaDB-1:10.7.7+maria~ubu2004", dependencies: highest, experimental: false } - - { php-version: 8.2, database: "mariadb:10.7", server_version: "10.7.7-MariaDB-1:10.7.7+maria~ubu2004", dependencies: highest, experimental: false } - - { php-version: 8.2, database: "mariadb:10.7", server_version: "10.7.7-MariaDB-1:10.7.7+maria~ubu2004", dependencies: highest, pimcore_version: "11.x-dev as 11.0.0", experimental: true } + - { php-version: 8.1, database: "mariadb:10.3", dependencies: lowest, experimental: false } + - { php-version: 8.2, database: "mariadb:10.11", dependencies: highest, experimental: false } + - { php-version: 8.2, database: "mariadb:10.11", dependencies: highest, pimcore_version: "11.x-dev as 11.0.0", experimental: true } services: redis: diff --git a/composer.json b/composer.json index 0891a4f..1fa8f12 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,6 @@ } }, "prefer-stable": true, - "minimum-stability": "dev", "require": { "pimcore/pimcore": "^11.0", "pimcore/admin-ui-classic-bundle": "^1.0" From 2221dafeae90da926cf043bc28e069946fdbbbd8 Mon Sep 17 00:00:00 2001 From: Bernhard Rusch Date: Thu, 14 Sep 2023 14:20:05 +0200 Subject: [PATCH 2/2] POEditor translations import (#47) --- translations/admin.pt_br.yaml | 75 +++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 translations/admin.pt_br.yaml diff --git a/translations/admin.pt_br.yaml b/translations/admin.pt_br.yaml new file mode 100644 index 0000000..9276374 --- /dev/null +++ b/translations/admin.pt_br.yaml @@ -0,0 +1,75 @@ +--- +add_printpage: Add PrintPage +add_printcontainer: Add PrintContainer +web2print_settings: Web-to-Print Settings +web2print_preview_pdf: Generate & Preview PDF +web2print_cancel_pdf_creation: Cancel PDF Creation +web2print_generate_pdf: Generate PDF +web2print_download_pdf: Download PDF +web2print_last-generated: Last Generated +web2print_last-generate-message: Last Generate Message +web2print: Web-to-Print +web2print_prepare_pdf_generation: Prepare PDF Generation +web2print_start_html_rendering: Start HTML Rendering +web2print_finished_html_rendering: Finished HTML Rendering +web2print_saved_html_file: Saved HTML File +web2print_pdf_conversion: PDF Conversion +web2print_saving_pdf_document: Save PDF Document +web2print_author: Author +web2print_printermarks: Printermarks +web2print_bookmarks: Bookmarks +web2print_only_published: Only possible with published documents. +web2print_documents_changed: Documents changed since last pdf generation. +web2print_addOverprint: Overprinting +web2print_enableDebugMode: Enable debug mode +web2print_enableLenientHttpsMode: Enable lenient HTTPS mode +web2print_enableLenientHttpsMode_txt: Enable this option if PDFreactor fails to connect + successfully via HTTPS +web2print_tags: tags +web2print_links: links +web2print_tool: Tool +web2print_save_mode: Document Save Mode +web2print_save_mode_txt: Document Save Mode = cleanup deletes all not used document + elements for current document. This might be necessary for useage reports in print + documents. +web2print_pdfreactor_settings: PDFreactor Settings +web2print_server: Server +web2print_baseURL: BaseURL +web2print_baseURL_txt: BaseURL for PDFreactor. This is prefixed to each relative url + in print templates when creating PDFs. +web2print_docker_baseURL_txt: This is prefixed to each relative url in print templates + when creating PDFs. +web2print_apiKey_txt: If the PDFreactor instance is set up to require API keys, you + can enter it here. +web2print_json_converter: Open JSON converter/validator +web2print_licence: Licence +web2print_gotenberg_settings: Gotenberg Settings +web2print_gotenberg_documentation: Option Documentation +web2print_gotenberg_documentation_additions: Warning +web2print_gotenberg_documentation_additions_text: Since Gotenberg is Docker-powered + service, it requires absolute urls to work. By default, it works within the same + container by using `http://nginx:80` as host url. Please override this configuration + accordingly into the settings below. +web2print_headlesschrome_json_converter: "" +web2print_hostname: Hostname +web2print_protocol: Protocol +web2print_port: Port +web2print_apiKey: API Key +web2print_chromium_requirements: Requirements +web2print_chromium_requirements_documentation: Please make sure to install chrome-php/chrome + via composer +web2print_chromium_settings: Chromium settings +web2print_chromium_documentation: Option Documentation +web2print_chromium_options_documentation: Please make sure following configuration + matches the option available on Chrome DevTools Documentation, any other values + may break the pdf generation +web2print_chromium_documentation_additions: Additional Options +web2print_chromium_documentation_additions_text: 'There are two additional options: + "header" and "footer". This options need a URL, which returns the header or footer + template.' +web2print_chromium_documentation_docker: Notes for Dockerized Chromium +web2print_chromium_documentation_docker_text: When using a Dockerized Chromium through + WebSocket, the following field must be set to the web server service accordingly. + eg. `http://nginx:80` +web2print_hostURL: Host Url +...