From 132a25057f3875cff6f9d7db72cc8105eb0a3a1c Mon Sep 17 00:00:00 2001 From: Brian Teeman Date: Mon, 12 Jul 2021 17:11:27 +0100 Subject: [PATCH] [4.0] doc site links (#34762) All links go the docs.joomla.org web site should use `Special:MyLanguage` in the url as this enables the user to be automatically redirect to the correct language version of the linked page. Code Review --- README.md | 6 +++--- .../com_installer/tmpl/discover/emptystate.php | 2 +- .../com_installer/tmpl/update/emptystate.php | 2 +- .../com_installer/tmpl/warnings/emptystate.php | 2 +- administrator/language/en-GB/com_actionlogs.ini | 2 +- administrator/language/en-GB/com_installer.ini | 2 +- administrator/language/en-GB/com_joomlaupdate.ini | 2 +- administrator/language/en-GB/com_privacy.ini | 2 +- installation/language/en-GB/joomla.ini | 2 +- installation/language/en-US/joomla.ini | 2 +- tests/Codeception/README.md | 10 +++++----- tests/README.md | 4 ++-- 12 files changed, 19 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index d44022a4796..d423810d5bf 100644 --- a/README.md +++ b/README.md @@ -28,13 +28,13 @@ Joomla is not installable out of the box from this repository, please use: How to get a working installation from the source --------------------- -For detailed instructions please visit https://docs.joomla.org/J4.x:Setting_Up_Your_Local_Environment +For detailed instructions please visit https://docs.joomla.org/Special:MyLanguage/J4.x:Setting_Up_Your_Local_Environment You will need: -- PHP - basically the same as you need for running a Joomla Site, but you need the cli (command line interface) Version (see https://docs.joomla.org/Configuring_a_LAMPP_server_for_PHP_development) +- PHP - basically the same as you need for running a Joomla Site, but you need the cli (command line interface) Version (see https://docs.joomla.org/Special:MyLanguage/Configuring_a_LAMPP_server_for_PHP_development) - Composer - for managing Joomla's PHP Dependencies. For help installing composer please read the documentation at https://getcomposer.org/doc/00-intro.md - Node.js - for compiling Joomla's Javascript and SASS files. For help installing Node.js please follow the instructions available on https://nodejs.org/en/ -- Git - for version management. Download from here https://git-scm.com/downloads (MacOS users can also use Brew and Linux users can use the built-in package manager, eg apt, yum, etc). +- Git - for version management. Download from here https://git-scm.com/downloads (MacOS users can also use Brew and Linux users can use the built-in package manager, eg apt, yum, etc). **Steps to setup the local environment:** - Clone the repository: diff --git a/administrator/components/com_installer/tmpl/discover/emptystate.php b/administrator/components/com_installer/tmpl/discover/emptystate.php index 0520a191204..547c2b77acf 100644 --- a/administrator/components/com_installer/tmpl/discover/emptystate.php +++ b/administrator/components/com_installer/tmpl/discover/emptystate.php @@ -16,7 +16,7 @@ use Joomla\CMS\Session\Session; $displayData = [ 'textPrefix' => 'COM_INSTALLER', 'formURL' => 'index.php?option=com_installer&task=discover.refresh', - 'helpURL' => 'https://docs.joomla.org/Help4.x:Extensions:_Discover', + 'helpURL' => 'https://docs.joomla.org/Special:MyLanguage/Help4.x:Extensions:_Discover', 'icon' => 'icon-puzzle-piece install', 'createURL' => 'index.php?option=com_installer&task=discover.refresh&' . Session::getFormToken() . '=1', 'content' => Text::_('COM_INSTALLER_MSG_DISCOVER_DESCRIPTION'), diff --git a/administrator/components/com_installer/tmpl/update/emptystate.php b/administrator/components/com_installer/tmpl/update/emptystate.php index 18c71b26a97..923e561332e 100644 --- a/administrator/components/com_installer/tmpl/update/emptystate.php +++ b/administrator/components/com_installer/tmpl/update/emptystate.php @@ -16,7 +16,7 @@ use Joomla\CMS\Session\Session; $displayData = [ 'textPrefix' => 'COM_INSTALLER', 'formURL' => 'index.php?option=com_installer&view=update', - 'helpURL' => 'https://docs.joomla.org/Help4.x:Extensions:_Update', + 'helpURL' => 'https://docs.joomla.org/Special:MyLanguage/Help4.x:Extensions:_Update', 'icon' => 'icon-puzzle-piece install', ]; diff --git a/administrator/components/com_installer/tmpl/warnings/emptystate.php b/administrator/components/com_installer/tmpl/warnings/emptystate.php index 10cb596b5b3..03ebbd1bc86 100644 --- a/administrator/components/com_installer/tmpl/warnings/emptystate.php +++ b/administrator/components/com_installer/tmpl/warnings/emptystate.php @@ -13,7 +13,7 @@ use Joomla\CMS\Language\Text; use Joomla\CMS\Layout\LayoutHelper; $displayData = [ - 'helpURL' => 'https://docs.joomla.org/Help4.x:Information:_Warnings', + 'helpURL' => 'https://docs.joomla.org/Special:MyLanguage/Help4.x:Information:_Warnings', 'icon' => 'icon-puzzle-piece install', 'title' => Text::_('COM_INSTALLER_MSG_WARNINGS_NONE'), 'content' => '', diff --git a/administrator/language/en-GB/com_actionlogs.ini b/administrator/language/en-GB/com_actionlogs.ini index 93a3cd90a03..3afd90f8ece 100644 --- a/administrator/language/en-GB/com_actionlogs.ini +++ b/administrator/language/en-GB/com_actionlogs.ini @@ -57,7 +57,7 @@ COM_ACTIONLOGS_OPTION_RANGE_PAST_YEAR="In the last year" COM_ACTIONLOGS_OPTION_RANGE_POST_YEAR="More than a year ago" COM_ACTIONLOGS_OPTION_RANGE_TODAY="Today" COM_ACTIONLOGS_OPTIONS="Options" -COM_ACTIONLOGS_POSTINSTALL_BODY="

With the release of Joomla 3.9.0 you can now log all administrative actions performed by your users in supported extensions. It is now easy to see who did what and when they did it.

The logs can be reviewed in Joomla or exported for external use.

For further information on this new feature read the User Action Logs documentation.

" +COM_ACTIONLOGS_POSTINSTALL_BODY="

With the release of Joomla 3.9.0 you can now log all administrative actions performed by your users in supported extensions. It is now easy to see who did what and when they did it.

The logs can be reviewed in Joomla or exported for external use.

For further information on this new feature read the User Action Logs documentation.

" COM_ACTIONLOGS_POSTINSTALL_TITLE="User Actions Can Now Be Logged" COM_ACTIONLOGS_PURGE_CONFIRM="Are you sure want to delete all User Action logs?" COM_ACTIONLOGS_PURGE_FAIL="Failed to delete all User Action logs." diff --git a/administrator/language/en-GB/com_installer.ini b/administrator/language/en-GB/com_installer.ini index eef36f7e361..626cc546f18 100644 --- a/administrator/language/en-GB/com_installer.ini +++ b/administrator/language/en-GB/com_installer.ini @@ -175,7 +175,7 @@ COM_INSTALLER_MSG_UPDATESITES_REBUILD_SUCCESS="Update sites have been rebuilt fr COM_INSTALLER_MSG_UPDATESITES_REBUILD_WARNING="Update sites have been rebuilt. No extension with updates sites discovered." COM_INSTALLER_MSG_WARNING_NO_LANGUAGES_UPDATESERVER="The update table is not up to date. Please rebuild your update server table" COM_INSTALLER_MSG_WARNINGFURTHERINFO="Further information on warnings" -COM_INSTALLER_MSG_WARNINGFURTHERINFODESC="For more information see the Joomla! Documentation Site." +COM_INSTALLER_MSG_WARNINGFURTHERINFODESC="For more information see the Joomla! Documentation Site." COM_INSTALLER_MSG_WARNINGS_FILEUPLOADISDISABLEDDESC="File uploads are required to upload extensions with the installer." COM_INSTALLER_MSG_WARNINGS_FILEUPLOADSDISABLED="File uploads disabled." COM_INSTALLER_MSG_WARNINGS_JOOMLATMPNOTSET="The Joomla temporary folder is not set." diff --git a/administrator/language/en-GB/com_joomlaupdate.ini b/administrator/language/en-GB/com_joomlaupdate.ini index ac4620cb471..8b648ca809e 100644 --- a/administrator/language/en-GB/com_joomlaupdate.ini +++ b/administrator/language/en-GB/com_joomlaupdate.ini @@ -57,7 +57,7 @@ COM_JOOMLAUPDATE_VIEW_DEFAULT_DESCRIPTION_MISSING_TAG="Extensions marked with wiki for more information." +INSTL_DATABASE_VALIDATION_ERROR="Check your database credentials, database type, database name or hostname. If you have MySQL 8 installed then please read this wiki for more information." INSTL_CONNECT_DB="Setup Database Connection" INSTL_INSTALL_JOOMLA="Install Joomla" diff --git a/installation/language/en-US/joomla.ini b/installation/language/en-US/joomla.ini index 6ac142b07cb..635adddeebc 100644 --- a/installation/language/en-US/joomla.ini +++ b/installation/language/en-US/joomla.ini @@ -95,7 +95,7 @@ INSTL_DATABASE_PREFIX_MSG="The table prefix must start with a letter, optionally INSTL_DATABASE_RESPONSE_ERROR="The installation process failed." INSTL_DATABASE_TYPE_DESC="Select the database type." INSTL_DATABASE_USER_DESC="Either a username you created or a username provided by your host." -INSTL_DATABASE_VALIDATION_ERROR="Check your database credentials, database type, database name or hostname. If you have MySQL 8 installed then please read this wiki for more information." +INSTL_DATABASE_VALIDATION_ERROR="Check your database credentials, database type, database name or hostname. If you have MySQL 8 installed then please read this wiki for more information." INSTL_CONNECT_DB="Setup Database Connection" INSTL_INSTALL_JOOMLA="Install Joomla" diff --git a/tests/Codeception/README.md b/tests/Codeception/README.md index df806e1ba56..69f2be13ac1 100644 --- a/tests/Codeception/README.md +++ b/tests/Codeception/README.md @@ -10,7 +10,7 @@ at the moment Here are the steps that are needed to setup UI tests execution on `localhost` #### Linux OS -1) Checkout the Project in your document root folder, and follow the [setup guide](https://docs.joomla.org/J4.x:Setting_Up_Your_Local_Environment). +1) Checkout the Project in your document root folder, and follow the [setup guide](https://docs.joomla.org/Special:MyLanguage/J4.x:Setting_Up_Your_Local_Environment). 2) Navigate to `tests/Codeception` folder and edit configuration file `acceptance.suite.yml` file. 1) Within the JoomlaBrowser config section change `url` point it to your localhost url 2) update `database host` `database user` & `database password` as per your localhost installed DB, @@ -24,7 +24,7 @@ Here are the steps that are needed to setup UI tests execution on `localhost` 3) Run `./node_modules/.bin/selenium-standalone install` in project to install selenium-standalone server in localhost 4) Run `./node_modules/.bin/selenium-standalone start` and wait for the message `Selenium Started` 5) Run the following in project root: `libraries/vendor/bin/codecept run acceptance tests/Codeception/acceptance/install` -this will start Chrome in headless mode, to view the test execution in Chrome UI, remove `headless` from capabilities in configuration file +this will start Chrome in headless mode, to view the test execution in Chrome UI, remove `headless` from capabilities in configuration file @@ -36,17 +36,17 @@ These are the Joomla 4 API (webservices) tests. To run these tests on OSX you wi ### Installation -1) Checkout the Project in your document root folder, and follow the [setup guide}(https://docs.joomla.org/J4.x:Setting_Up_Your_Local_Environment). +1) Checkout the Project in your document root folder, and follow the [setup guide}(https://docs.joomla.org/Special:MyLanguage/J4.x:Setting_Up_Your_Local_Environment). 2) Copy the file `tests/Codeception/api.suite.dist.yml` to `tests/Codeception/api.suite.yml`. Then edit the REST url in the new file to point it to your localhost url. 3) Edit the file configuration.php. Set `$secret` = `'tEstValue'` - see [drone-api-run.sh](https://github.com/joomla/joomla-cms/blob/d8930208814fb52c0871853cfd9298f70998fd1f/tests/Codeception/drone-api-run.sh#L59). -> Tests with authentication always use the super user credentials for now. +> Tests with authentication always use the super user credentials for now. ### Running `libraries/vendor/bin/codecept run api` -You can also run the command with +You can also run the command with - `--debug` to get some extended information. - `--steps` to print step-by-step execution. diff --git a/tests/README.md b/tests/README.md index f22bf448e12..6afcf6352c1 100644 --- a/tests/README.md +++ b/tests/README.md @@ -9,8 +9,8 @@ The unit tests are checking the specific PHP code of the Joomla framework with t Javascript tests ========== -The javascript tests test the Joomla-specific Javascript code. For further information on the tests and on how to run them, please check out https://docs.joomla.org/Running_JavaScript_Tests_for_the_Joomla_CMS +The javascript tests test the Joomla-specific Javascript code. For further information on the tests and on how to run them, please check out https://docs.joomla.org/Special:MyLanguage/Running_JavaScript_Tests_for_the_Joomla_CMS Codeception tests ========== -The Codeception tests test the user interface in a real browser and the webservices API of Joomla with the help of Codeception. For further information on the tests and on how to run them, please check out tests/Codeception/README.md \ No newline at end of file +The Codeception tests test the user interface in a real browser and the webservices API of Joomla with the help of Codeception. For further information on the tests and on how to run them, please check out tests/Codeception/README.md