Skip to content
Merged
Show file tree
Hide file tree
Changes from 21 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ Ready to install Joomla?
* Check the [minimum requirements](https://www.joomla.org/about-joomla/technical-requirements.html).
* How do you [install Joomla](https://docs.joomla.org/J3.x:Installing_Joomla)?
* You could start your Joomla! experience by [building your site on a local test server](https://docs.joomla.org/Installing_Joomla_locally).
When ready, it can be moved to an on-line hosting account of your choice.
When ready, it can be moved to an online hosting account of your choice.

Updates are free!
---------------------
Expand Down
2 changes: 1 addition & 1 deletion README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
* Check the minimum requirements here: https://www.joomla.org/about-joomla/technical-requirements.html
* How do you install Joomla - hhttps://docs.joomla.org/J3.x:Installing_Joomla
* You could start your Joomla! experience building your site on a local test server.
When ready it can be moved to an on-line hosting account of your choice.
When ready it can be moved to an online hosting account of your choice.
See the tutorial: https://docs.joomla.org/Installing_Joomla_locally

9- Updates are free!
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ public static function loadLanguageFiles($typeAlias)
$lang->load($component, JPATH_ADMINISTRATOR, null, false, true)
|| $lang->load($component, JPath::clean(JPATH_ADMINISTRATOR . '/components/' . $component), null, false, true);

// Force loading of back-end global language file
// Force loading of backend global language file
$lang->load('joomla', JPath::clean(JPATH_ADMINISTRATOR), null, false, true);
}
}
Expand Down
6 changes: 3 additions & 3 deletions administrator/components/com_finder/helpers/language.php
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public static function loadComponentLanguage()
}

/**
* Method to load Smart Search plug-in language files.
* Method to load Smart Search plugin language files.
*
* @return void
*
Expand All @@ -113,7 +113,7 @@ public static function loadPluginLanguage()

$loaded = true;

// Get array of all the enabled Smart Search plug-in names.
// Get array of all the enabled Smart Search plugin names.
$db = JFactory::getDbo();
$query = $db->getQuery(true)
->select('name')
Expand All @@ -133,7 +133,7 @@ public static function loadPluginLanguage()
$lang = JFactory::getLanguage();
$lang->load('plg_content_finder', JPATH_ADMINISTRATOR);

// Load language file for each plug-in.
// Load language file for each plugin.
foreach ($plugins as $plugin)
{
$lang->load($plugin->name, JPATH_ADMINISTRATOR);
Expand Down
4 changes: 2 additions & 2 deletions administrator/components/com_finder/models/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -240,9 +240,9 @@ protected function getListQuery()
}

/**
* Method to get the state of the Smart Search plug-ins.
* Method to get the state of the Smart Search Plugins.
*
* @return array Array of relevant plug-ins and whether they are enabled or not.
* @return array Array of relevant Plugins and whether they are enabled or not.
Copy link
Contributor

Choose a reason for hiding this comment

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

why the uppercase here?

*
* @since 2.5
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class FinderViewIndex extends JViewLegacy
*/
public function display($tpl = null)
{
// Load plug-in language files.
// Load plugin language files.
FinderHelperLanguage::loadPluginLanguage();

$this->items = $this->get('Items');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ class FinderViewMaps extends JViewLegacy
*/
public function display($tpl = null)
{
// Load plug-in language files.
// Load plugin language files.
FinderHelperLanguage::loadPluginLanguage();

// Load the view data.
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_installer/models/install.php
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ public function install()
}
else
{
// Package installed sucessfully.
// Package installed successfully.
$msg = JText::sprintf('COM_INSTALLER_INSTALL_SUCCESS', JText::_('COM_INSTALLER_TYPE_TYPE_' . strtoupper($package['type'])));
$result = true;
$msgType = 'message';
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_installer/models/manage.php
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ public function remove($eid = array())
continue;
}

// Package uninstalled sucessfully
// Package uninstalled successfully
$msgs[] = JText::sprintf('COM_INSTALLER_UNINSTALL_SUCCESS', $rowtype);
$result = true;

Expand Down
4 changes: 2 additions & 2 deletions administrator/components/com_joomlaupdate/restore.php
Original file line number Diff line number Diff line change
Expand Up @@ -6205,8 +6205,8 @@ class AKText extends AKAbstractObject
'RESTACLEANUP' => 'Restoration and Clean Up',
'BTN_RUNINSTALLER' => 'Run the Installer',
'BTN_CLEANUP' => 'Clean Up',
'BTN_SITEFE' => 'Visit your site\'s front-end',
'BTN_SITEBE' => 'Visit your site\'s back-end',
'BTN_SITEFE' => 'Visit your site\'s frontend',
'BTN_SITEBE' => 'Visit your site\'s backend',
'WARNINGS' => 'Extraction Warnings',
'ERROR_OCCURED' => 'An error occurred',
'STEALTH_MODE' => 'Stealth mode',
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_media/models/manager.php
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public function getFolderList($base = null)

$author = $input->get('author', 0, 'integer');

// Create the drop-down folder select list
// Create the dropdown folder select list
$attribs = 'size="1" onchange="ImageManager.setFolder(this.options[this.selectedIndex].value, ' . $asset . ', ' . $author . ')" ';
$list = JHtml::_('select.genericlist', $options, 'folderlist', $attribs, 'value', 'text', $base);

Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_menus/controllers/menu.php
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public function save($key = null, $urlVar = null)
return false;
}

