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

Improve Update Message, remember Users to make a backup #23229

Merged
merged 5 commits into from Dec 12, 2018

Conversation

chmst
Copy link
Contributor

@chmst chmst commented Dec 4, 2018

Pull Request for Issue #23225 .

Summary of Changes

Improve messages. Remember users to make backup before Updating

updatemessage

Documentation Changes Required

no

@joomla-cms-bot joomla-cms-bot added Language Change This is for Translators PR-staging labels Dec 4, 2018
@brianteeman
Copy link
Contributor

i would encourage people to always take a backup before updating - not just if they are unsure about extensions

@chmst
Copy link
Contributor Author

chmst commented Dec 4, 2018

You are strongly advised to make a backup of your installation before you start updating

Sounds somehow harsh. Maybe better

Please remember to make ...

@brianteeman What do you think?

@mbabker
Copy link
Contributor

mbabker commented Dec 4, 2018

It's not harsh, it's a best practice of software management in general. Any time you make a major change to the software platform, you should make a backup so if something goes wrong you can quickly get yourself going again. This applies to everything; CMS', databases, web server software, programming language binaries (PHP, Node, etc.), operating systems, you name it.

@infograf768
Copy link
Member

Also, why not change it to a Warning instead of a simple Notice?
screen shot 2018-12-05 at 08 14 32

@HRIT-Florian
Copy link
Contributor

I have tested this item ✅ successfully on a756648


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

1 similar comment
@ReLater
Copy link
Contributor

ReLater commented Dec 6, 2018

I have tested this item ✅ successfully on a756648


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

@Quy
Copy link
Contributor

Quy commented Dec 6, 2018

RTC


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

@joomla-cms-bot joomla-cms-bot added the RTC This Pull Request is Ready To Commit label Dec 6, 2018
@@ -177,7 +177,7 @@ COM_INSTALLER_MSG_WARNINGS_SMALLPOSTSIZE="Small PHP maximum POST size."
COM_INSTALLER_MSG_WARNINGS_SMALLPOSTSIZEDESC="The maximum POST size sets the most amount of data that can be sent via POST to the server. This includes form submissions for articles, media (images, videos) and packages. This value is less than 8MB which may impact on uploading large packages. This is set in the php.ini under post_max_size."
COM_INSTALLER_MSG_WARNINGS_SMALLUPLOADSIZE="Maximum PHP file upload size is too small: This is set in php.ini in both upload_max_filesize and post_max_size settings of your PHP settings (located in php.ini and/or .htaccess file)."
COM_INSTALLER_MSG_WARNINGS_SMALLUPLOADSIZEDESC="The maximum file size for uploads is set to less than 8MB which may impact on uploading large packages."
COM_INSTALLER_MSG_WARNINGS_UPDATE_NOTICE="Before updating ensure that the update is compatible with your Joomla! installation."
COM_INSTALLER_MSG_WARNINGS_UPDATE_WARNING="Before updating ensure that the update is compatible with your Joomla! installation. <br>You are strongly advised to make a <strong>backup</strong> of your installation before you start updating."
Copy link
Contributor

Choose a reason for hiding this comment

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

The language key names can't be changed (B/C thing), this needs to be changed back

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Change reverted; Not quite consistent now as the _NOTICE now is displayed as a warning. Maybe a hint for forming Language Keys in the future.

Copy link
Contributor

Choose a reason for hiding this comment

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

You need to fix the other files too.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Which files? you want to have reverted all changes except the language string?

Copy link
Contributor

Choose a reason for hiding this comment

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

Right. The language key in both files should be back to having _NOTICE suffixes, then the two PHP files you updated should go back to having _NOTICE instead of _WARNING.

Copy link
Member

Choose a reason for hiding this comment

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

@chmst
This is what we need:

Diff:

diff --git a/administrator/components/com_installer/views/update/view.html.php b/administrator/components/com_installer/views/update/view.html.php
index d5ee00be10ab..6cc57f863922 100644
--- a/administrator/components/com_installer/views/update/view.html.php
+++ b/administrator/components/com_installer/views/update/view.html.php
@@ -64,7 +64,7 @@ public function display($tpl = null)
 
 		if (count($this->items) > 0)
 		{
-			JFactory::getApplication()->enqueueMessage(JText::_('COM_INSTALLER_MSG_WARNINGS_UPDATE_NOTICE'), 'notice');
+			JFactory::getApplication()->enqueueMessage(JText::_('COM_INSTALLER_MSG_WARNINGS_UPDATE_NOTICE'), 'warning');
 		}
 
 		parent::display($tpl);
