Skip to content

Commit

Permalink
#30042 improved naming for DHL settings in Admin panel
Browse files Browse the repository at this point in the history
  • Loading branch information
mbe1987 committed Jun 11, 2024
1 parent b83a81c commit ca794a3
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 21 deletions.
3 changes: 3 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
# Changelog
## develop
* improved naming for DHL settings in Admin panel

## 1 7.7
* fix category model inheritance

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,10 @@
'SHOP_MODULE_mo_dhl__portokasse_password' => 'Portokasse Passwort',
'HELP_SHOP_MODULE_mo_dhl__portokasse_password' => 'Ihr Passwort für die <a href="https://portokasse.deutschepost.de/">Portokasse</a>.',

'SHOP_MODULE_GROUP_mo_dhl__internetmarke' => 'Internetmarke',
'SHOP_MODULE_mo_dhl__internetmarke_layout' => 'Layout ID für den Druck der Internetmarken',
'SHOP_MODULE_mo_dhl__internetmarke_check' => '',
'SHOP_MODULE_GROUP_mo_dhl__internetmarke' => 'Internetmarke',
'SHOP_MODULE_mo_dhl__internetmarke_layout' => 'Layout ID für den Druck der Internetmarken',
'HELP_SHOP_MODULE_mo_dhl__internetmarke_layout' => 'Geben Sie die ID des Druckformats an, welches in der INTERNETMARKE angelegt wurde.',
'SHOP_MODULE_mo_dhl__internetmarke_check' => '',

'SHOP_MODULE_GROUP_mo_dhl__delivery' => 'Versand',
'SHOP_MODULE_mo_dhl__only_with_leitcode' => 'Nur leitcodierbare Adressen zulassen',
Expand Down Expand Up @@ -147,8 +148,8 @@
'SHOP_MODULE_mo_dhl__standortsuche_maximumHits_48' => '48',
'SHOP_MODULE_mo_dhl__standortsuche_maximumHits_49' => '49',
'SHOP_MODULE_mo_dhl__standortsuche_maximumHits_50' => '50',
'SHOP_MODULE_mo_dhl__standortsuche_googleMapsApiKey' => 'API-Schlüssel',
'HELP_SHOP_MODULE_mo_dhl__standortsuche_googleMapsApiKey' => 'Sie können einen API-Schlüssel <a target="_blank" rel="noopener noreferrer" href="https://developers.google.com/maps/documentation/javascript/get-api-key">hier anfordern</a>.',
'SHOP_MODULE_mo_dhl__standortsuche_googleMapsApiKey' => 'Google Maps JavaScript API-Schlüssel',
'HELP_SHOP_MODULE_mo_dhl__standortsuche_googleMapsApiKey' => 'Sie können einen Google Maps JavaScript API-Schlüssel <a target="_blank" rel="noopener noreferrer" href="https://developers.google.com/maps/documentation/javascript/get-api-key">hier anfordern</a>.',
'SHOP_MODULE_mo_dhl__standortsuche_packstation' => 'Packstation wählbar',
'SHOP_MODULE_mo_dhl__standortsuche_postfiliale' => 'Postfiliale wählbar',
'SHOP_MODULE_mo_dhl__standortsuche_paketshop' => 'Paketshop wählbar',
Expand Down Expand Up @@ -218,9 +219,8 @@
'SHOP_MODULE_mo_dhl__retention_UNLIMITED' => 'unbegrenzt',
'SHOP_MODULE_mo_dhl__logfiles' => 'Logdateien',

'SHOP_MODULE_GROUP_mo_dhl__privacy' => 'Datenschutz',
'SHOP_MODULE_mo_dhl__privacy_policy' => 'Datenschutzerklärung',
'HELP_SHOP_MODULE_mo_dhl__privacy_policy' => 'Wir erwarten einen Bezeichner eine CMS-Seite.',
'HELP_SHOP_MODULE_mo_dhl__privacy_policy' => 'Ein Link zur Datenschutzerklärung wird neben dem Feld für die Option Nachbar im Wunschzustellung_block angezeigt. Geben Sie einen Bezeichner einer CMS-Seite an (z.B. oxsecurityinfo).',

'SHOP_MODULE_mo_dhl__standortsuche_map_radius' => 'Radius in Metern für Standortsuche',
'HELP_SHOP_MODULE_mo_dhl__standortsuche_map_radius' => 'Einen expliziten Suchradius anzugeben kann die Suchergebnisse verbessern. Bei einem Radius von 0 wird dieser nicht verwendet.',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,18 @@
'SHOP_MODULE_mo_dhl__merchant_ekp' => 'EKP',
'HELP_SHOP_MODULE_mo_dhl__merchant_ekp' => 'The EKP is your DHL customer number',

'SHOP_MODULE_mo_dhl__authentication_check' => '',
'SHOP_MODULE_mo_dhl__authentication_check' => '',

