search

joomlagerman / joomla

The J!German translation team provides German translation for Joomla!
https://www.jgerman.de
GNU General Public License v2.0
25 stars 46 forks source link

Add Language string DELETE_FROM_TRASH and replace alle occurences of … #3231

Closed jgerman-bot closed 3 months ago

jgerman-bot commented 3 months ago

New language relevant PR in upstream repo: https://github.com/joomla/joomla-cms/pull/43841 Here are the upstream changes:

Click to expand the diff! ```diff diff --git a/administrator/components/com_banners/src/View/Banners/HtmlView.php b/administrator/components/com_banners/src/View/Banners/HtmlView.php index 6c23dde369712..95e93946319cc 100644 --- a/administrator/components/com_banners/src/View/Banners/HtmlView.php +++ b/administrator/components/com_banners/src/View/Banners/HtmlView.php @@ -183,7 +183,7 @@ protected function addToolbar(): void } if ($this->state->get('filter.published') == -2 && $canDo->get('core.delete')) { - $toolbar->delete('banners.delete', 'JTOOLBAR_EMPTY_TRASH') + $toolbar->delete('banners.delete', 'JTOOLBAR_DELETE_FROM_TRASH') ->message('JGLOBAL_CONFIRM_DELETE') ->listCheck(true); } diff --git a/administrator/components/com_banners/src/View/Clients/HtmlView.php b/administrator/components/com_banners/src/View/Clients/HtmlView.php index afcf386fdc93f..a4f795bf8c011 100644 --- a/administrator/components/com_banners/src/View/Clients/HtmlView.php +++ b/administrator/components/com_banners/src/View/Clients/HtmlView.php @@ -155,7 +155,7 @@ protected function addToolbar(): void } if (!$this->isEmptyState && $this->state->get('filter.state') == -2 && $canDo->get('core.delete')) { - $toolbar->delete('clients.delete', 'JTOOLBAR_EMPTY_TRASH') + $toolbar->delete('clients.delete', 'JTOOLBAR_DELETE_FROM_TRASH') ->message('JGLOBAL_CONFIRM_DELETE') ->listCheck(true); } diff --git a/administrator/components/com_categories/src/View/Categories/HtmlView.php b/administrator/components/com_categories/src/View/Categories/HtmlView.php index 94199e1a1404f..2bdc740b0b079 100644 --- a/administrator/components/com_categories/src/View/Categories/HtmlView.php +++ b/administrator/components/com_categories/src/View/Categories/HtmlView.php @@ -256,7 +256,7 @@ protected function addToolbar() } if (!$this->isEmptyState && $this->state->get('filter.published') == -2 && $canDo->get('core.delete', $component)) { - $toolbar->delete('categories.delete', 'JTOOLBAR_EMPTY_TRASH') + $toolbar->delete('categories.delete', 'JTOOLBAR_DELETE_FROM_TRASH') ->message('JGLOBAL_CONFIRM_DELETE') ->listCheck(true); } diff --git a/administrator/components/com_contact/src/View/Contacts/HtmlView.php b/administrator/components/com_contact/src/View/Contacts/HtmlView.php index 864028f5bff00..f4dbbdfe2946e 100644 --- a/administrator/components/com_contact/src/View/Contacts/HtmlView.php +++ b/administrator/components/com_contact/src/View/Contacts/HtmlView.php @@ -191,7 +191,7 @@ protected function addToolbar() } if (!$this->isEmptyState && $this->state->get('filter.published') == -2 && $canDo->get('core.delete')) { - $toolbar->delete('contacts.delete', 'JTOOLBAR_EMPTY_TRASH') + $toolbar->delete('contacts.delete', 'JTOOLBAR_DELETE_FROM_TRASH') ->message('JGLOBAL_CONFIRM_DELETE') ->listCheck(true); } diff --git a/administrator/components/com_content/src/View/Articles/HtmlView.php b/administrator/components/com_content/src/View/Articles/HtmlView.php index fd8be990c4247..f40f898f2d5f8 100644 --- a/administrator/components/com_content/src/View/Articles/HtmlView.php +++ b/administrator/components/com_content/src/View/Articles/HtmlView.php @@ -247,7 +247,7 @@ protected function addToolbar() } if (!$this->isEmptyState && $this->state->get('filter.published') == ContentComponent::CONDITION_TRASHED && $canDo->get('core.delete')) { - $toolbar->delete('articles.delete', 'JTOOLBAR_EMPTY_TRASH') + $toolbar->delete('articles.delete', 'JTOOLBAR_DELETE_FROM_TRASH') ->message('JGLOBAL_CONFIRM_DELETE') ->listCheck(true); } diff --git a/administrator/components/com_content/src/View/Featured/HtmlView.php b/administrator/components/com_content/src/View/Featured/HtmlView.php index 9406564b24ad3..36cd358b8e10e 100644 --- a/administrator/components/com_content/src/View/Featured/HtmlView.php +++ b/administrator/components/com_content/src/View/Featured/HtmlView.php @@ -193,7 +193,7 @@ protected function addToolbar() } if (!$this->isEmptyState && $this->state->get('filter.published') == ContentComponent::CONDITION_TRASHED && $canDo->get('core.delete')) { - $toolbar->delete('articles.delete', 'JTOOLBAR_EMPTY_TRASH') + $toolbar->delete('articles.delete', 'JTOOLBAR_DELETE_FROM_TRASH') ->message('JGLOBAL_CONFIRM_DELETE') ->listCheck(true); } diff --git a/administrator/components/com_fields/src/View/Fields/HtmlView.php b/administrator/components/com_fields/src/View/Fields/HtmlView.php index d22c0d7f26a72..d76946c5b1959 100644 --- a/administrator/components/com_fields/src/View/Fields/HtmlView.php +++ b/administrator/components/com_fields/src/View/Fields/HtmlView.php @@ -185,7 +185,7 @@ protected function addToolbar() } if ($this->state->get('filter.state') == -2 && $canDo->get('core.delete', $component)) { - $toolbar->delete('fields.delete', 'JTOOLBAR_EMPTY_TRASH') + $toolbar->delete('fields.delete', 'JTOOLBAR_DELETE_FROM_TRASH') ->message('JGLOBAL_CONFIRM_DELETE') ->listCheck(true); } diff --git a/administrator/components/com_fields/src/View/Groups/HtmlView.php b/administrator/components/com_fields/src/View/Groups/HtmlView.php index ea9926f0607bb..e31acfc13bd28 100644 --- a/administrator/components/com_fields/src/View/Groups/HtmlView.php +++ b/administrator/components/com_fields/src/View/Groups/HtmlView.php @@ -187,7 +187,7 @@ protected function addToolbar() } if ($this->state->get('filter.state') == -2 && $canDo->get('core.delete', $component)) { - $toolbar->delete('groups.delete', 'JTOOLBAR_EMPTY_TRASH') + $toolbar->delete('groups.delete', 'JTOOLBAR_DELETE_FROM_TRASH') ->message('JGLOBAL_CONFIRM_DELETE') ->listCheck(true); } diff --git a/administrator/components/com_guidedtours/src/View/Steps/HtmlView.php b/administrator/components/com_guidedtours/src/View/Steps/HtmlView.php index 221b1edd2a2f8..d56da90e9246b 100644 --- a/administrator/components/com_guidedtours/src/View/Steps/HtmlView.php +++ b/administrator/components/com_guidedtours/src/View/Steps/HtmlView.php @@ -176,7 +176,7 @@ protected function addToolbar() if (!$this->isEmptyState && $this->state->get('filter.published') == -2 && $canDo->get('core.delete')) { $toolbar->delete('steps.delete') - ->text('JTOOLBAR_EMPTY_TRASH') + ->text('JTOOLBAR_DELETE_FROM_TRASH') ->message('JGLOBAL_CONFIRM_DELETE') ->listCheck(true); } diff --git a/administrator/components/com_guidedtours/src/View/Tours/HtmlView.php b/administrator/components/com_guidedtours/src/View/Tours/HtmlView.php index f9f8bdc483b13..8438986d02e91 100644 --- a/administrator/components/com_guidedtours/src/View/Tours/HtmlView.php +++ b/administrator/components/com_guidedtours/src/View/Tours/HtmlView.php @@ -160,7 +160,7 @@ protected function addToolbar() if (!$this->isEmptyState && $this->state->get('filter.published') == -2 && $canDo->get('core.delete')) { $toolbar->delete('tours.delete') - ->text('JTOOLBAR_EMPTY_TRASH') + ->text('JTOOLBAR_DELETE_FROM_TRASH') ->message('JGLOBAL_CONFIRM_DELETE') ->listCheck(true); } diff --git a/administrator/components/com_languages/src/View/Languages/HtmlView.php b/administrator/components/com_languages/src/View/Languages/HtmlView.php index 536a7d5f9c042..28ebd6d19d63b 100644 --- a/administrator/components/com_languages/src/View/Languages/HtmlView.php +++ b/administrator/components/com_languages/src/View/Languages/HtmlView.php @@ -131,7 +131,7 @@ protected function addToolbar(): void } if ($this->state->get('filter.published') == -2 && $canDo->get('core.delete')) { - $toolbar->delete('languages.delete', 'JTOOLBAR_EMPTY_TRASH') + $toolbar->delete('languages.delete', 'JTOOLBAR_DELETE_FROM_TRASH') ->message('JGLOBAL_CONFIRM_DELETE') ->listCheck(true); } diff --git a/administrator/components/com_menus/src/View/Items/HtmlView.php b/administrator/components/com_menus/src/View/Items/HtmlView.php index 6d30bff5426b2..cd0a03f0a6625 100644 --- a/administrator/components/com_menus/src/View/Items/HtmlView.php +++ b/administrator/components/com_menus/src/View/Items/HtmlView.php @@ -373,7 +373,7 @@ protected function addToolbar() if (!$protected && $this->state->get('filter.published') == -2 && $canDo->get('core.delete')) { $toolbar->delete('items.delete') - ->text('JTOOLBAR_EMPTY_TRASH') + ->text('JTOOLBAR_DELETE_FROM_TRASH') ->message('JGLOBAL_CONFIRM_DELETE') ->listCheck(true); } diff --git a/administrator/components/com_messages/src/View/Messages/HtmlView.php b/administrator/components/com_messages/src/View/Messages/HtmlView.php index f34074bbcd37c..d8f94d12ea713 100644 --- a/administrator/components/com_messages/src/View/Messages/HtmlView.php +++ b/administrator/components/com_messages/src/View/Messages/HtmlView.php @@ -157,7 +157,7 @@ protected function addToolbar() if (!$this->isEmptyState && $this->state->get('filter.state') == -2 && $canDo->get('core.delete')) { $toolbar->delete('messages.delete') - ->text('JTOOLBAR_EMPTY_TRASH') + ->text('JTOOLBAR_DELETE_FROM_TRASH') ->message('JGLOBAL_CONFIRM_DELETE') ->listCheck(true); } diff --git a/administrator/components/com_modules/src/View/Modules/HtmlView.php b/administrator/components/com_modules/src/View/Modules/HtmlView.php index 3a2a344ea3e18..ae97df15d6087 100644 --- a/administrator/components/com_modules/src/View/Modules/HtmlView.php +++ b/administrator/components/com_modules/src/View/Modules/HtmlView.php @@ -233,7 +233,7 @@ protected function addToolbar() } if (!$this->isEmptyState && ($state->get('filter.state') == -2 && $canDo->get('core.delete'))) { - $toolbar->delete('modules.delete', 'JTOOLBAR_EMPTY_TRASH') + $toolbar->delete('modules.delete', 'JTOOLBAR_DELETE_FROM_TRASH') ->message('JGLOBAL_CONFIRM_DELETE') ->listCheck(true); } diff --git a/administrator/components/com_newsfeeds/src/View/Newsfeeds/HtmlView.php b/administrator/components/com_newsfeeds/src/View/Newsfeeds/HtmlView.php index b8ccd3ab71a68..daa7556a84d15 100644 --- a/administrator/components/com_newsfeeds/src/View/Newsfeeds/HtmlView.php +++ b/administrator/components/com_newsfeeds/src/View/Newsfeeds/HtmlView.php @@ -194,7 +194,7 @@ protected function addToolbar() } if (!$this->isEmptyState && $state->get('filter.published') == -2 && $canDo->get('core.delete')) { - $toolbar->delete('newsfeeds.delete', 'JTOOLBAR_EMPTY_TRASH') + $toolbar->delete('newsfeeds.delete', 'JTOOLBAR_DELETE_FROM_TRASH') ->message('JGLOBAL_CONFIRM_DELETE') ->listCheck(true); } diff --git a/administrator/components/com_redirect/src/View/Links/HtmlView.php b/administrator/components/com_redirect/src/View/Links/HtmlView.php index 9451397e18b12..9506cca62ec83 100644 --- a/administrator/components/com_redirect/src/View/Links/HtmlView.php +++ b/administrator/components/com_redirect/src/View/Links/HtmlView.php @@ -193,7 +193,7 @@ protected function addToolbar() } if ($state->get('filter.state') == -2 && $canDo->get('core.delete')) { - $toolbar->delete('links.delete', 'JTOOLBAR_EMPTY_TRASH') + $toolbar->delete('links.delete', 'JTOOLBAR_DELETE_FROM_TRASH') ->message('JGLOBAL_CONFIRM_DELETE') ->listCheck(true); } diff --git a/administrator/components/com_scheduler/src/View/Tasks/HtmlView.php b/administrator/components/com_scheduler/src/View/Tasks/HtmlView.php index 828f486e46c61..447e30360c304 100644 --- a/administrator/components/com_scheduler/src/View/Tasks/HtmlView.php +++ b/administrator/components/com_scheduler/src/View/Tasks/HtmlView.php @@ -167,7 +167,7 @@ protected function addToolbar(): void // Add "Empty Trash" button if filtering by trashed. if ($this->state->get('filter.state') == -2 && $canDo->get('core.delete')) { - $toolbar->delete('tasks.delete', 'JTOOLBAR_EMPTY_TRASH') + $toolbar->delete('tasks.delete', 'JTOOLBAR_DELETE_FROM_TRASH') ->message('JGLOBAL_CONFIRM_DELETE') ->listCheck(true); } diff --git a/administrator/components/com_tags/src/View/Tags/HtmlView.php b/administrator/components/com_tags/src/View/Tags/HtmlView.php index 3a1e0394cddae..e32294c797ad6 100644 --- a/administrator/components/com_tags/src/View/Tags/HtmlView.php +++ b/administrator/components/com_tags/src/View/Tags/HtmlView.php @@ -190,7 +190,7 @@ protected function addToolbar() } if (!$this->isEmptyState && $this->state->get('filter.published') == -2 && $canDo->get('core.delete')) { - $toolbar->delete('tags.delete', 'JTOOLBAR_EMPTY_TRASH') + $toolbar->delete('tags.delete', 'JTOOLBAR_DELETE_FROM_TRASH') ->message('JGLOBAL_CONFIRM_DELETE') ->listCheck(true); } diff --git a/administrator/components/com_users/src/View/Notes/HtmlView.php b/administrator/components/com_users/src/View/Notes/HtmlView.php index d0bd160a23bcc..6348ae52418b0 100644 --- a/administrator/components/com_users/src/View/Notes/HtmlView.php +++ b/administrator/components/com_users/src/View/Notes/HtmlView.php @@ -166,7 +166,7 @@ protected function addToolbar() } if (!$this->isEmptyState && $this->state->get('filter.published') == -2 && $canDo->get('core.delete')) { - $toolbar->delete('notes.delete', 'JTOOLBAR_EMPTY_TRASH') + $toolbar->delete('notes.delete', 'JTOOLBAR_DELETE_FROM_TRASH') ->message('JGLOBAL_CONFIRM_DELETE') ->listCheck(true); } diff --git a/administrator/components/com_workflow/src/View/Stages/HtmlView.php b/administrator/components/com_workflow/src/View/Stages/HtmlView.php index 805f0e328a38a..532974a96a162 100644 --- a/administrator/components/com_workflow/src/View/Stages/HtmlView.php +++ b/administrator/components/com_workflow/src/View/Stages/HtmlView.php @@ -203,7 +203,7 @@ protected function addToolbar() } if ($this->state->get('filter.published') === '-2' && $canDo->get('core.delete')) { - $toolbar->delete('stages.delete', 'JTOOLBAR_EMPTY_TRASH') + $toolbar->delete('stages.delete', 'JTOOLBAR_DELETE_FROM_TRASH') ->message('JGLOBAL_CONFIRM_DELETE') ->listCheck(true); } diff --git a/administrator/components/com_workflow/src/View/Transitions/HtmlView.php b/administrator/components/com_workflow/src/View/Transitions/HtmlView.php index e2431dd320345..fde79555e8809 100644 --- a/administrator/components/com_workflow/src/View/Transitions/HtmlView.php +++ b/administrator/components/com_workflow/src/View/Transitions/HtmlView.php @@ -200,7 +200,7 @@ protected function addToolbar() } if ($this->state->get('filter.published') === '-2' && $canDo->get('core.delete')) { - $toolbar->delete('transitions.delete', 'JTOOLBAR_EMPTY_TRASH') + $toolbar->delete('transitions.delete', 'JTOOLBAR_DELETE_FROM_TRASH') ->message('JGLOBAL_CONFIRM_DELETE') ->listCheck(true); } diff --git a/administrator/components/com_workflow/src/View/Workflows/HtmlView.php b/administrator/components/com_workflow/src/View/Workflows/HtmlView.php index b8f05192a2797..3bc83d838dd69 100644 --- a/administrator/components/com_workflow/src/View/Workflows/HtmlView.php +++ b/administrator/components/com_workflow/src/View/Workflows/HtmlView.php @@ -173,7 +173,7 @@ protected function addToolbar() } if ($this->state->get('filter.published') === '-2' && $canDo->get('core.delete')) { - $toolbar->delete('workflows.delete', 'JTOOLBAR_EMPTY_TRASH') + $toolbar->delete('workflows.delete', 'JTOOLBAR_DELETE_FROM_TRASH') ->message('JGLOBAL_CONFIRM_DELETE') ->listCheck(true); } diff --git a/administrator/language/en-GB/joomla.ini b/administrator/language/en-GB/joomla.ini index 71d1fc167480a..3433db03d7275 100644 --- a/administrator/language/en-GB/joomla.ini +++ b/administrator/language/en-GB/joomla.ini @@ -785,6 +785,7 @@ JTOOLBAR_CLOSE="Close" JTOOLBAR_DEFAULT="Default" JTOOLBAR_DELETE="Delete" JTOOLBAR_DELETE_ALL="Delete All" +JTOOLBAR_DELETE_FROM_TRASH="Delete" JTOOLBAR_DISABLE="Disable" JTOOLBAR_DUPLICATE="Duplicate" JTOOLBAR_EDIT="Edit" diff --git a/api/language/en-GB/joomla.ini b/api/language/en-GB/joomla.ini index 152a4a8bca4bd..7e5cf62b974c4 100644 --- a/api/language/en-GB/joomla.ini +++ b/api/language/en-GB/joomla.ini @@ -777,6 +777,7 @@ JTOOLBAR_CLOSE="Close" JTOOLBAR_DEFAULT="Default" JTOOLBAR_DELETE="Delete" JTOOLBAR_DELETE_ALL="Delete All" +JTOOLBAR_DELETE_FROM_TRASH="Delete" JTOOLBAR_DISABLE="Disable" JTOOLBAR_DUPLICATE="Duplicate" JTOOLBAR_EDIT="Edit" diff --git a/libraries/src/MVC/View/ListView.php b/libraries/src/MVC/View/ListView.php index 6727be9ec2f64..b5039fa796124 100644 --- a/libraries/src/MVC/View/ListView.php +++ b/libraries/src/MVC/View/ListView.php @@ -258,7 +258,7 @@ protected function addToolbar() $this->state->get('filter.published') == -2 ) ) { - ToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', $viewName . '.delete', 'JTOOLBAR_EMPTY_TRASH'); + ToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', $viewName . '.delete', 'JTOOLBAR_DELETE_FROM_TRASH'); } elseif ($canDo->get('core.edit.state')) { ToolbarHelper::trash($viewName . '.trash'); } ```