Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
555cb15
Add sensible inline help to Global Configuration
nikosdion Sep 19, 2021
611e09f
Button to show/hide inline help
nikosdion Sep 19, 2021
b7a084b
Add back the error handling
nikosdion Sep 19, 2021
19326c0
Show how this can be done in the frontend, too
nikosdion Sep 19, 2021
bff1d50
Update build/media_source/system/js/inlinehelp.es6.js
Sep 20, 2021
34ae1e6
Update build/media_source/system/js/inlinehelp.es6.js
Sep 20, 2021
10e38e9
Address inconsistency of control and description DIV id's
Sep 20, 2021
71a6462
Toggle the aria-describedby attribute to follow the visibility of the…
Sep 20, 2021
266998b
Use simpler English
Sep 20, 2021
622637f
Make this into a proper BUTTON element and end–align it
Sep 20, 2021
c204df1
Update administrator/language/en-GB/joomla.ini
Sep 20, 2021
0d89361
Update language string
Sep 20, 2021
95aad91
Update language/en-GB/com_config.ini
Sep 21, 2021
e18281d
Clarify SEF URLs
Sep 26, 2021
c0d81bd
Apply suggestions from code review
Sep 26, 2021
c0fd3a8
[4.x] Tinymce updates (#35605)
brianteeman Sep 19, 2021
db3d320
typo in filename (#35613)
tecpromotion Sep 20, 2021
5c27124
Remove JHELP_ strings for com_config and move the ref_key to the conf…
Bakual Sep 21, 2021
2647c24
[4.0] Fix modal data attributes (#35626)
dgrammatiko Sep 22, 2021
90d2210
[4.0] Remove JHELP_ strings for com_categories (#35534)
Bakual Sep 23, 2021
17ccc51
Category custom fields marked as 'subform' act as if they are not (#3…
nikosdion Sep 23, 2021
bc9eb1b
[4.0] Replace JHELP_ String with hardcoded ref-key (#35429)
Bakual Sep 23, 2021
babc243
[4][CloudFlare Issues] Remove validation of the session by IP address…
PhilETaylor Sep 24, 2021
5d0edab
Language Keys may have a : in it. (#35659)
Bakual Sep 26, 2021
a1b41e6
Button to show/hide inline help
nikosdion Sep 19, 2021
3336a40
Whoops, wrong merge option
Sep 27, 2021
e2acb92
Merge branch '4.0-dev' into feature/inline-help
Sep 27, 2021
26a6725
Lang string change
Sep 27, 2021
437205f
Apply language string suggestion
nikosdion Nov 13, 2021
7ae84ed
Remove empty line on language file,
richard67 Nov 13, 2021
99f1212
Add sensible inline help to Global Configuration
nikosdion Sep 19, 2021
a9f961c
Button to show/hide inline help
nikosdion Sep 19, 2021
1574282
Add back the error handling
nikosdion Sep 19, 2021
4990e69
Show how this can be done in the frontend, too
nikosdion Sep 19, 2021
7a0b569
Update build/media_source/system/js/inlinehelp.es6.js
Sep 20, 2021
9a8b9ff
Update build/media_source/system/js/inlinehelp.es6.js
Sep 20, 2021
f3f07aa
Address inconsistency of control and description DIV id's
Sep 20, 2021
eb0d802
Toggle the aria-describedby attribute to follow the visibility of the…
Sep 20, 2021
2e19c54
Use simpler English
Sep 20, 2021
761b09b
Make this into a proper BUTTON element and end–align it
Sep 20, 2021
bf509c9
Update administrator/language/en-GB/joomla.ini
Sep 20, 2021
c723c5c
Update language string
Sep 20, 2021
934fda6
Update language/en-GB/com_config.ini
Sep 21, 2021
a8b2243
Clarify SEF URLs
Sep 26, 2021
df850aa
Apply suggestions from code review
Sep 26, 2021
3710ddc
Button to show/hide inline help
nikosdion Sep 19, 2021
71e2764
Whoops, wrong merge option
Sep 27, 2021
3a926d3
Lang string change
Sep 27, 2021
1332364
Apply language string suggestion
nikosdion Nov 13, 2021
fa7ca2f
Remove empty line on language file,
richard67 Nov 13, 2021
af38fc6
Merge remote-tracking branch 'nikosdion/feature/inline-help' into fea…
Nov 15, 2021
3839306
Merge branch '4.1-dev' into feature/inline-help
bembelimen Nov 15, 2021
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
24 changes: 23 additions & 1 deletion administrator/components/com_config/forms/application.xml
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@
name="dbtype"
type="databaseconnection"
label="COM_CONFIG_FIELD_DATABASE_TYPE_LABEL"
description="COM_CONFIG_FIELD_DATABASE_TYPE_DESC"
supported="mysql,mysqli,pgsql,postgresql"
filter="string" />

Expand Down Expand Up @@ -293,6 +294,7 @@
name="debug"
type="radio"
label="COM_CONFIG_FIELD_DEBUG_SYSTEM_LABEL"
description="COM_CONFIG_FIELD_DEBUG_SYSTEM_DESC"
layout="joomla.form.field.radio.switcher"
default="0"
filter="boolean"
Expand All @@ -305,6 +307,7 @@
name="debug_lang"
type="radio"
label="COM_CONFIG_FIELD_DEBUG_LANG_LABEL"
description="COM_CONFIG_FIELD_DEBUG_LANG_DESC"
layout="joomla.form.field.radio.switcher"
default="0"
filter="boolean"
Expand Down Expand Up @@ -394,6 +397,7 @@
name="proxy_enable"
type="radio"
label="COM_CONFIG_FIELD_PROXY_ENABLE_LABEL"
description="COM_CONFIG_FIELD_PROXY_ENABLE_DESC"
layout="joomla.form.field.radio.switcher"
default="0"
filter="boolean"
Expand All @@ -406,6 +410,7 @@
name="proxy_host"
type="text"
label="COM_CONFIG_FIELD_PROXY_HOST_LABEL"
description="COM_CONFIG_FIELD_PROXY_HOST_DESC"
filter="string"
showon="proxy_enable:1"
size="14"
Expand All @@ -427,6 +432,7 @@
name="proxy_user"
type="text"
label="COM_CONFIG_FIELD_PROXY_USERNAME_LABEL"
description="COM_CONFIG_FIELD_PROXY_USERNAME_DESC"
filter="string"
showon="proxy_enable:1"
autocomplete="off"
Expand Down Expand Up @@ -454,6 +460,7 @@
name="offset"
type="timezone"
label="COM_CONFIG_FIELD_SERVER_TIMEZONE_LABEL"
description="COM_CONFIG_FIELD_SERVER_TIMEZONE_DESC"
default="UTC"
>
<option value="UTC">JLIB_FORM_VALUE_TIMEZONE_UTC</option>
Expand Down Expand Up @@ -481,6 +488,7 @@
name="massmailoff"
type="radio"
label="COM_CONFIG_FIELD_MAIL_MASSMAILOFF_LABEL"
description="COM_CONFIG_FIELD_MAIL_MASSMAILOFF_DESC"
layout="joomla.form.field.radio.switcher"
default="0"
filter="boolean"
Expand Down Expand Up @@ -657,6 +665,7 @@
name="MetaRights"
type="textarea"
label="JFIELD_META_RIGHTS_LABEL"
description="JFIELD_META_RIGHTS_DESC"
filter="string"
cols="60"
rows="2"
Expand All @@ -678,6 +687,7 @@
name="MetaVersion"
type="radio"
label="COM_CONFIG_FIELD_METAVERSION_LABEL"
description="COM_CONFIG_FIELD_METAVERSION_DESC"
layout="joomla.form.field.radio.switcher"
default="0"
filter="boolean"
Expand All @@ -696,6 +706,7 @@
name="sef"
type="radio"
label="COM_CONFIG_FIELD_SEF_URL_LABEL"
description="COM_CONFIG_FIELD_SEF_URL_DESC"
layout="joomla.form.field.radio.switcher"
default="1"
filter="boolean"
Expand All @@ -708,6 +719,7 @@
name="sef_rewrite"
type="radio"
label="COM_CONFIG_FIELD_SEF_REWRITE_LABEL"
description="COM_CONFIG_FIELD_SEF_REWRITE_DESC"
layout="joomla.form.field.radio.switcher"
default="0"
filter="boolean"
Expand All @@ -720,7 +732,7 @@
<field
name="sef_note"
type="note"
label="COM_CONFIG_FIELD_SEF_REWRITE_DESC"
label="COM_CONFIG_FIELD_SEF_REWRITE_NOTE"
heading="p"
class="small"
showon="sef:1[AND]sef_rewrite:1"
Expand All @@ -730,6 +742,7 @@
name="sef_suffix"
type="radio"
label="COM_CONFIG_FIELD_SEF_SUFFIX_LABEL"
description="COM_CONFIG_FIELD_SEF_SUFFIX_DESC"
layout="joomla.form.field.radio.switcher"
default="0"
filter="boolean"
Expand All @@ -743,6 +756,7 @@
name="unicodeslugs"
type="radio"
label="COM_CONFIG_FIELD_UNICODESLUGS_LABEL"
description="COM_CONFIG_FIELD_UNICODESLUGS_DESC"
layout="joomla.form.field.radio.switcher"
default="0"
filter="boolean"
Expand Down Expand Up @@ -775,6 +789,7 @@
name="tmp_path"
type="text"
label="COM_CONFIG_FIELD_TEMP_PATH_LABEL"
description="COM_CONFIG_FIELD_TEMP_PATH_DESC"
filter="string"
size="50"
/>
Expand All @@ -783,6 +798,7 @@
name="gzip"
type="radio"
label="COM_CONFIG_FIELD_GZIP_COMPRESSION_LABEL"
description="COM_CONFIG_FIELD_GZIP_COMPRESSION_DESC"
layout="joomla.form.field.radio.switcher"
default="0"
filter="boolean"
Expand All @@ -795,6 +811,7 @@
name="error_reporting"
type="list"
label="COM_CONFIG_FIELD_ERROR_REPORTING_LABEL"
description="COM_CONFIG_FIELD_ERROR_REPORTING_DESC"
default="default"
filter="cmd"
validate="options"
Expand Down Expand Up @@ -1020,6 +1037,7 @@
name="frontediting"
type="list"
label="COM_CONFIG_FRONTEDITING_LABEL"
description="COM_CONFIG_FRONTEDITING_DESC"
default="1"
filter="integer"
validate="options"
Expand All @@ -1033,6 +1051,7 @@
name="editor"
type="plugins"
label="COM_CONFIG_FIELD_DEFAULT_EDITOR_LABEL"
description="COM_CONFIG_FIELD_DEFAULT_EDITOR_DESC"
folder="editors"
default="tinymce"
filter="cmd"
Expand All @@ -1042,6 +1061,7 @@
name="captcha"
type="plugins"
label="COM_CONFIG_FIELD_DEFAULT_CAPTCHA_LABEL"
description="COM_CONFIG_FIELD_DEFAULT_CAPTCHA_DESC"
folder="captcha"
default="0"
filter="cmd"
Expand All @@ -1053,6 +1073,7 @@
name="access"
type="accesslevel"
label="COM_CONFIG_FIELD_DEFAULT_ACCESS_LEVEL_LABEL"
description="COM_CONFIG_FIELD_DEFAULT_ACCESS_LEVEL_DESC"
default="1"
filter="UINT"
validate="options"
Expand Down Expand Up @@ -1082,6 +1103,7 @@
name="feed_limit"
type="list"
label="COM_CONFIG_FIELD_DEFAULT_FEED_LIMIT_LABEL"
description="COM_CONFIG_FIELD_DEFAULT_FEED_LIMIT_DESC"
default="10"
filter="integer"
validate="options"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ protected function addToolbar()
ToolbarHelper::divider();
ToolbarHelper::cancel('application.cancel', 'JTOOLBAR_CLOSE');
ToolbarHelper::divider();
ToolbarHelper::inlinehelp();
ToolbarHelper::help('Site_Global_Configuration');
}
}
26 changes: 24 additions & 2 deletions administrator/language/en-GB/com_config.ini
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ COM_CONFIG_FIELD_CACHE_LABEL="System Cache"
COM_CONFIG_FIELD_CACHE_PATH_LABEL="Path to Cache Folder"
COM_CONFIG_FIELD_CACHE_PLATFORMPREFIX_LABEL="Platform Specific Caching"
COM_CONFIG_FIELD_CACHE_TIME_LABEL="Cache Time (minutes)"
COM_CONFIG_FIELD_COOKIE_DOMAIN_DESC="Precede domain with '.' if cookie should be valid for all subdomains."
COM_CONFIG_FIELD_COOKIE_DOMAIN_DESC="Precede domain with '.' if cookie should be valid for all subdomains. On most servers you do not need to set this or Cookie Path below."
COM_CONFIG_FIELD_COOKIE_DOMAIN_LABEL="Cookie Domain"
COM_CONFIG_FIELD_COOKIE_PATH_LABEL="Cookie Path"
COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CA_LABEL="Path to CA File"
Expand All @@ -60,19 +60,27 @@ COM_CONFIG_FIELD_DATABASE_PASSWORD_DESC="Do not edit this field unless absolutel
COM_CONFIG_FIELD_DATABASE_PASSWORD_LABEL="Database Password"
COM_CONFIG_FIELD_DATABASE_PREFIX_LABEL="Database Tables Prefix"
COM_CONFIG_FIELD_DATABASE_TYPE_LABEL="Database Type"
COM_CONFIG_FIELD_DATABASE_TYPE_DESC="Do not change this to a different database technology e.g. from MySQLi (MySQL database technology) to PostgreSQL (Postgres database technology); it will break your site."
COM_CONFIG_FIELD_DATABASE_USERNAME_LABEL="Database Username"
COM_CONFIG_FIELD_DEBUG_CONST="Constant"
COM_CONFIG_FIELD_DEBUG_CONST_LANG_DESC="Select if you should display the language constant or the language value when debugging the language strings."
COM_CONFIG_FIELD_DEBUG_CONST_LANG_LABEL="Language Display"
COM_CONFIG_FIELD_DEBUG_LANG_LABEL="Debug Language"
COM_CONFIG_FIELD_DEBUG_LANG_DESC="Displays <strong><code>??</code></strong> around a language string constant when the string is not present in the currently loaded language files or <strong><code>**</code></strong> around the string value when the string is present. If none of the above is displayed, it could mean the text is hardcoded and needs a language string."
COM_CONFIG_FIELD_DEBUG_SYSTEM_LABEL="Debug System"
COM_CONFIG_FIELD_DEBUG_SYSTEM_DESC="Use it only for troubleshooting, ideally on <em>private</em> copies of your site. The more technical information displayed in this mode can be a security risk if left enabled on live sites. Remember to publish the “System - Debug” plugin to get detailed information on each page being loaded."
COM_CONFIG_FIELD_DEBUG_VALUE="Value"
COM_CONFIG_FIELD_DEFAULT_ACCESS_LEVEL_LABEL="Default Access Level"
COM_CONFIG_FIELD_DEFAULT_ACCESS_LEVEL_DESC="Set the Access Level which will be assigned by default to newly created items."
COM_CONFIG_FIELD_DEFAULT_CAPTCHA_LABEL="Default Captcha"
COM_CONFIG_FIELD_DEFAULT_CAPTCHA_DESC="Joomla and third party extensions can use a <a href=\"https://en.wikipedia.org/wiki/CAPTCHA\" target=\"_blank\">CAPTCHA</a> to prevent abuse (spam) on public forms. Each extension can choose to use a different CAPTCHA, if more than one are available. If no selection is made this will be used by default. You can enable additional CAPTCHA methods in System, Manage, Plugins."
COM_CONFIG_FIELD_DEFAULT_EDITOR_LABEL="Default Editor"
COM_CONFIG_FIELD_DEFAULT_EDITOR_DESC="This editor will be used for editing content and other rich text areas in third party extensions unless a user has chosen a different one in their user profile . This will also be the only editor available and used for users who are not already logged in (the Guest user group)."
COM_CONFIG_FIELD_DEFAULT_FEED_LIMIT_LABEL="Default Feed Limit"
COM_CONFIG_FIELD_DEFAULT_FEED_LIMIT_DESC="How many items will be published by default in RSS and Atom feeds."
COM_CONFIG_FIELD_DEFAULT_LIST_LIMIT_LABEL="Default List Limit"
COM_CONFIG_FIELD_ERROR_REPORTING_LABEL="Error Reporting"
COM_CONFIG_FIELD_ERROR_REPORTING_DESC="Control whether PHP error messages should be displayed at all and how verbose they will be. On live sites use None for security reasons. Only use Maximum while troubleshooting — remember to set that back to None when you're done!"
COM_CONFIG_FIELD_FEED_EMAIL_LABEL="Feed Email Address"
COM_CONFIG_FIELD_FILESYSTEM_PATH_DESC="The filesystem path where session data will be stored.<br>If empty, the system's temporary directory will be used."
COM_CONFIG_FIELD_FILESYSTEM_PATH_LABEL="Session Save Path"
Expand All @@ -86,6 +94,7 @@ COM_CONFIG_FIELD_FLOC_BLOCKER_LABEL="Block FLoC"
COM_CONFIG_FIELD_FORCE_SSL_LABEL="Force HTTPS"
COM_CONFIG_FIELD_FORCE_SSL_DESC="HTTPS must be enabled on your server or load balancer to utilise this option. Enable 'Behind Load Balancer' if your SSL terminates on your load balancer but your site is served on http on its webserver."
COM_CONFIG_FIELD_GZIP_COMPRESSION_LABEL="Gzip Page Compression"
COM_CONFIG_FIELD_GZIP_COMPRESSION_DESC="Joomla can automatically compress the generated HTML pages with GZip, making them smaller and increasing your site's speed score. Disable it if your server is already doing that for you or if it conflicts with third party extensions."
COM_CONFIG_FIELD_HTMLBODY_LABEL="HTML Body"
COM_CONFIG_FIELD_LOADBALANCER_ENABLE_DESC="If your site is behind a load balancer or reverse proxy, enable this setting so that IP addresses and other configurations within Joomla automatically take this into account."
COM_CONFIG_FIELD_LOADBALANCER_ENABLE_LABEL="Behind Load Balancer"
Expand All @@ -98,6 +107,7 @@ COM_CONFIG_FIELD_LOG_DEPRECATED_LABEL="Log Deprecated API"
COM_CONFIG_FIELD_LOG_EVERYTHING_LABEL="Log Almost Everything"
COM_CONFIG_FIELD_LOG_EVERYTHING_DESC="Logs everything, except deprecated APIs."
COM_CONFIG_FIELD_LOG_PATH_LABEL="Path to Log Folder"
COM_CONFIG_FIELD_LOG_PATH_DESC="Joomla can optionally keep a log file of its own and third party extensions' operations. Provide the absolute path to a folder that is writeable by PHP; if it's missing or is not writeable Joomla will not load at all. For security reasons you must not use a folder with system–wide access such as <code>/tmp</code>."
COM_CONFIG_FIELD_LOG_PRIORITIES_ALERT="Alert"
COM_CONFIG_FIELD_LOG_PRIORITIES_ALL="All"
COM_CONFIG_FIELD_LOG_PRIORITIES_CRITICAL="Critical"
Expand All @@ -113,6 +123,7 @@ COM_CONFIG_FIELD_MAIL_FROM_NAME_LABEL="From Name"
COM_CONFIG_FIELD_MAIL_MAILER_LABEL="Mailer"
COM_CONFIG_FIELD_MAIL_MAILONLINE_LABEL="Send Mail"
COM_CONFIG_FIELD_MAIL_MASSMAILOFF_LABEL="Disable Mass Mail"
COM_CONFIG_FIELD_MAIL_MASSMAILOFF_DESC="Joomla offers a Mass Mail feature which allows a user with administrator access to send an email to all users of the site. On sites with more than a few dozen users this can be problematic or time out."
COM_CONFIG_FIELD_MAIL_REPLY_TO_EMAIL_LABEL="Reply To Email"
COM_CONFIG_FIELD_MAIL_REPLY_TO_NAME_LABEL="Reply To Name"
COM_CONFIG_FIELD_MAIL_SENDMAIL_PATH_LABEL="Sendmail Path"
Expand All @@ -129,24 +140,32 @@ COM_CONFIG_FIELD_MEMCACHE_PORT_LABEL="Memcache(d) Server Port"
COM_CONFIG_FIELD_METAAUTHOR_LABEL="Author Meta Tag"
COM_CONFIG_FIELD_METADESC_LABEL="Site Meta Description"
COM_CONFIG_FIELD_METAVERSION_LABEL="Joomla Version"
COM_CONFIG_FIELD_METAVERSION_DESC="Controls whether the <code>generator</code> meta tag in the HTML document's header in the front-end and in Atom feeds includes the exact version of your Joomla site. It is recommended to hide it for security reasons."
COM_CONFIG_FIELD_OFFLINE_IMAGE_LABEL="Offline Image"
COM_CONFIG_FIELD_OFFLINE_MESSAGE_LABEL="Custom Message"
COM_CONFIG_FIELD_PROXY_ENABLE_LABEL="Enable Outbound Proxy"
COM_CONFIG_FIELD_PROXY_ENABLE_DESC="Some hosts do not allow any network access from your site to the outside world by default and require you to manually configure an outbound proxy."
COM_CONFIG_FIELD_PROXY_HOST_LABEL="Outbound Proxy Host"
COM_CONFIG_FIELD_PROXY_HOST_DESC="Host (domain) name or IP address."
COM_CONFIG_FIELD_PROXY_PASSWORD_LABEL="Outbound Proxy Password"
COM_CONFIG_FIELD_PROXY_PORT_LABEL="Outbound Proxy Port"
COM_CONFIG_FIELD_PROXY_USERNAME_LABEL="Outbound Proxy Username"
COM_CONFIG_FIELD_PROXY_USERNAME_DESC="Leave blank if your outbound proxy does not require authentication."
COM_CONFIG_FIELD_REDIS_AUTH_LABEL="Redis Server Authentication"
COM_CONFIG_FIELD_REDIS_DB_LABEL="Redis Database"
COM_CONFIG_FIELD_REDIS_HOST_LABEL="Redis Server Host/Sock"
COM_CONFIG_FIELD_REDIS_PERSISTENT_LABEL="Persistent Redis"
COM_CONFIG_FIELD_REDIS_PORT_DESC="Port discarded if connecting to Redis server over Unix sockets."
COM_CONFIG_FIELD_REDIS_PORT_LABEL="Redis Server Port"
COM_CONFIG_FIELD_SEF_REWRITE_DESC="Apache: Rename htaccess.txt to .htaccess<br>IIS: Rename web.config.txt to web.config"
COM_CONFIG_FIELD_SEF_REWRITE_NOTE="Apache and Litespeed: Rename <code>htaccess.txt</code> to <code>.htaccess</code><br>IIS: Rename <code>web.config.txt</code> to <code>web.config</code><br>NginX: you must <a href=\"https://docs.joomla.org/Nginx\" target=\"_blank\">configure your server</a>.<br>Other servers or if unsure: please consult your hosting company."
COM_CONFIG_FIELD_SEF_REWRITE_LABEL="Use URL Rewriting"
COM_CONFIG_FIELD_SEF_REWRITE_DESC="Removes the <code>index.php/</code> part from the URLs."
COM_CONFIG_FIELD_SEF_SUFFIX_LABEL="Add Suffix to URL"
COM_CONFIG_FIELD_SEF_SUFFIX_DESC="By default, Joomla URLs are “bare”, without an extension. This options tells Joomla to add an extension such as <code>.html</code>, <code>.feed</code> etc based on the type of content being displayed by the URL."
COM_CONFIG_FIELD_SEF_URL_LABEL="Search Engine Friendly URLs"
COM_CONFIG_FIELD_SEF_URL_DESC="Joomla URLs normally look like <code>index.php?option=com_example&task=item.display&id=1</code> which isn't easy to convey verbally or in writing. Search Engine Friendly (SEF) URLs are more human–readable, e.g. <code>index.php/example/display/something</code>."
COM_CONFIG_FIELD_SERVER_TIMEZONE_LABEL="Website Time Zone"
COM_CONFIG_FIELD_SERVER_TIMEZONE_DESC="Used by default to display dates and times (Joomla stores them internally as UTC). This can be different than the time zone of your server. Users can override their preferred time zone in their user profile."
COM_CONFIG_FIELD_SESSION_HANDLER_LABEL="Session Handler"
COM_CONFIG_FIELD_SESSION_METADATA_DESC="If enabled, additional metadata about a user's session (including their username, user ID, and which application they are logged into) will be logged to the session database table.<br>If disabled, features dependent on this data will be unavailable."
COM_CONFIG_FIELD_SESSION_METADATA_LABEL="Track Session Metadata"
Expand All @@ -159,7 +178,9 @@ COM_CONFIG_FIELD_SITE_OFFLINE_LABEL="Site Offline"
COM_CONFIG_FIELD_SITENAME_PAGETITLES_LABEL="Site Name in Page Titles"
COM_CONFIG_FIELD_SUBJECT_LABEL="Subject"
COM_CONFIG_FIELD_TEMP_PATH_LABEL="Path to Temp Folder"
COM_CONFIG_FIELD_TEMP_PATH_DESC="Joomla needs to temporarily store some files to perform actions such as installing / updating extensions or uploading files. Enter the absolute path of a directory that is writeable be PHP. <em>Do not</em> use the system–wide temporary folder (e.g. <code>/tmp</code>) for security reasons."
COM_CONFIG_FIELD_UNICODESLUGS_LABEL="Unicode Aliases"
COM_CONFIG_FIELD_UNICODESLUGS_DESC="No: Joomla transliterates aliases which contain non–latin-1 characters using the transliteration engine provided by the Joomla language pack for the content's selected language, e.g. über becomes ueber for en-GB (English, Great Britain). Yes: Joomla does not transliterate aliases; the alias is used as is, e.g. über remains as–is."
COM_CONFIG_FIELD_VALUE_ADMINISTRATOR_ONLY="Administrator Only"
COM_CONFIG_FIELD_VALUE_AFTER="After"
COM_CONFIG_FIELD_VALUE_AUTHOR_EMAIL="Author Email"
Expand Down Expand Up @@ -189,6 +210,7 @@ COM_CONFIG_FIELD_WEBSERVICES_CORS_ALLOW_ORIGIN_DESC="Specifies the origin allowe
COM_CONFIG_FIELDSET_TAGS_LABEL="Tags"
COM_CONFIG_FILTER_OPTION_SELECT_EXTENSION="- Select Extension -"
COM_CONFIG_FRONTEDITING_LABEL="Frontend Editing"
COM_CONFIG_FRONTEDITING_DESC="Joomla can show an overlay in the public front–end, visible only to users with edit privileges, to directly modify the configuration of each module and/or menu displayed on the site. Set to “None” to disable this feature."
COM_CONFIG_FRONTEDITING_MENUSANDMODULES="Modules & Menus"
COM_CONFIG_FRONTEDITING_MODULES="Modules"
COM_CONFIG_GLOBAL_CONFIGURATION="Global Configuration"
Expand Down
3 changes: 2 additions & 1 deletion administrator/language/en-GB/joomla.ini
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ JFEATURED="Featured"
JFEATURED_ASC="Featured ascending"
JFEATURED_DESC="Featured descending"
JHELP="Help"
JINLINEHELP="Toggle Inline Help"
JHIDE="Hide"
JHIDEPASSWORD="Hide Password"
JINVALID_TOKEN="The most recent request was denied because it had an invalid security token. Please refresh the page and try again."
Expand Down Expand Up @@ -260,7 +261,7 @@ JFIELD_META_DESCRIPTION_DESC="An optional paragraph to be used as the descriptio
JFIELD_META_DESCRIPTION_LABEL="Meta Description"
JFIELD_META_KEYWORDS_DESC="An optional comma-separated list of keywords and/or phrases to be used in the HTML output."
JFIELD_META_KEYWORDS_LABEL="Keywords"
JFIELD_META_RIGHTS_DESC="Describe what rights others have to use this content."
JFIELD_META_RIGHTS_DESC="Describe what rights others have to use this content. This is conveyed to search engines using the <code>rights</code> meta tag in the HTML head."
JFIELD_META_RIGHTS_LABEL="Content Rights"
JFIELD_METADATA_AUTHOR_DESC="The author of this content."
JFIELD_METADATA_RIGHTS_DESC="Publication rights for the content."
Expand Down
Loading