-
-
Notifications
You must be signed in to change notification settings - Fork 3.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[5.1] remove deprecated language strings from up-merge #42950 #42953
Merged
+0
−2
Conversation
This file contains 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
added due merge conflict in joomla#42950
I have tested this item ✅ successfully on 0a7a5f3 This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/42953. |
4 tasks
I have tested this item ✅ successfully on 0a7a5f3 This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/42953. |
RTC This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/42953. |
tecpromotion
approved these changes
Mar 5, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks @heelc29
Thank you @heelc29 |
Kostelano
added a commit
to JPathRu/localisation
that referenced
this pull request
Apr 2, 2024
joomla/joomla-cms#42966 - (только для en-GB) joomla/joomla-cms#42953 + joomla/joomla-cms#42986 + joomla/joomla-cms#42221 + joomla/joomla-cms#41659 + joomla/joomla-cms#43061 + joomla/joomla-cms#43054 - (только для en-GB) joomla/joomla-cms#42995 - (только для en-GB) joomla/joomla-cms#43115 + joomla/joomla-cms#43147 + + Upmerge
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary of Changes
remove deprecated language strings - added again due merge conflict in #42950 @LadySolveig @bembelimen
https://github.com/joomla/joomla-cms/pull/42950/files#diff-c958054a01e06914ff9d8d8f3f34f6eafac053a8927e6e3bfb51ceaaa7c39a3e
Now the two strings exist twice
joomla-cms/administrator/language/en-GB/plg_system_privacyconsent.ini
Lines 8 to 9 in d834f81
joomla-cms/administrator/language/en-GB/plg_system_privacyconsent.ini
Lines 32 to 33 in d834f81
Testing Instructions
code review