[4.0] Language Keys may have a : in it. #35659
Merged
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
|
I have tested this item ✅ successfully on a8a13ae This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/35659. |
1 similar comment
|
I have tested this item ✅ successfully on a8a13ae This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/35659. |
|
RTC This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/35659. |
joomla-cms-bot
added
PR-4.0-dev
and removed
RTC
|
Thx |
brianteeman
pushed a commit
to brianteeman/joomla-cms
that referenced
this pull request
Oct 3, 2021
dgrammatiko
pushed a commit
to dgrammatiko/joomla-cms
that referenced
this pull request
Oct 3, 2021
ditsuke
pushed a commit
to ditsuke/joomla-cms
that referenced
this pull request
Oct 4, 2021
bembelimen
added a commit
that referenced
this pull request
Nov 21, 2021
* Add sensible inline help to Global Configuration * Button to show/hide inline help Example in backend com_config * Add back the error handling * Show how this can be done in the frontend, too * Update build/media_source/system/js/inlinehelp.es6.js Co-authored-by: Brian Teeman <brian@teeman.net> * Update build/media_source/system/js/inlinehelp.es6.js Co-authored-by: Dimitris Grammatikogiannis <dg@dgrammatiko.dev> * Address inconsistency of control and description DIV id's The controls have IDs like `jform_example`. The description DIVs had IDs like `jform[example]-desc`. This is horribly inconsistent and a pain to work with. Converted the description DIV IDs to the more consistent form `jform_example-desc`. * Toggle the aria-describedby attribute to follow the visibility of the description * Use simpler English * Make this into a proper BUTTON element and end–align it * Update administrator/language/en-GB/joomla.ini Co-authored-by: Quy <quy@fluxbb.org> * Update language string * Update language/en-GB/com_config.ini Co-authored-by: Brian Teeman <brian@teeman.net> * Clarify SEF URLs * Apply suggestions from code review DocBlock updates Co-authored-by: Phil E. Taylor <phil@phil-taylor.com> * [4.x] Tinymce updates (#35605) See https://www.tiny.cloud/docs/changelog/ for details This includes 5.9.0, 5.9.1 and 5.9.2 * typo in filename (#35613) * Remove JHELP_ strings for com_config and move the ref_key to the config.xml of the respective component. (#35479) Co-authored-by: Thomas Hunziker <werbemails@bakual.ch> * [4.0] Fix modal data attributes (#35626) * Update main.php * Update Bootstrap.php * [4.0] Remove JHELP_ strings for com_categories (#35534) * Category custom fields marked as 'subform' act as if they are not (#35547) * Subform–only fields cause saving a category to fail. Part I: “Only Use In Subform” doesn't do anything * Subform–only fields cause saving a category to fail. Part II. PlgSystemFields::onContentPrepareForm doesn't actually work for com_categories Close gh-35543 * Subform–only fields cause saving a category to fail. Part II. PlgSystemFields::onContentPrepareForm doesn't actually work for com_categories This should only apply on com_content categories, not third party categories. * Invert the if–block order Co-authored-by: Richard Fath <richard67@users.noreply.github.com> * Subform–only fields cause saving a category to fail. Part II. PlgSystemFields::onContentPrepareForm doesn't actually work for com_categories Okay, it could actually apply for any category, not just com_content. * Docblock Co-authored-by: Richard Fath <richard67@users.noreply.github.com> * [4.0] Replace JHELP_ String with hardcoded ref-key (#35429) * Replace JHELP_ String with hardcoded ref-key * Simplifying helpTOC.php so it doesn't need to reverse lookup the JHELP_ strings. * Remove loading of joomla.ini and messing with language class property * alpha-sort help strings * Next batch * Last batch * Ooops Co-authored-by: Thomas Hunziker <werbemails@bakual.ch> * [4][CloudFlare Issues] Remove validation of the session by IP address (#35509) > IMHO the commend of @arnepluhar in #35509 should also count as a successful test. He did it as a GitHub code review. The rules about what constitutes a valid test should expand to GitHub code reviews; these didn't even exist when the rules were decided upon back in the day and they make FAR MORE SENSE than comments filed on a PR! Github is configured to allow maintainers merge only if all tests are successful. Thanks all. * Language Keys may have a : in it. (#35659) * Button to show/hide inline help Example in backend com_config * Whoops, wrong merge option * Lang string change * Apply language string suggestion * Remove empty line on language file, * Add sensible inline help to Global Configuration * Button to show/hide inline help Example in backend com_config * Add back the error handling * Show how this can be done in the frontend, too * Update build/media_source/system/js/inlinehelp.es6.js Co-authored-by: Brian Teeman <brian@teeman.net> * Update build/media_source/system/js/inlinehelp.es6.js Co-authored-by: Dimitris Grammatikogiannis <dg@dgrammatiko.dev> * Address inconsistency of control and description DIV id's The controls have IDs like `jform_example`. The description DIVs had IDs like `jform[example]-desc`. This is horribly inconsistent and a pain to work with. Converted the description DIV IDs to the more consistent form `jform_example-desc`. * Toggle the aria-describedby attribute to follow the visibility of the description * Use simpler English * Make this into a proper BUTTON element and end–align it * Update administrator/language/en-GB/joomla.ini Co-authored-by: Quy <quy@fluxbb.org> * Update language string * Update language/en-GB/com_config.ini Co-authored-by: Brian Teeman <brian@teeman.net> * Clarify SEF URLs * Apply suggestions from code review DocBlock updates Co-authored-by: Phil E. Taylor <phil@phil-taylor.com> * Button to show/hide inline help Example in backend com_config * Whoops, wrong merge option * Lang string change * Apply language string suggestion * Remove empty line on language file, Co-authored-by: Brian Teeman <brian@teeman.net> Co-authored-by: Dimitris Grammatikogiannis <dg@dgrammatiko.dev> Co-authored-by: Quy <quy@fluxbb.org> Co-authored-by: Phil E. Taylor <phil@phil-taylor.com> Co-authored-by: Stefan Wendhausen <stefan.wendhausen@tec-promotion.de> Co-authored-by: Thomas Hunziker <github@bakual.ch> Co-authored-by: Thomas Hunziker <werbemails@bakual.ch> Co-authored-by: Richard Fath <richard67@users.noreply.github.com> Co-authored-by: Benjamin Trenkle <bembelimen@users.noreply.github.com>
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.
Since the merge of my PR #35429, the help view now shows errors in the language strings in com_admin.ini if language debug is enabled.
Summary of Changes
Adjusting the error check so the
:in the language key now pass the check.Testing Instructions
Actual result BEFORE applying this Pull Request
Some 60+ errors are shown
Expected result AFTER applying this Pull Request
No error is shown
Documentation Changes Required
None