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

EOS - Plugin Disabling Quick Icon Display and adding correct text definitions #40774

Merged
merged 11 commits into from
Jun 24, 2023

Conversation

mfleeson
Copy link
Contributor

Disabling Quick Icon Display and adding correct text definitions and Joomla 5 links

Pull Request for Issue # .

Summary of Changes

Changed announcement texts to approved wording
Changed links to Joomla 5
Commented out QuickIcon display code

Testing Instructions

Edit Line 42 'private const EOS_DATE = '2025-10-17'; and change 2025 to 2023

Actual result BEFORE applying this Pull Request

As well as the banner appearing a quickicon in the box near Joomla Update would appear

Expected result AFTER applying this Pull Request

The quickicon no longer appears

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

…Joomla 5 links

Disabling Quick Icon Display and adding correct text definitions and Joomla 5 links
@joomla-cms-bot joomla-cms-bot added Language Change This is for Translators PR-4.4-dev labels Jun 15, 2023
Copy link
Contributor

@zero-24 zero-24 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi please add back the Special:MyLanguage to the docs URLs. This allows docs.joomla.org to redirect to an translated page when that is avaible.

@mfleeson mfleeson requested a review from zero-24 June 15, 2023 11:23
@mfleeson mfleeson self-assigned this Jun 15, 2023
@zero-24
Copy link
Contributor

zero-24 commented Jun 15, 2023

Thanks

…ting

Changing language definitions to use Joomla!
Removing commented out code
Fixing indent.
Based on doc rules:
Rule: No Bang!
References to Joomla in language strings should not include the exclamation point unless it is at the end of a sentence that is intended to be exclamatory.
@laoneo laoneo assigned MacJoom and unassigned mfleeson Jun 16, 2023
@laoneo laoneo added this to the Joomla! 4.4.0 milestone Jun 19, 2023
@sandewt
Copy link
Contributor

sandewt commented Jun 20, 2023

Why this icon twice? That makes it messy.

issue-40774

@brianteeman
Copy link
Contributor

Why this icon twice? That makes it messy.

Because the code is wrong :)

…icon-new-tab

Not sure how but language definitions wound back. Here's the correct versions from my test server.
Also removed the extra fields that are now not needed as displaying a quickicon is no longer in the functionality requirements.
Removing unnecessary language definitions
Removing unneeded code
@sandewt
Copy link
Contributor

sandewt commented Jun 22, 2023

Disabling Quick Icon Display ...

You removed the quickicon functionality. The plugin is still called <name>plg_quickicon_eos</name> and group="quickicon"

The naming of this plugin no longer corresponds to what the plugin shows. Is the naming still correct? Is there possibly a better alternative?

@laoneo
Copy link
Member

laoneo commented Jun 22, 2023

This plugin works now in a similar way as the php EOS plugin. So for now it is ok to have it in the quickicon group. On some point we need to move it to a new group.

@webgras
Copy link
Contributor

webgras commented Jun 23, 2023

I have tested this item ✅ successfully on fda8a6c

Banner works fine, tested all the dates.


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

@MacJoom
Copy link
Contributor

MacJoom commented Jun 23, 2023

@zero-24 is the change OK?

@bayareajenn
Copy link

Hi! Thanks for your work!
I've got a few things:

1. in eos.php:
line 217, 231, 245: link should be https://docs.joomla.org/Special:MyLanguage/Joomla_4.4.x_to_5.x_Planning_and_Upgrade_Step_by_Step
line 273: link should go to https://joomla.org/5
Will you please fix those links?

2. in the language strings:
line 10 PLG_QUICKICON_EOS_MESSAGE_ERROR_SUPPORT_ENDED="

Support has ended for your version of Joomla. <a href="%2$s" target="_blank" rel="noopener noreferrer">Migrate to the next version as soon as possible.

"
Will you please change the word "migrate" to "upgrade"?

line 14 PLG_QUICKICON_EOS_MESSAGE_INFO_02="

When is the time to migrate to the next version? Once the extensions your site needs are compatible. Learn <a href="%2$s" target="_blank" rel="noopener noreferrer">how to use the Pre-Update Checker.

"
Will you please change the word "migrate" to "upgrade"?

line 16 PLG_QUICKICON_EOS_MESSAGE_WARNING_SECURITY_ONLY="

This version of Joomla has entered security only mode. Support ends %1$s. Start <a href="%2$s" target="_blank" rel="noopener noreferrer">planning to migrate to the next version of Joomla today.

"
Will you please change the word "migrate to "upgrade"?

line 18 PLG_QUICKICON_EOS_MESSAGE_WARNING_SUPPORT_ENDING="

Support ends on %1$s for this version of Joomla. <a href="%2$s" target="_blank" rel="noopener noreferrer">Migrate to the latest version of Joomla as soon as possible.

"
Will you please change the word "Migrate" to "Upgrade"?

Ok, I think that's it :) Thank YOU!!

@sandewt
Copy link
Contributor

sandewt commented Jun 23, 2023

@bayareajenn It is more effective to click on the relevant line in the code and add the suggestion.

issue_4074

@bayareajenn
Copy link

@bayareajenn It is more effective to click on the relevant line in the code and add the suggestion.

issue_4074

Yes, I'm sure it is. Sadly, I don't know how. I don't really know how to use github. I was in the code in the site. I didn't even think of going to the code in the PR. I'm not a developer. I apologise. The formatting went to poo even worse once I commented.

@sandewt
Copy link
Contributor

sandewt commented Jun 23, 2023

Yes, I'm sure it is. Sadly, I don't know how. I don't really know how to use github......

Very understandable.

Click on the link, as indicated below with the red arrow at the top of this page.
You will then arrive at the relevant files.
And follow the instructions I indicated above.

issue_4074-2

issue_4074-3

[EDIT]

@bayareajenn
Copy link

Yes, I'm sure it is. Sadly, I don't know how. I don't really know how to use github......

Very understandable.

Click on the link, as indicated below with the red arrow at the top of this page. You will then arrive at the relevant files. And follow the instructions I indicated above.

issue_4074-2

Yes, I kinda got it and started adding them. Then realised that the nightly I was working off of is different from the files in here. So now I'm just thoroughly confused. I'm now unsure of what is correct and what isn't. So I'll sleep on it and work with the team. Thank you for teaching me @sandewt. I will get better over time.

@mfleeson
Copy link
Contributor Author

Hi Everyone. The version Jenn downloaded was the previous version before this PR. I have checked and these files are the correct ones with the correct language definitions and links.

@MacJoom MacJoom dismissed zero-24’s stale review June 24, 2023 09:38

Changes were done

@MacJoom MacJoom enabled auto-merge (squash) June 24, 2023 09:39
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.

None yet

9 participants