Skip to content

[5.0] CLI install fix public folder language string #41623

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.

Sign up for GitHub

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

Merged
HLeithner merged 3 commits into from
Sep 12, 2023
Merged

[5.0] CLI install fix public folder language string #41623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
28bc032
[5.0] CLI install fix public folder language string
heelc29 Sep 6, 2023
b760e07
refactor label to desc
heelc29 Sep 8, 2023
bdf2201
Merge branch '5.0-dev' into 5.0/cli-install/public-folder-lang
heelc29 Sep 8, 2023
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
3 changes: 1 addition & 2 deletions installation/forms/setup.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,7 @@
<field
name="public_folder"
type="text"
label="INSTL_PUBLIC_FOLDER_LABEL"
description="INSTL_PUBLIC_FOLDER_DESCRIPTION"
label="INSTL_PUBLIC_FOLDER_DESC"
default=""
filter="string"
/>
Expand Down
2 changes: 1 addition & 1 deletion installation/language/en-GB/joomla.cli.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ INSTL_DATABASE_TYPE_DESC="Database type. Supported: mysql, mysqli, pgsql"
INSTL_DATABASE_TYPE_DESC_SHORT="Database type. Supported by Joomla: mysql (=MySQL (PDO)), mysqli (=MySQLi), pgsql (=PostgreSQL (PDO))"
INSTL_DATABASE_USER_DESC="Database username"
INSTL_DATABASE_USER_DESC_SHORT="Database username"
INSTL_PUBLIC_FOLDER_DESC="Relative or absolute path to the public folder"
INSTL_PUBLIC_FOLDER_DESC_SHORT="Relative or absolute path to the public folder"
INSTL_PUBLIC_FOLDER_LABEL="Relative or absolute path to the public folder"
INSTL_SITE_NAME_DESC="Enter the name of your Joomla site"
INSTL_SITE_NAME_DESC_SHORT="Name of the website"
2 changes: 1 addition & 1 deletion installation/language/en-GB/joomla.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,8 @@ INSTL_SITE_DEVMODE_LABEL="We detected development mode"
INSTL_SITE_NAME_DESC="Enter the name of your Joomla site."

; Expert View
INSTL_PUBLIC_FOLDER_DESC="Relative or absolute path to the public folder"
INSTL_PUBLIC_FOLDER_DESC_SHORT="Relative or absolute path to the public folder"
INSTL_PUBLIC_FOLDER_LABEL="Relative or absolute path to the public folder"

; Complete view
INSTL_COMPLETE_ERROR_FOLDER_DELETE="The \"%s\" folder could not be deleted. Please manually delete the folder."
Expand Down