Skip to content
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

[4.4] Joomlaupdate remove br tag from language strings - follow up to PR 42489 #42550

Merged

Conversation

richard67
Copy link
Member

Pull Request for Issue #42489 (follow-up).

Summary of Changes

With my PR #42489 which just has been merged I have added information about not fulfilled PHP and database requirements to the "No updates" view of the Joomla Update component in case if an update has been found but the environment doesn't fulfil the mentioned requirements for that update.

I've done it like I've seen it elsewhere with a <br> tag in language strings to get all text better readable.

But as mentioned by @brianteeman in that PR, html tags should be avoided in language strings.

This PR here now changes that by removing the <br> tag from the new language strings added with PR #42489 as well as from the previously existing language string which had been added with PR #42103 once and then modified with my mentioned PR, and it changes the PHP code to prepare the content so that it adds these <br> tags.

Testing Instructions

Same as for PR #42489 , except that this time the actual and the expected result is the same, i.e. there should not be any visual difference without and with the PR applied, the <br> tags are still where they should be.

Or just do a code review and make sure that the language strings modified with this PR here are only used by the PHP code modified with this PR here and nowhere else, and that the result regarding the <br> tags will be the same as before.

Actual result BEFORE applying this Pull Request

When the PHP version requirement is not met, an additional sentence shows that, telling the current and the required version.

When the database version requirement is not met, an additional sentence shows that, telling the database type and the current and required versions.

Sentences are separated by <br> tags.

Expected result AFTER applying this Pull Request

Same as actual, no change. But now the <br> tags are added in PHP and are not at the end of language strings.

Link to documentations

Please select:

  • Documentation link for docs.joomla.org:

  • No documentation changes for docs.joomla.org needed

  • Pull Request link for manual.joomla.org:

  • No documentation changes for manual.joomla.org needed

richard67 and others added 3 commits December 20, 2023 10:56
Co-authored-by: Brian Teeman <brian@teeman.net>
Co-authored-by: Brian Teeman <brian@teeman.net>
@brianteeman
Copy link
Contributor

LGTM by codereview

@richard67
Copy link
Member Author

LGTM by codereview

@brianteeman Could you mark a test result in the issue tracker?

@brianteeman
Copy link
Contributor

I have tested this item ✅ successfully on f38a0b5


This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/42550.

@dautrich
Copy link

dautrich commented Dec 20, 2023

I have tested this item ✅ successfully on f38a0b5

I have done a code review. The br-tags have been removed from the language strings and inserted in the PHP code.


This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/42550.

@richard67
Copy link
Member Author

Thanks all for testing/reviews.

@richard67
Copy link
Member Author

RTC


This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/42550.

@joomla-cms-bot joomla-cms-bot added the RTC This Pull Request is Ready To Commit label Dec 20, 2023
@richard67 richard67 added this to the Joomla! 4.4.2 milestone Dec 20, 2023
@laoneo laoneo merged commit 3265efa into joomla:4.4-dev Dec 20, 2023
3 checks passed
@laoneo
Copy link
Member

laoneo commented Dec 20, 2023

Thanks!

@joomla-cms-bot joomla-cms-bot removed the RTC This Pull Request is Ready To Commit label Dec 20, 2023
@richard67 richard67 deleted the 4.4-dev-joomlaupdate-not-matching-updates-2 branch December 20, 2023 15:53
Razzo1987 added a commit that referenced this pull request Jan 4, 2024
* Fix link and button colors in header footer (#42504)

* [4.x] add php 8.3 to tests (#42545)

* Update the signature for #42545 (#42552)

* [4.4] Joomlaupdate remove br tag from language strings - follow up to PR 42489 (#42550)

* Better English (1)

* Better English (2)

* Remove br html element from language strings

* Fixes to form validation process (#42560)

Fixes hardening measure introduced in #23716

* [4][com_actionlogs] missed load plugin languages (#42562)

* load lang

* test-4-dupkey

* Better message on package uninstallation (#42570)

* Better message on package uninstallation when an extension from that package is missing. Fixes issue #42537 .

* backport #41865 (#42088)

* backport [5] update from nightly to latest nightly build #41865

* [5] harmonize naming task types (#42574)

* [5.0] colour contrast in media manager file list [a11y] (#42544)

* [5.0] Update phpseclib to 3.0.34 (#42469)

* Fix `function` parameter lost during redirect (#42315)

* Fix `function` parameter lost during redirect

* Move function parameter to form url

* Remove hidden input

* [4.4] Fix SQL error "1104 The SELECT would examine more than MAX_JOIN_SIZE rows" when checking for core updates (#42576)

* Use concat of columns for getting core extensions

* Fix PHPCS

* Remove wrong quotes

* Revert min version in drone (#42583)

* Joomla! 5.0.2 Release Candidate 1

* Revert to dev

* [4][com_templates] cast to int for pgsql (#42569)

* cast to int for pgsql

* yet-another

* patch article tags (#42486)

* Joomla 5.0.2 Release Candidate 2

* Reset to dev

* Update signature HMAC in .drone.yml

---------

Co-authored-by: Rick Spaan <rick@r2h.nl>
Co-authored-by: Christian Heel <66922325+heelc29@users.noreply.github.com>
Co-authored-by: Allon Moritz <allon.moritz@digital-peak.com>
Co-authored-by: Richard Fath <richard67@users.noreply.github.com>
Co-authored-by: Brian Teeman <brian@teeman.net>
Co-authored-by: George Wilson <georgejameswilson@googlemail.com>
Co-authored-by: Nicola Galgano <optimus4joomla@gmail.com>
Co-authored-by: Benjamin Trenkle <benjamin.trenkle@wicked-software.de>
Co-authored-by: Benjamin Trenkle <bembelimen@users.noreply.github.com>
Co-authored-by: David Jardin <d.jardin@djumla.de>
Co-authored-by: janschoenherr <jan@yootheme.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Language Change This is for Translators PR-4.4-dev
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants