Język polski dla Joomla 4
GNU General Public License v2.0
3
stars
5
forks
source link
[5.1] Menus and categories view with equal headline #466
Closed
joomlapl-bot closed 7 months ago
-
+
\ No newline at end of file
diff --git a/administrator/language/en-GB/com_banners.ini b/administrator/language/en-GB/com_banners.ini
index da671eb417c1..4bc287d64481 100644
--- a/administrator/language/en-GB/com_banners.ini
+++ b/administrator/language/en-GB/com_banners.ini
@@ -59,10 +59,10 @@ COM_BANNERS_CLIENTS_N_ITEMS_UNPUBLISHED_1="Client unpublished."
COM_BANNERS_CLIENTS_NO_ITEM_SELECTED="No clients selected."
COM_BANNERS_CLIENTS_TABLE_CAPTION="Clients"
COM_BANNERS_CONFIGURATION="Banners: Options"
-COM_BANNERS_COUNT_ARCHIVED_ITEMS="Archived banners"
-COM_BANNERS_COUNT_PUBLISHED_ITEMS="Published banners"
-COM_BANNERS_COUNT_TRASHED_ITEMS="Trashed banners"
-COM_BANNERS_COUNT_UNPUBLISHED_ITEMS="Unpublished banners"
+COM_BANNERS_COUNT_ARCHIVED_ITEMS="Archived"
+COM_BANNERS_COUNT_PUBLISHED_ITEMS="Published"
+COM_BANNERS_COUNT_TRASHED_ITEMS="Trashed"
+COM_BANNERS_COUNT_UNPUBLISHED_ITEMS="Unpublished"
COM_BANNERS_DEFAULT="Default (%s)"
COM_BANNERS_DELETE_MSG="Are you sure you want to delete all these tracks?"
COM_BANNERS_EDIT_CLIENT="Details"
diff --git a/administrator/language/en-GB/com_categories.ini b/administrator/language/en-GB/com_categories.ini
index a0cc590ef834..7febf190e942 100644
--- a/administrator/language/en-GB/com_categories.ini
+++ b/administrator/language/en-GB/com_categories.ini
@@ -15,6 +15,10 @@ COM_CATEGORIES_CATEGORY_ADD_TITLE="%s: New Category"
COM_CATEGORIES_CATEGORY_BASE_ADD_TITLE="New Category"
COM_CATEGORIES_CATEGORY_BASE_EDIT_TITLE="Edit Category"
COM_CATEGORIES_CATEGORY_EDIT_TITLE="%s: Edit Category"
+COM_CATEGORIES_COUNT_ARCHIVED_ARTICLES="Archived Articles"
+COM_CATEGORIES_COUNT_PUBLISHED_ARTICLES="Published Articles"
+COM_CATEGORIES_COUNT_TRASHED_ARTICLES="Trashed Articles"
+COM_CATEGORIES_COUNT_UNPUBLISHED_ARTICLES="Unpublished Articles"
COM_CATEGORIES_DELETE_NOT_ALLOWED="Delete not allowed for category %s."
COM_CATEGORIES_EDIT_CATEGORY="Edit Category"
COM_CATEGORIES_EMPTYSTATE_BUTTON_ADD="Add a category"
@@ -36,6 +40,11 @@ COM_CATEGORIES_FORM_TITLE_EDIT="Edit Category"
COM_CATEGORIES_FORM_TITLE_NEW="New Category"
COM_CATEGORIES_HAS_SUBCATEGORY_ITEMS="%d items are assigned to this category's subcategories."
COM_CATEGORIES_HAS_SUBCATEGORY_ITEMS_1="One item is assigned to one of this category's subcategories."
+COM_CATEGORIES_HEADING_ARCHIVED="Archived"
+COM_CATEGORIES_HEADING_PUBLISHED="Published"
+COM_CATEGORIES_HEADING_TRASHED="Trashed"
+COM_CATEGORIES_HEADING_UNPUBLISHED="Unpublished"
+COM_CATEGORIES_HEADING_ASSOCIATION="Association"
COM_CATEGORIES_ITEMS_SEARCH_FILTER="Search"
COM_CATEGORIES_N_ITEMS_ARCHIVED="%d categories archived."
COM_CATEGORIES_N_ITEMS_ARCHIVED_1="Category archived."
@@ -69,11 +78,6 @@ COM_CATEGORIES_SELECT_A_CATEGORY="Select a Category"
COM_CATEGORIES_TABLE_CAPTION="Categories"
COM_CATEGORIES_TIP_ASSOCIATION="Associated categories"
COM_CATEGORIES_XML_DESCRIPTION="This component manages categories."
-COM_CATEGORY_COUNT_ARCHIVED_ITEMS="Archived items"
-COM_CATEGORY_COUNT_PUBLISHED_ITEMS="Published items"
-COM_CATEGORY_COUNT_TRASHED_ITEMS="Trashed items"
-COM_CATEGORY_COUNT_UNPUBLISHED_ITEMS="Unpublished items"
-COM_CATEGORY_HEADING_ASSOCIATION="Association"
JGLOBAL_NO_ITEM_SELECTED="No categories selected."
JLIB_HTML_ACCESS_SUMMARY_DESC="Shown below is an overview of the permission settings for this category. Select the tabs above to customise these settings by action."
JLIB_RULES_SETTING_NOTES_ITEM="Changes apply to this category and all child categories.
Inherited - a Global Configuration setting or higher level setting is applied.
Denied always wins - whatever is set at the Global or higher level and applies to all child elements.
Allowed will enable the action for this component unless overruled by a Global Configuration setting."
diff --git a/package-lock.json b/package-lock.json
index 5f85f0ed8652..575f8a2e16c0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -52,7 +52,6 @@
"qrcode-generator": "^1.4.4",
"roboto-fontface": "^0.10.0",
"sa11y": "^3.0.8",
- "sa11y": "^3.0.8",
"shepherd.js": "^11.2.0",
"short-and-sweet": "^1.0.4",
"skipto": "^4.1.7",
@@ -8364,14 +8363,6 @@
"tippy.js": "^6.3.7"
}
},
- "node_modules/sa11y": {
- "version": "3.0.8",
- "resolved": "https://registry.npmjs.org/sa11y/-/sa11y-3.0.8.tgz",
- "integrity": "sha512-muMZGhlDJ8wsT8OuZEBfdeVqCatyhtIUm5MaeatWqo4CWeLLZo9dXkvlBj4zZfKccKFhHMWzAFsAwM1KL1oMjw==",
- "dependencies": {
- "tippy.js": "^6.3.7"
- }
- },
"node_modules/safe-array-concat": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.0.tgz",
@@ -10123,4 +10114,4 @@
}
}
}
-}
\ No newline at end of file
+}
```
PR w związku ze zmianą oryginału https://github.com/joomla/joomla-cms/pull/38787 Poniżej zmiany w oryginale:
Click to expand the diff!
```diff diff --git a/administrator/components/com_banners/tmpl/clients/default.php b/administrator/components/com_banners/tmpl/clients/default.php index 6b06f8d5734b..9a42b37510cd 100644 --- a/administrator/components/com_banners/tmpl/clients/default.php +++ b/administrator/components/com_banners/tmpl/clients/default.php @@ -71,22 +71,30 @@