Updated the language constants and RTL issue

joomla · Jul 1, 2017 · dcd5da9 · dcd5da9
1 parent f8485f2
commit dcd5da9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/administrator/components/com_redirect/views/links/view.html.php b/administrator/components/com_redirect/views/links/view.html.php
@@ -64,7 +64,7 @@ public function display($tpl = null)
 		// Show messages about the enabled plugin and if the plugin should collect URLs
 		if ($this->enabled && $this->collect_urls_enabled)
 		{
-			$app->enqueueMessage(JText::_('COM_REDIRECT_PLUGIN_ENABLED') . ' ' . JText::_('COM_REDIRECT_COLLECT_URLS_ENABLED'), 'notice');
+			$app->enqueueMessage(JText::sprintf('COM_REDIRECT_COLLECT_URLS_ENABLED', JText::_('COM_REDIRECT_PLUGIN_ENABLED')), 'notice');
 		}
 		else
 		{
@@ -79,11 +79,11 @@ public function display($tpl = null)
 
 			if ($this->enabled && !$this->collect_urls_enabled)
 			{
-				$app->enqueueMessage(JText::_('COM_REDIRECT_PLUGIN_ENABLED') . ' ' . JText::sprintf('COM_REDIRECT_COLLECT_URLS_DISABLED', $link), 'notice');
+				$app->enqueueMessage(JText::sprintf('COM_REDIRECT_COLLECT_MODAL_URLS_DISABLED', JText::_('COM_REDIRECT_PLUGIN_ENABLED'), $link), 'notice');
 			}
 			else
 			{
-				$app->enqueueMessage(JText::sprintf('COM_REDIRECT_PLUGIN_DISABLED', $link), 'error');
+				$app->enqueueMessage(JText::sprintf('COM_REDIRECT_PLUGIN_MODAL_DISABLED', $link), 'error');
 			}
 		}
 

diff --git a/administrator/language/en-GB/en-GB.com_redirect.ini b/administrator/language/en-GB/en-GB.com_redirect.ini
@@ -10,8 +10,10 @@ COM_REDIRECT_BATCH_TIP="Enter expired URL (mandatory) with a new URL (optional)
 COM_REDIRECT_BUTTON_UPDATE_LINKS="Update Links"
 COM_REDIRECT_CLEAR_FAIL="Failed to delete unpublished links."
 COM_REDIRECT_CLEAR_SUCCESS="All unpublished links have been deleted."
-COM_REDIRECT_COLLECT_URLS_ENABLED="The option 'Collect URLs' is enabled."
-COM_REDIRECT_COLLECT_URLS_DISABLED="The 'Collect URLs' option in the %s is disabled. Error page URLs will not be collected by this component."
+COM_REDIRECT_COLLECT_MODAL_URLS_DISABLED="%1$s The 'Collect URLs' option in the %2$s is disabled. Error page URLs will not be collected by this component."
+COM_REDIRECT_COLLECT_URLS_ENABLED="%1$s The option 'Collect URLs' is enabled."
+; The following string is deprecated and will be removed with 4.0.
+COM_REDIRECT_COLLECT_URLS_DISABLED="The 'Collect URLs' option in the <a href="_QQ_"%s"_QQ_">Redirect System Plugin</a> is disabled. Error page URLs will not be collected by this component."
 COM_REDIRECT_CONFIGURATION="Redirect: Options"
 COM_REDIRECT_DISABLE_LINK="Disable Link"
 COM_REDIRECT_EDIT_LINK="Edit Link #%d"
@@ -80,8 +82,10 @@ COM_REDIRECT_N_LINKS_UPDATED_1="1 link has been updated."
 COM_REDIRECT_NEW_LINK="New Link"
 COM_REDIRECT_NO_ITEM_ADDED="No links added."
 COM_REDIRECT_NO_ITEM_SELECTED="No links selected."
-COM_REDIRECT_PLUGIN_DISABLED="The %s is disabled. It needs to be enabled for this component to work."
+; The following string is deprecated and will be removed with 4.0.
+COM_REDIRECT_PLUGIN_DISABLED="The <a href="_QQ_"%s"_QQ_">Redirect System Plugin</a> is disabled. It needs to be enabled for this component to work."
 COM_REDIRECT_PLUGIN_ENABLED="The Redirect Plugin is enabled."
+COM_REDIRECT_PLUGIN_MODAL_DISABLED="The %s is disabled. It needs to be enabled for this component to work."
 COM_REDIRECT_REDIRECTED_ON="Redirected on: %s."
 COM_REDIRECT_SAVE_SUCCESS="Link saved."
 COM_REDIRECT_SEARCH_LINKS="Search in link fields."