'SHOP_MODULE_GROUP_mo_dhl__portokasse' => 'Portokasse',
'SHOP_MODULE_mo_dhl__portokasse_user' => 'Portokasse Username (for Internetmarke and Warenpost)',
'HELP_SHOP_MODULE_mo_dhl__portokasse_user' => 'Your E-Mail Adress for the <a href="https://portokasse.deutschepost.de/">Portokasse</a>. Not a customer yet? Then register <a href="https://portokasse.deutschepost.de/portokasse/#!/register/">here</a>.',
'SHOP_MODULE_mo_dhl__portokasse_password' => 'Portokasse Password',
'HELP_SHOP_MODULE_mo_dhl__portokasse_password' => 'Your Password for the <a href="https://portokasse.deutschepost.de/">Portokasse</a>.',

'SHOP_MODULE_GROUP_mo_dhl__internetmarke' => 'Internetmarke',
'SHOP_MODULE_mo_dhl__internetmarke_layout' => 'Layout ID for printing the Internetmarke',
'SHOP_MODULE_mo_dhl__internetmarke_check' => '',
'SHOP_MODULE_GROUP_mo_dhl__internetmarke' => 'Internetmarke',
'SHOP_MODULE_mo_dhl__internetmarke_layout' => 'Layout ID for printing the Internetmarke',
'HELP_SHOP_MODULE_mo_dhl__internetmarke_layout' => 'Provide the ID of a print format, that was created in the INTERNETMARKE.',
'SHOP_MODULE_mo_dhl__internetmarke_check' => '',

'SHOP_MODULE_GROUP_mo_dhl__delivery' => 'Delivery',
'SHOP_MODULE_mo_dhl__only_with_leitcode' => 'Allow only Codeable shipping addresses',
Expand Down Expand Up @@ -148,8 +149,8 @@
'SHOP_MODULE_mo_dhl__standortsuche_maximumHits_48' => '48',
'SHOP_MODULE_mo_dhl__standortsuche_maximumHits_49' => '49',
'SHOP_MODULE_mo_dhl__standortsuche_maximumHits_50' => '50',
'SHOP_MODULE_mo_dhl__standortsuche_googleMapsApiKey' => 'API key',
'HELP_SHOP_MODULE_mo_dhl__standortsuche_googleMapsApiKey' => '<a target="_blank" rel="noopener noreferrer" href="https://developers.google.com/maps/documentation/javascript/get-api-key">Get an API key here</a>',
'SHOP_MODULE_mo_dhl__standortsuche_googleMapsApiKey' => 'Google Maps JavaScript API key',
'HELP_SHOP_MODULE_mo_dhl__standortsuche_googleMapsApiKey' => '<a target="_blank" rel="noopener noreferrer" href="https://developers.google.com/maps/documentation/javascript/get-api-key">Get a Google Maps JavaScript API key here</a>',
'SHOP_MODULE_mo_dhl__standortsuche_packstation' => 'Packstation enabled',
'SHOP_MODULE_mo_dhl__standortsuche_postfiliale' => 'Postfiliale enabled',
'SHOP_MODULE_mo_dhl__standortsuche_paketshop' => 'Paketshop enabled',
Expand Down Expand Up @@ -219,9 +220,8 @@
'SHOP_MODULE_mo_dhl__retention_UNLIMITED' => 'unlimited',
'SHOP_MODULE_mo_dhl__logfiles' => 'Log files',

'SHOP_MODULE_GROUP_mo_dhl__privacy' => 'Privacy',
'SHOP_MODULE_mo_dhl__privacy_policy' => 'Privacy Policy',
'HELP_SHOP_MODULE_mo_dhl__privacy_policy' => 'We expect an idenifier of a CMS page',
'HELP_SHOP_MODULE_mo_dhl__privacy_policy' => 'A link to the privacy policy will be placed near the field for the preferred neighbor. Provide an identifier of a CMS page (e.g. oxsecurityinfo)',

'SHOP_MODULE_mo_dhl__standortsuche_map_radius' => 'Radius in meter for location searches',
'HELP_SHOP_MODULE_mo_dhl__standortsuche_map_radius' => 'Giving an explicit radius can improve search results. Having 0 as value will ignore this field.',
Expand Down
12 changes: 6 additions & 6 deletions src/modules/mo/mo_dhl/metadata.php
Original file line number Diff line number Diff line change
Expand Up @@ -631,6 +631,12 @@
'type' => 'bool',
'value' => 'false',
],
[
'group' => 'mo_dhl__wunschnachbar',
'name' => 'mo_dhl__privacy_policy',
'type' => 'str',
'value' => 'oxsecurityinfo',
],
[
'group' => 'mo_dhl__logs',
'name' => 'mo_dhl__logLevel',
Expand All @@ -651,11 +657,5 @@
'type' => 'bool',
'value' => 'false',
],
[
'group' => 'mo_dhl__privacy',
'name' => 'mo_dhl__privacy_policy',
'type' => 'str',
'value' => 'oxsecurityinfo',
],
],
];

0 comments on commit ca794a3

Please sign in to comment.