diff --git a/administrator/components/com_joomlaupdate/views/default/view.html.php b/administrator/components/com_joomlaupdate/views/default/view.html.php
index bf818032ed2b..19566fa45193 100644
--- a/administrator/components/com_joomlaupdate/views/default/view.html.php
+++ b/administrator/components/com_joomlaupdate/views/default/view.html.php
@@ -88,7 +88,7 @@ public function display($tpl = null)
 		if (!is_null($this->updateInfo['object']))
 		{
 			// Show the message if an update is found.
-			JFactory::getApplication()->enqueueMessage(JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_UPDATE_NOTICE'), 'notice');
+			JFactory::getApplication()->enqueueMessage(JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_UPDATE_NOTICE'), 'warning');
 		}
 
 		$this->ftpFieldsDisplay = $this->ftp['enabled'] ? '' : 'style = "display: none"';
diff --git a/administrator/language/en-GB/en-GB.com_installer.ini b/administrator/language/en-GB/en-GB.com_installer.ini
index 57855ee63434..543ee5017abc 100644
--- a/administrator/language/en-GB/en-GB.com_installer.ini
+++ b/administrator/language/en-GB/en-GB.com_installer.ini
@@ -177,7 +177,7 @@ COM_INSTALLER_MSG_WARNINGS_SMALLPOSTSIZE="Small PHP maximum POST size."
 COM_INSTALLER_MSG_WARNINGS_SMALLPOSTSIZEDESC="The maximum POST size sets the most amount of data that can be sent via POST to the server. This includes form submissions for articles, media (images, videos) and packages. This value is less than 8MB which may impact on uploading large packages. This is set in the php.ini under post_max_size."
 COM_INSTALLER_MSG_WARNINGS_SMALLUPLOADSIZE="Maximum PHP file upload size is too small: This is set in php.ini in both upload_max_filesize and post_max_size settings of your PHP settings (located in php.ini and/or .htaccess file)."
 COM_INSTALLER_MSG_WARNINGS_SMALLUPLOADSIZEDESC="The maximum file size for uploads is set to less than 8MB which may impact on uploading large packages."
-COM_INSTALLER_MSG_WARNINGS_UPDATE_NOTICE="Before updating ensure that the update is compatible with your Joomla! installation."
+COM_INSTALLER_MSG_WARNINGS_UPDATE_NOTICE="Before updating ensure that the update is compatible with your Joomla! installation. <br>You are strongly advised to make a <strong>backup</strong> of your installation before you start updating."
 COM_INSTALLER_MSG_WARNINGS_UPLOADBIGGERTHANPOST="PHP Upload Size bigger than POST size."
 COM_INSTALLER_MSG_WARNINGS_UPLOADBIGGERTHANPOSTDESC="The value of the upload_max_filesize in the php.ini file is greater than the post_max_size variable. The post_max_size variable will take precedence and block requests larger than it. This is generally a server misconfiguration when trying to increase upload sizes. Please increase the upload_max_filesize to at least match the post_max_size variable or vice versa."
 COM_INSTALLER_N_EXTENSIONS_PUBLISHED="%d extensions enabled."
diff --git a/administrator/language/en-GB/en-GB.com_joomlaupdate.ini b/administrator/language/en-GB/en-GB.com_joomlaupdate.ini
index fe42f2da9cb0..724ce9ad1ae2 100644
--- a/administrator/language/en-GB/en-GB.com_joomlaupdate.ini
+++ b/administrator/language/en-GB/en-GB.com_joomlaupdate.ini
@@ -58,7 +58,7 @@ COM_JOOMLAUPDATE_VIEW_DEFAULT_PACKAGE="Update package URL"
 COM_JOOMLAUPDATE_VIEW_DEFAULT_PACKAGE_REINSTALL="Reinstall package URL"
 COM_JOOMLAUPDATE_VIEW_DEFAULT_TAB_ONLINE="Live Update"
 COM_JOOMLAUPDATE_VIEW_DEFAULT_TAB_UPLOAD="Upload & Update"
-COM_JOOMLAUPDATE_VIEW_DEFAULT_UPDATE_NOTICE="Before you update Joomla, ensure that the installed extensions are available for the new Joomla version."
+COM_JOOMLAUPDATE_VIEW_DEFAULT_UPDATE_NOTICE="Before you update Joomla, ensure that the installed extensions are available for the new Joomla version. <br>You are strongly advised to make a <strong>backup</strong> of your installation before you start updating."
 COM_JOOMLAUPDATE_VIEW_DEFAULT_UPDATEFOUND="A Joomla update was found."
 COM_JOOMLAUPDATE_VIEW_DEFAULT_UPDATES_INFO_CUSTOM="You are on the &quot;%s&quot; update channel. This is not an official Joomla update channel."
 COM_JOOMLAUPDATE_VIEW_DEFAULT_UPDATES_INFO_DEFAULT="You are on the &quot;%s&quot; update channel. Through this channel you'll receive notifications for all updates of the current Joomla release (3.x)"

@infograf768 infograf768 removed the RTC This Pull Request is Ready To Commit label Dec 7, 2018
@infograf768
Copy link
Member

Back to pending.


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

@ReLater
Copy link
Contributor

ReLater commented Dec 8, 2018

I have tested this item ✅ successfully on 0e01ac1


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

1 similar comment
@infograf768
Copy link
Member

I have tested this item ✅ successfully on 0e01ac1


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

@infograf768
Copy link
Member

rtc


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

@joomla-cms-bot joomla-cms-bot added the RTC This Pull Request is Ready To Commit label Dec 8, 2018
@mbabker mbabker added this to the Joomla 3.9.2 milestone Dec 12, 2018
@mbabker mbabker merged commit da09268 into joomla:staging Dec 12, 2018
@joomla-cms-bot joomla-cms-bot removed the RTC This Pull Request is Ready To Commit label Dec 12, 2018
@chmst chmst deleted the enhance-update-message branch August 24, 2019 13:20
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants