From dfdc0b1ecd2ec4681a3c103f03e922dbc61b7524 Mon Sep 17 00:00:00 2001 From: Daniel Seifert Date: Thu, 21 Nov 2024 13:50:00 +0100 Subject: [PATCH] [Added] 2.x changelog entries --- .../translations/de/d3_extsearch_lang.php | 24 +++++++++++++++++ ...3_manufacturerinformation_translations.php | 26 +++++++++++++++++++ .../translations/en/d3_extsearch_lang.php | 24 +++++++++++++++++ ...3_manufacturerinformation_translations.php | 26 +++++++++++++++++++ .../details/inc/details_tabs_invite.html.tpl | 4 +-- CHANGELOG.md | 18 ++++++++++++- 6 files changed, 119 insertions(+), 3 deletions(-) create mode 100644 Application/translations/de/d3_extsearch_lang.php create mode 100644 Application/translations/de/d3_manufacturerinformation_translations.php create mode 100644 Application/translations/en/d3_extsearch_lang.php create mode 100644 Application/translations/en/d3_manufacturerinformation_translations.php diff --git a/Application/translations/de/d3_extsearch_lang.php b/Application/translations/de/d3_extsearch_lang.php new file mode 100644 index 0000000..f4943a9 --- /dev/null +++ b/Application/translations/de/d3_extsearch_lang.php @@ -0,0 +1,24 @@ + + * @link https://www.oxidmodule.com + */ + +declare(strict_types=1); + +// @codeCoverageIgnoreStart + +$sLangName = "Deutsch"; + +$aLang = include __DIR__."/d3_manufacturerinformation_translations.php"; + +// @codeCoverageIgnoreEnd diff --git a/Application/translations/de/d3_manufacturerinformation_translations.php b/Application/translations/de/d3_manufacturerinformation_translations.php new file mode 100644 index 0000000..ee3de25 --- /dev/null +++ b/Application/translations/de/d3_manufacturerinformation_translations.php @@ -0,0 +1,26 @@ + + * @link https://www.oxidmodule.com + */ + +declare(strict_types=1); + +// @codeCoverageIgnoreStart + +return [ + 'charset' => 'UTF-8', + + 'D3_MANUFACTURERINFO_TAB' => 'Hersteller', +]; + +// @codeCoverageIgnoreEnd diff --git a/Application/translations/en/d3_extsearch_lang.php b/Application/translations/en/d3_extsearch_lang.php new file mode 100644 index 0000000..579ccdb --- /dev/null +++ b/Application/translations/en/d3_extsearch_lang.php @@ -0,0 +1,24 @@ + + * @link https://www.oxidmodule.com + */ + +declare(strict_types=1); + +// @codeCoverageIgnoreStart + +$sLangName = "English"; + +$aLang = include __DIR__."/d3_manufacturerinformation_translations.php"; + +// @codeCoverageIgnoreEnd diff --git a/Application/translations/en/d3_manufacturerinformation_translations.php b/Application/translations/en/d3_manufacturerinformation_translations.php new file mode 100644 index 0000000..2e979ff --- /dev/null +++ b/Application/translations/en/d3_manufacturerinformation_translations.php @@ -0,0 +1,26 @@ + + * @link https://www.oxidmodule.com + */ + +declare(strict_types=1); + +// @codeCoverageIgnoreStart + +return [ + 'charset' => 'UTF-8', + + 'D3_MANUFACTURERINFO_TAB' => 'Manufacturer', +]; + +// @codeCoverageIgnoreEnd diff --git a/Application/views/blocks/page/details/inc/details_tabs_invite.html.tpl b/Application/views/blocks/page/details/inc/details_tabs_invite.html.tpl index 1febd9a..b76e5ff 100644 --- a/Application/views/blocks/page/details/inc/details_tabs_invite.html.tpl +++ b/Application/views/blocks/page/details/inc/details_tabs_invite.html.tpl @@ -8,8 +8,8 @@ [{assign var="sShopURL" value=$oConfig->getConfigParam('sShopURL')}] [{assign var="description" value=$oManufacturer->d3GetLongdesc()}] -[{if $oManufacturer && $oConfig->getConfigParam('d3manufacturerinformation_showManufacturertextOnDetailsPage') && $description|strip_tags|trim}] - [{capture append="tabs"}][{oxmultilang ident="MANUFACTURER"}][{/capture}] + [{if $oConfig->getConfigParam('d3manufacturerinformation_showManufacturertextOnDetailsPage') && $description->rawValue|strip_tags|trim}] + [{capture append="tabs"}][{oxmultilang ident="D3_MANUFACTURERINFO_TAB"}][{/capture}] [{capture append="tabsContent"}]
[{oxeval var=$description}] diff --git a/CHANGELOG.md b/CHANGELOG.md index 39b1bcf..c1504da 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,23 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [unreleased](https://git.d3data.de/D3Public/MyModule/compare/1.1.2.0...rel_1.1.x) +## [unreleased](https://git.d3data.de/D3Private/manufacturer-information/compare/2.0.1.0...rel_2.x) + +## [2.0.1.0](https://git.d3data.de/D3Private/manufacturer-information/compare/2.0.0.0...2.0.1.0) - 2024-11-20 +### Fixed +- show hidden save button +- installation instructions +- show manufacturer link on article details page, if manufacturer hasn't an icon +- prevent encoding HTML entities + +### Added +- display manufacturer content as additional tab on article details page +- make displaying manufacturer tab on details page configurable +- hide empty HTML elements content + +## [2.0.0.0](https://git.d3data.de/D3Private/manufacturer-information/compare/1.1.2.1...2.0.0.0) - 2024-11-16 +### Added +- installability OXID 7.0 - 7.1 ## [1.1.2.1](https://git.d3data.de/D3Private/manufacturer-information/compare/1.1.2.0...1.1.2.1) - 2024-11-21 ### Fixed