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

[5.1] upmerges 2023-10-21 #3042

Closed jgerman-bot closed 8 months ago

jgerman-bot commented 11 months ago

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

Click to expand the diff! ```diff diff --git a/administrator/components/com_fields/forms/field.xml b/administrator/components/com_fields/forms/field.xml index e688ff6eae965..88157e4abbf3e 100644 --- a/administrator/components/com_fields/forms/field.xml +++ b/administrator/components/com_fields/forms/field.xml @@ -342,6 +342,7 @@ name="searchindex" type="list" label="COM_FIELDS_FIELD_SEARCHINDEX_LABEL" + description="COM_FIELDS_FIELD_SEARCHINDEX_DESC" default="0" validate="options" > diff --git a/administrator/components/com_installer/src/Helper/InstallerHelper.php b/administrator/components/com_installer/src/Helper/InstallerHelper.php index 9cab7489d789a..ef6d3c72e04c5 100644 --- a/administrator/components/com_installer/src/Helper/InstallerHelper.php +++ b/administrator/components/com_installer/src/Helper/InstallerHelper.php @@ -431,27 +431,27 @@ protected static function getUpdateSitesInformation(bool $onlyEnabled): array ->select( $db->quoteName( [ - 's.update_site_id', - 's.enabled', - 's.extra_query', - 'e.extension_id', - 'e.type', - 'e.element', - 'e.folder', - 'e.client_id', - 'e.manifest_cache', - ], + 's.update_site_id', + 's.enabled', + 's.extra_query', + 'e.extension_id', + 'e.type', + 'e.element', + 'e.folder', + 'e.client_id', + 'e.manifest_cache', + ], [ - 'update_site_id', - 'enabled', - 'extra_query', - 'extension_id', - 'type', - 'element', - 'folder', - 'client_id', - 'manifest_cache', - ] + 'update_site_id', + 'enabled', + 'extra_query', + 'extension_id', + 'type', + 'element', + 'folder', + 'client_id', + 'manifest_cache', + ] ) ) ->from($db->quoteName('#__update_sites', 's')) diff --git a/administrator/components/com_joomlaupdate/src/Model/UpdateModel.php b/administrator/components/com_joomlaupdate/src/Model/UpdateModel.php index 7c57a8ae59c4c..977531e1347fe 100644 --- a/administrator/components/com_joomlaupdate/src/Model/UpdateModel.php +++ b/administrator/components/com_joomlaupdate/src/Model/UpdateModel.php @@ -1656,7 +1656,7 @@ private function checkCompatibility($updateFileUrl, $joomlaTargetVersion) */ protected function translateExtensionName(&$item) { - // @todo: Cleanup duplicated code. from com_installer/models/extension.php + // @todo: Cleanup duplicated code. from com_installer/src/Model/InstallerModel.php $lang = Factory::getLanguage(); $path = $item->client_id ? JPATH_ADMINISTRATOR : JPATH_SITE; diff --git a/administrator/components/com_joomlaupdate/src/View/Joomlaupdate/HtmlView.php b/administrator/components/com_joomlaupdate/src/View/Joomlaupdate/HtmlView.php index 44d4eb2a8b354..2fec11100701b 100644 --- a/administrator/components/com_joomlaupdate/src/View/Joomlaupdate/HtmlView.php +++ b/administrator/components/com_joomlaupdate/src/View/Joomlaupdate/HtmlView.php @@ -115,7 +115,7 @@ class HtmlView extends BaseHtmlView * * @var string The message * - * @since __DEPLOY_VERSION__ + * @since 4.4.0 */ protected $reasonNoDownload = ''; diff --git a/administrator/components/com_media/resources/scripts/components/browser/table/row.vue b/administrator/components/com_media/resources/scripts/components/browser/table/row.vue index d5cc15c1df5d1..f8b38a6c4421b 100644 --- a/administrator/components/com_media/resources/scripts/components/browser/table/row.vue +++ b/administrator/components/com_media/resources/scripts/components/browser/table/row.vue @@ -6,6 +6,19 @@ @click="onClick" > + + + @@ -31,6 +44,7 @@ Githubissues.
  • Githubissues is a development platform for aggregating issues.