[4.1] Upmerges 2022-03-27 #37385
Merged
[4.1] Upmerges 2022-03-27 #37385
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* [Fix] Chosen select has issues in RTL languages * Apply suggestions from code review Co-authored-by: Allon Moritz <allon.moritz@digital-peak.com> Co-authored-by: Allon Moritz <allon.moritz@digital-peak.com> Co-authored-by: Tobias Zulauf <zero-24@users.noreply.github.com>
update all german language installation ini’s
* Fix wrong update SQL file names * Delete wrong files when updating from 3.10.7-rc1 Co-authored-by: Tobias Zulauf <zero-24@users.noreply.github.com>
# Conflicts: # media/jui/css/chosen.css
# Conflicts: # administrator/language/en-GB/en-GB.xml # administrator/language/en-GB/install.xml # administrator/manifests/files/joomla.xml # administrator/manifests/packages/pkg_en-GB.xml # installation/language/en-GB/en-GB.xml # language/en-GB/en-GB.xml # language/en-GB/install.xml # libraries/src/Version.php
# Conflicts: # administrator/manifests/files/joomla.xml # libraries/src/Version.php
# Conflicts: # installation/language/pl-PL/pl-PL.ini # installation/language/pl-PL/pl-PL.xml
# Conflicts: # installation/language/de-AT/de-AT.ini # installation/language/de-AT/de-AT.xml # installation/language/de-CH/de-CH.ini # installation/language/de-CH/de-CH.xml # installation/language/de-DE/de-DE.ini # installation/language/de-DE/de-DE.xml # installation/language/de-LI/de-LI.ini # installation/language/de-LI/de-LI.xml # installation/language/de-LU/de-LU.ini # installation/language/de-LU/de-LU.xml
# Conflicts: # administrator/components/com_admin/script.php # administrator/components/com_admin/sql/updates/postgresql/3.10.7-2022-02-20.sql # administrator/components/com_admin/sql/updates/postgresql/3.10.7-2022-02-20.sql.sql # administrator/components/com_admin/sql/updates/postgresql/4.1.1-2022-02-20.sql # administrator/components/com_admin/sql/updates/sqlazure/3.10.7-2022-02-20.sql
Kostelano
added a commit
to JPathRu/localisation
that referenced
this pull request
Oct 25, 2022
joomla/joomla-cms#37385 - (только для pl-PL) joomla/joomla-cms#38825 + joomla/joomla-cms#38877 - (только для других языков) joomla/joomla-cms#38867 + joomla/joomla-cms#37017 + joomla/joomla-cms#38771 + joomla/joomla-cms#38761 + joomla/joomla-cms#39072 - (только для en-GB) + исправление различных формулировок
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull Request for Issue # .
Summary of Changes
Testing Instructions
Actual result BEFORE applying this Pull Request
Expected result AFTER applying this Pull Request
Documentation Changes Required