// Prevent using 'menu' or 'main' as menutype as this is reserved for back-end menus
// Prevent using 'menu' or 'main' as menutype as this is reserved for backend menus
if (strtolower($data['menutype']) == 'menu' || strtolower($data['menutype']) == 'main')
{
$msg = JText::_('COM_MENUS_ERROR_MENUTYPE');
Expand Down
4 changes: 2 additions & 2 deletions administrator/components/com_postinstall/models/messages.php
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ protected function onProcessList(&$resultArray)
}

/**
* Get the drop-down options for the list of component with post-installation messages
* Get the dropdown options for the list of component with post-installation messages
*
* @since 3.4
*
Expand Down Expand Up @@ -236,7 +236,7 @@ public function getComponentOptions()
* language_extension The extension name which holds the language keys used above.
* For example, com_foobar, mod_something, plg_system_whatever, tpl_mytemplate
*
* language_client_id Should we load the front-end (0) or back-end (1) language keys?
* language_client_id Should we load the frontend (0) or backend (1) language keys?
*
* version_introduced Which was the version of your extension where this message appeared for the first time?
* Example: 3.2.1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
JFormHelper::loadFieldClass('list');

/**
* A drop down containing all valid HTTP 1.1 response codes.
* A dropdown containing all valid HTTP 1.1 response codes.
*
* @package Joomla.Administrator
* @subpackage com_redirect
Expand Down
2 changes: 1 addition & 1 deletion administrator/includes/toolbar.php
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ public static function link($url, $text, $name = 'link')
/**
* Writes a media_manager button.
*
* @param string $directory The sub-directory to upload the media to.
* @param string $directory The subdirectory to upload the media to.
* @param string $alt An override for the alt text.
*
* @return void
Expand Down
6 changes: 3 additions & 3 deletions administrator/language/en-GB/en-GB.com_contact.ini
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ COM_CONTACT_FIELD_CATEGORY_DESC="Select a contact category to display."
COM_CONTACT_FIELD_CATEGORY_LABEL="Select a Category"
COM_CONTACT_FIELD_CONFIG_ALLOW_VCARD_DESC="Allow vCard to be displayed."
COM_CONTACT_FIELD_CONFIG_ALLOW_VCARD_LABEL="Allow vCard"
COM_CONTACT_FIELD_CONFIG_BANNED_EMAIL_DESC="Email addresses not allowed to submit contact form. Separate multiple email addresses with a semi-colon."
COM_CONTACT_FIELD_CONFIG_BANNED_EMAIL_DESC="Email addresses not allowed to submit contact form. Separate multiple email addresses with a semicolon."
COM_CONTACT_FIELD_CONFIG_BANNED_EMAIL_LABEL="Banned Email"
COM_CONTACT_FIELD_CONFIG_BANNED_SUBJECT_DESC="Subjects not allowed in contact form. Separate multiple subjects with a semi-colon."
COM_CONTACT_FIELD_CONFIG_BANNED_SUBJECT_DESC="Subjects not allowed in contact form. Separate multiple subjects with a semicolon."
COM_CONTACT_FIELD_CONFIG_BANNED_SUBJECT_LABEL="Banned Subject"
COM_CONTACT_FIELD_CONFIG_BANNED_TEXT_DESC="Text not allowed in contact form body. Separate multiple words with a semi-colon."
COM_CONTACT_FIELD_CONFIG_BANNED_TEXT_DESC="Text not allowed in contact form body. Separate multiple words with a semicolon."
COM_CONTACT_FIELD_CONFIG_BANNED_TEXT_LABEL="Banned Text"
COM_CONTACT_FIELD_CONFIG_CATEGORIES_DESC="These settings apply for Contact Categories Options unless they are changed for a specific menu item."
COM_CONTACT_FIELD_CONFIG_CATEGORY_DESC="These settings apply for Contact Category Options unless they are changed for a specific menu item."
Expand Down
2 changes: 1 addition & 1 deletion administrator/language/en-GB/en-GB.ini
Original file line number Diff line number Diff line change
Expand Up @@ -609,7 +609,7 @@ JHELP_COMPONENTS_COM_MENUS_OPTIONS="Components_Menus_Configuration"
JHELP_COMPONENTS_COM_MESSAGES_OPTIONS="Components_Messages_Configuration"
JHELP_COMPONENTS_COM_MODULES_OPTIONS="Components_Module_Manager_Options"
JHELP_COMPONENTS_COM_NEWSFEEDS_OPTIONS="Components_News_Feed_Manager_Options"
JHELP_COMPONENTS_COM_PLUGINS_OPTIONS="Components_Plug-in_Manager_Options"
JHELP_COMPONENTS_COM_PLUGINS_OPTIONS="Components_Plugin_Manager_Options"
JHELP_COMPONENTS_COM_POSTINSTALL_OPTIONS="Components_Post_installation_Messages_Configuration"
JHELP_COMPONENTS_COM_REDIRECT_OPTIONS="Components_Redirect_Manager_Options"
JHELP_COMPONENTS_COM_SEARCH_OPTIONS="Components_Search_Manager_Options"
Expand Down
2 changes: 1 addition & 1 deletion administrator/language/en-GB/en-GB.mod_status.ini
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ MOD_STATUS_BACKEND_USERS_0="Administrators"
MOD_STATUS_BACKEND_USERS_1="Administrator"
MOD_STATUS_BACKEND_USERS_MORE="Administrators"
MOD_STATUS_FIELD_SHOW_VIEWSITE_LABEL="Show View Site"
MOD_STATUS_FIELD_SHOW_VIEWSITE_DESC="Show a link to the website homepage."
MOD_STATUS_FIELD_SHOW_VIEWSITE_DESC="Show a link to the website home page."
MOD_STATUS_FIELD_LINK_VIEWADMIN_LABEL="Show Admin"
MOD_STATUS_FIELD_SHOW_VIEWADMIN_LABEL="Show View Administrator"
MOD_STATUS_FIELD_SHOW_VIEWADMIN_DESC="Show a link to open a new Administrator window."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ PLG_SYSTEM_UPDATENOTIFICATION_LANGUAGE_OVERRIDE_NONE="Auto"
; [NEWVERSION] New Joomla! version, e.g. 1.2.3
; [CURVERSION] Currently installed Joomla! version, e.g. 1.2.0
; [SITENAME] Site name, as set in Global Configuration.
; [URL] URL of the site's front-end page.
; [URL] URL of the site's frontend page.
; [LINK] Update URL (link to com_joomlaupdate, will request login if the Super User isn't already logged in).
; \n Newline character. Use it to start a new line in the email.
PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_SUBJECT="Joomla! Update available for [SITENAME] – [URL]"
Expand Down
2 changes: 1 addition & 1 deletion administrator/modules/mod_status/mod_status.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
$db->setQuery($query);
$unread = (int) $db->loadResult();

// Get the number of back-end logged in users.
// Get the number of backend logged in users.
$query->clear()
->select('COUNT(session_id)')
->from('#__session')
Expand Down
2 changes: 1 addition & 1 deletion administrator/modules/mod_status/tmpl/default.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
. '</div>';
}

// Print the back-end logged in users.
// Print the backend logged in users.
if ($params->get('show_loggedin_users_admin', 1))
{
$output[] = '<div class="btn-group backloggedin-users">'
Expand Down
2 changes: 1 addition & 1 deletion build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
</exec>
</target>

<target name="lint" description="Perform syntax check of sourcecode files">
<target name="lint" description="Perform syntax check of source code files">
<apply executable="php" failonerror="true">
<arg value="-l" />

Expand Down
6 changes: 3 additions & 3 deletions components/com_config/controller/config/display.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@ public function execute()
$viewFormat = $document->getType();
$layoutName = $this->input->getWord('layout', 'default');

// Access back-end com_config
// Access backend com_config
JLoader::registerPrefix(ucfirst($viewName), JPATH_ADMINISTRATOR . '/components/com_config');
$displayClass = new ConfigControllerApplicationDisplay;

// Set back-end required params
// Set backend required params
$document->setType('json');
$app->input->set('view', 'application');

// Execute back-end controller
// Execute backend controller
$serviceData = json_decode($displayClass->execute(), true);

// Reset params back after requesting from service
Expand Down
6 changes: 3 additions & 3 deletions components/com_config/controller/config/save.php
Original file line number Diff line number Diff line change
Expand Up @@ -74,17 +74,17 @@ public function execute()
// Attempt to save the configuration.
$data = $return;

// Access back-end com_config
// Access backend com_config
JLoader::registerPrefix('Config', JPATH_ADMINISTRATOR . '/components/com_config');
$saveClass = new ConfigControllerApplicationSave;

// Get a document object
$document = JFactory::getDocument();

// Set back-end required params
// Set backend required params
$document->setType('json');

// Execute back-end controller
// Execute backend controller
$return = $saveClass->execute();

// Reset params back after requesting from service
Expand Down
2 changes: 1 addition & 1 deletion components/com_config/controller/modules/cancel.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public function execute()

$id = $this->input->getInt('id');

// Access back-end com_module
// Access backend com_module
JLoader::register('ModulesControllerModule', JPATH_ADMINISTRATOR . '/components/com_modules/controllers/module.php');
JLoader::register('ModulesViewModule', JPATH_ADMINISTRATOR . '/components/com_modules/views/module/view.json.php');
JLoader::register('ModulesModelModule', JPATH_ADMINISTRATOR . '/components/com_modules/models/module.php');
Expand Down
4 changes: 2 additions & 2 deletions components/com_config/controller/modules/display.php
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public function execute()
$redirect = JUri::base();
}

// Access back-end com_module
// Access backend com_module
JLoader::register('ModulesController', JPATH_ADMINISTRATOR . '/components/com_modules/controller.php');
JLoader::register('ModulesViewModule', JPATH_ADMINISTRATOR . '/components/com_modules/views/module/view.json.php');
JLoader::register('ModulesModelModule', JPATH_ADMINISTRATOR . '/components/com_modules/models/module.php');
Expand All @@ -65,7 +65,7 @@ public function execute()
// Get the parameters of the module with Id
$document->setType('json');

// Execute back-end controller
// Execute backend controller
if (!($serviceData = json_decode($displayClass->display(), true)))
{
$app->redirect($redirect);
Expand Down
6 changes: 3 additions & 3 deletions components/com_config/controller/modules/save.php
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public function execute()
$redirect = '&return=' . $returnUri;
}

// Access back-end com_modules to be done
// Access backend com_modules to be done
JLoader::register('ModulesControllerModule', JPATH_ADMINISTRATOR . '/components/com_modules/controllers/module.php');
JLoader::register('ModulesModelModule', JPATH_ADMINISTRATOR . '/components/com_modules/models/module.php');

Expand All @@ -68,10 +68,10 @@ public function execute()
// Get a document object
$document = JFactory::getDocument();

// Set back-end required params
// Set backend required params
$document->setType('json');

// Execute back-end controller
// Execute backend controller
$return = $controllerClass->save();

// Reset params back after requesting from service
Expand Down
6 changes: 3 additions & 3 deletions components/com_config/controller/templates/display.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,18 @@ public function execute()
$viewFormat = $document->getType();
$layoutName = $this->input->getWord('layout', 'default');

// Access back-end com_config
// Access backend com_config
JLoader::register('TemplatesController', JPATH_ADMINISTRATOR . '/components/com_templates/controller.php');
JLoader::register('TemplatesViewStyle', JPATH_ADMINISTRATOR . '/components/com_templates/views/style/view.json.php');
JLoader::register('TemplatesModelStyle', JPATH_ADMINISTRATOR . '/components/com_templates/models/style.php');

$displayClass = new TemplatesController;

// Set back-end required params
// Set backend required params
$document->setType('json');
$this->input->set('id', $app->getTemplate('template')->id);

// Execute back-end controller
// Execute backend controller
$serviceData = json_decode($displayClass->display(), true);

// Reset params back after requesting from service
Expand Down
6 changes: 3 additions & 3 deletions components/com_config/controller/templates/save.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public function execute()

$app = JFactory::getApplication();

// Access back-end com_templates
// Access backend com_templates
JLoader::register('TemplatesControllerStyle', JPATH_ADMINISTRATOR . '/components/com_templates/controllers/style.php');
JLoader::register('TemplatesModelStyle', JPATH_ADMINISTRATOR . '/components/com_templates/models/style.php');
JLoader::register('TemplatesTableStyle', JPATH_ADMINISTRATOR . '/components/com_templates/tables/style.php');
Expand All @@ -53,11 +53,11 @@ public function execute()
// Get a document object
$document = JFactory::getDocument();

// Set back-end required params
// Set backend required params
$document->setType('json');
$this->input->set('id', $app->getTemplate('template')->id);

// Execute back-end controller
// Execute backend controller
$return = $controllerClass->save();

// Reset params back after requesting from service
Expand Down
4 changes: 2 additions & 2 deletions components/com_contact/models/rules/contactemail.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
JFormHelper::loadRuleClass('email');

/**
* JFormRule for com_contact to make sure the E-Mail adress is not blocked.
* JFormRule for com_contact to make sure the email address is not blocked.
*
* @since 1.6
*/
class JFormRuleContactEmail extends JFormRuleEmail
{
/**
* Method to test for banned e-mail addresses
* Method to test for banned email addresses
*
* @param SimpleXMLElement $element The SimpleXMLElement object representing the <field /> tag for the form field object.
* @param mixed $value The form field value to validate.
Expand Down
2 changes: 1 addition & 1 deletion components/com_finder/controller.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public function display($cachable = false, $urlparams = array())
$input = JFactory::getApplication()->input;
$cachable = true;

// Load plug-in language files.
// Load plugin language files.
FinderHelperLanguage::loadPluginLanguage();

// Set the default view name and format from the Request.
Expand Down
Loading