Skip to content

Commit

Permalink
Merge branch 'pr953' into b-8.0.x
Browse files Browse the repository at this point in the history
  • Loading branch information
Sieg committed Mar 29, 2024
2 parents 6d64aa2 + dc9fead commit b7a7964
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG-8.0.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@
- Remove deprecated global function \makeReadable()
- Redundant `TemplateFileResolverInterface` functionality
- Smarty templates support
- `PAYMENT_INFO_OFF` translation [PR-953](https://github.com/OXID-eSales/oxideshop_ce/pull/953)
1 change: 0 additions & 1 deletion source/Application/translations/de/lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -712,7 +712,6 @@
'DETAILS_VPE_MESSAGE' => 'Dieser Artikel kann nur in Verpackungseinheiten zu je %s erworben werden.',
'DETAILS_CHOOSEVARIANT' => 'Bitte wählen Sie eine Variante',
'INVITE_TO_SHOP' => 'Eine Einladung von %s %s zu besuchen.',
'PAYMENT_INFO_OFF' => 'BEZAHLINFORMATIONEN AUSGESCHALTET - um diese einzuschalten, bitte Application/views/[theme]/tpl/email/html/order_owner und plain/order_owner ändern.',
'DISTRIBUTORS' => 'Lieferanten',
'MANUFACTURERS' => 'Marken',
'SERVICES' => 'Service',
Expand Down
1 change: 0 additions & 1 deletion source/Application/translations/en/lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -711,7 +711,6 @@
'DETAILS_VPE_MESSAGE' => 'This product can only be ordered in packaging units of %s',
'DETAILS_CHOOSEVARIANT' => 'Please select a variant',
'INVITE_TO_SHOP' => 'An invitation from %s to visit %s',
'PAYMENT_INFO_OFF' => 'PAYMENT INFORMATION SWITCHED OFF - to switch it on please edit Application/views/[theme]/tpl/email/html/order_owner and plain/order_owner.',
'DISTRIBUTORS' => 'Distributors',
'MANUFACTURERS' => 'Brands',
'SERVICES' => 'Service',
Expand Down

0 comments on commit b7a7964

Please sign in to comment.