diff --git a/administrator/language/en-GB/en-GB.com_fields.ini b/administrator/language/en-GB/en-GB.com_fields.ini index 3b67141e7312a..dc6d54ae99be7 100644 --- a/administrator/language/en-GB/en-GB.com_fields.ini +++ b/administrator/language/en-GB/en-GB.com_fields.ini @@ -50,6 +50,7 @@ COM_FIELDS_FIELD_SHOW_ON_LABEL="Show On" COM_FIELDS_FIELD_SHOW_ON_SITE="Site" COM_FIELDS_FIELD_TYPE_DESC="The type of the field." COM_FIELDS_FIELD_TYPE_LABEL="Type" +COM_FIELDS_FIELD_USE_GLOBAL="Use from Plugin" COM_FIELDS_GROUP_PERMISSION_CREATE_DESC="New setting for create actions in this field group and the calculated setting based on the parent extension permissions." COM_FIELDS_GROUP_PERMISSION_DELETE_DESC="New setting for delete actions on this field group and the calculated setting based on the parent extension permissions." COM_FIELDS_GROUP_PERMISSION_EDITOWN_DESC="New setting for edit own actions on this field group and the calculated setting based on the parent extension permissions." diff --git a/administrator/language/en-GB/en-GB.lib_joomla.ini b/administrator/language/en-GB/en-GB.lib_joomla.ini index 6122aa41c88fd..40806b5226615 100644 --- a/administrator/language/en-GB/en-GB.lib_joomla.ini +++ b/administrator/language/en-GB/en-GB.lib_joomla.ini @@ -295,6 +295,14 @@ JLIB_FILESYSTEM_ERROR_STREAMS_FAILED_TO_OPEN_WRITER="Failed to open writer: %s" JLIB_FILESYSTEM_ERROR_STREAMS_FAILED_TO_OPEN_READER="Failed to open reader: %s" JLIB_FILESYSTEM_ERROR_STREAMS_NOT_UPLOADED_FILE="Not an uploaded file!" +JLIB_FILTER_PARAMS_ALNUM="Alpha Numeric" +JLIB_FILTER_PARAMS_FLOAT="Float" +JLIB_FILTER_PARAMS_INTEGER="Integer" +JLIB_FILTER_PARAMS_RAW="Raw" +JLIB_FILTER_PARAMS_SAFEHTML="Safe HTML" +JLIB_FILTER_PARAMS_TEL="Telephone" +JLIB_FILTER_PARAMS_TEXT="Text" + JLIB_FORM_BUTTON_CLEAR="Clear" JLIB_FORM_BUTTON_SELECT="Select" JLIB_FORM_CHANGE_IMAGE="Change Image" diff --git a/administrator/language/en-GB/en-GB.plg_fields_editor.ini b/administrator/language/en-GB/en-GB.plg_fields_editor.ini index 529078d231d73..507756b5b682c 100644 --- a/administrator/language/en-GB/en-GB.plg_fields_editor.ini +++ b/administrator/language/en-GB/en-GB.plg_fields_editor.ini @@ -7,20 +7,12 @@ PLG_FIELDS_EDITOR="Fields - Editor" PLG_FIELDS_EDITOR_LABEL="Editor (%s)" PLG_FIELDS_EDITOR_PARAMS_BUTTONS_HIDE_DESC="Comma separated list of editors-xtd plugin buttons to be hidden." PLG_FIELDS_EDITOR_PARAMS_BUTTONS_HIDE_LABEL="Hide Buttons" -PLG_FIELDS_EDITOR_PARAMS_FILTER_ALNUM="Alpha Numeric" PLG_FIELDS_EDITOR_PARAMS_FILTER_DESC="Allow the system to save certain html tags or raw data." -PLG_FIELDS_EDITOR_PARAMS_FILTER_FLOAT="Float" -PLG_FIELDS_EDITOR_PARAMS_FILTER_INTEGER="Integer" PLG_FIELDS_EDITOR_PARAMS_FILTER_LABEL="Filter" -PLG_FIELDS_EDITOR_PARAMS_FILTER_RAW="Raw" -PLG_FIELDS_EDITOR_PARAMS_FILTER_SAFEHTML="Safe HTML" -PLG_FIELDS_EDITOR_PARAMS_FILTER_TEL="Telephone" -PLG_FIELDS_EDITOR_PARAMS_FILTER_TEXT="Text" PLG_FIELDS_EDITOR_PARAMS_HEIGHT_DESC="Defines the height (in pixels) of the WYSIWYG editor and defaults to 250px." PLG_FIELDS_EDITOR_PARAMS_HEIGHT_LABEL="Height" PLG_FIELDS_EDITOR_PARAMS_SHOW_BUTTONS_DESC="Should the editors-xtd plugin buttons be shown?" PLG_FIELDS_EDITOR_PARAMS_SHOW_BUTTONS_LABEL="Show Buttons" -PLG_FIELDS_EDITOR_PARAMS_USE_GLOBAL="Use From Plugin" PLG_FIELDS_EDITOR_PARAMS_WIDTH_DESC="Defines the width (in pixels) of the WYSIWYG editor and defaults to 100%." PLG_FIELDS_EDITOR_PARAMS_WIDTH_LABEL="Width" PLG_FIELDS_EDITOR_XML_DESCRIPTION="This plugin lets you create new fields of type 'editor' in any extensions where custom fields are supported." diff --git a/administrator/language/en-GB/en-GB.plg_fields_imagelist.ini b/administrator/language/en-GB/en-GB.plg_fields_imagelist.ini index 8d8d0ce8a9ad7..6dc9c268b718d 100644 --- a/administrator/language/en-GB/en-GB.plg_fields_imagelist.ini +++ b/administrator/language/en-GB/en-GB.plg_fields_imagelist.ini @@ -11,5 +11,4 @@ PLG_FIELDS_IMAGELIST_PARAMS_IMAGE_CLASS_DESC="The class which is added to the im PLG_FIELDS_IMAGELIST_PARAMS_IMAGE_CLASS_LABEL="Image Class" PLG_FIELDS_IMAGELIST_PARAMS_MULTIPLE_DESC="Allow multiple values to be selected." PLG_FIELDS_IMAGELIST_PARAMS_MULTIPLE_LABEL="Multiple" -PLG_FIELDS_IMAGELIST_PARAMS_USE_GLOBAL="Use From Plugin" PLG_FIELDS_IMAGELIST_XML_DESCRIPTION="This plugin lets you create new fields of type 'imagelist' in any extensions where custom fields are supported." diff --git a/administrator/language/en-GB/en-GB.plg_fields_integer.ini b/administrator/language/en-GB/en-GB.plg_fields_integer.ini index 79e3859657cb2..ab7e155b618ee 100644 --- a/administrator/language/en-GB/en-GB.plg_fields_integer.ini +++ b/administrator/language/en-GB/en-GB.plg_fields_integer.ini @@ -13,5 +13,4 @@ PLG_FIELDS_INTEGER_PARAMS_MULTIPLE_DESC="Allow multiple values to be selected." PLG_FIELDS_INTEGER_PARAMS_MULTIPLE_LABEL="Multiple" PLG_FIELDS_INTEGER_PARAMS_STEP_DESC="Each option will be the previous option incremented by this integer, starting with the first value until the last value is reached." PLG_FIELDS_INTEGER_PARAMS_STEP_LABEL="Step" -PLG_FIELDS_INTEGER_PARAMS_USE_GLOBAL="Use From Plugin" PLG_FIELDS_INTEGER_XML_DESCRIPTION="This plugin lets you create new fields of type 'integer' in any extensions where custom fields are supported." diff --git a/administrator/language/en-GB/en-GB.plg_fields_media.ini b/administrator/language/en-GB/en-GB.plg_fields_media.ini index c0d0ed9b9f0a2..022d21b21ef1a 100644 --- a/administrator/language/en-GB/en-GB.plg_fields_media.ini +++ b/administrator/language/en-GB/en-GB.plg_fields_media.ini @@ -13,5 +13,4 @@ PLG_FIELDS_MEDIA_PARAMS_PREVIEW_DESC="Shows or hides the preview of the selected PLG_FIELDS_MEDIA_PARAMS_PREVIEW_INLINE="Inline" PLG_FIELDS_MEDIA_PARAMS_PREVIEW_LABEL="Preview" PLG_FIELDS_MEDIA_PARAMS_PREVIEW_TOOLTIP="Tooltip" -PLG_FIELDS_MEDIA_PARAMS_USE_GLOBAL="Use From Plugin" PLG_FIELDS_MEDIA_XML_DESCRIPTION="This plugin lets you create new fields of type 'media' in any extensions where custom fields are supported." diff --git a/administrator/language/en-GB/en-GB.plg_fields_sql.ini b/administrator/language/en-GB/en-GB.plg_fields_sql.ini index b0a57ddad8b74..416ca8b7219d7 100644 --- a/administrator/language/en-GB/en-GB.plg_fields_sql.ini +++ b/administrator/language/en-GB/en-GB.plg_fields_sql.ini @@ -9,5 +9,4 @@ PLG_FIELDS_SQL_PARAMS_MULTIPLE_DESC="Allow multiple values to be selected." PLG_FIELDS_SQL_PARAMS_MULTIPLE_LABEL="Multiple" PLG_FIELDS_SQL_PARAMS_QUERY_DESC="The SQL query which will provide the data for the dropdown list. The query must return two columns; one called 'value' which will hold the values of the list items; the other called 'text' containing the text in the dropdown list." PLG_FIELDS_SQL_PARAMS_QUERY_LABEL="Query" -PLG_FIELDS_SQL_PARAMS_USE_GLOBAL="Use From Plugin" PLG_FIELDS_SQL_XML_DESCRIPTION="This plugin lets you create new fields of type 'sql' in any extensions where custom fields are supported." diff --git a/administrator/language/en-GB/en-GB.plg_fields_text.ini b/administrator/language/en-GB/en-GB.plg_fields_text.ini index d40e00b4189f2..8f6afcdcdddaf 100644 --- a/administrator/language/en-GB/en-GB.plg_fields_text.ini +++ b/administrator/language/en-GB/en-GB.plg_fields_text.ini @@ -5,14 +5,6 @@ PLG_FIELDS_TEXT="Fields - Text" PLG_FIELDS_TEXT_LABEL="Text (%s)" -PLG_FIELDS_TEXT_PARAMS_FILTER_ALNUM="Alpha Numeric" PLG_FIELDS_TEXT_PARAMS_FILTER_DESC="Allow the system to save certain html tags or raw data." -PLG_FIELDS_TEXT_PARAMS_FILTER_FLOAT="Float" -PLG_FIELDS_TEXT_PARAMS_FILTER_INTEGER="Integer" PLG_FIELDS_TEXT_PARAMS_FILTER_LABEL="Filter" -PLG_FIELDS_TEXT_PARAMS_FILTER_RAW="Raw" -PLG_FIELDS_TEXT_PARAMS_FILTER_SAFEHTML="Safe HTML" -PLG_FIELDS_TEXT_PARAMS_FILTER_TEL="Telephone" -PLG_FIELDS_TEXT_PARAMS_FILTER_TEXT="Text" -PLG_FIELDS_TEXT_PARAMS_USE_GLOBAL="Use From Plugin" PLG_FIELDS_TEXT_XML_DESCRIPTION="This plugin lets you create new fields of type 'text' in any extensions where custom fields are supported." diff --git a/administrator/language/en-GB/en-GB.plg_fields_textarea.ini b/administrator/language/en-GB/en-GB.plg_fields_textarea.ini index 1ffb34378c1b3..f88d2e6825415 100644 --- a/administrator/language/en-GB/en-GB.plg_fields_textarea.ini +++ b/administrator/language/en-GB/en-GB.plg_fields_textarea.ini @@ -7,16 +7,8 @@ PLG_FIELDS_TEXTAREA="Fields - Textarea" PLG_FIELDS_TEXTAREA_LABEL="Text Area (%s)" PLG_FIELDS_TEXTAREA_PARAMS_COLS_DESC="The number of columns of the field." PLG_FIELDS_TEXTAREA_PARAMS_COLS_LABEL="Columns" -PLG_FIELDS_TEXTAREA_PARAMS_FILTER_ALNUM="Alpha Numeric" PLG_FIELDS_TEXTAREA_PARAMS_FILTER_DESC="Allow the system to save certain html tags or raw data." -PLG_FIELDS_TEXTAREA_PARAMS_FILTER_FLOAT="Float" -PLG_FIELDS_TEXTAREA_PARAMS_FILTER_INTEGER="Integer" PLG_FIELDS_TEXTAREA_PARAMS_FILTER_LABEL="Filter" -PLG_FIELDS_TEXTAREA_PARAMS_FILTER_RAW="Raw" -PLG_FIELDS_TEXTAREA_PARAMS_FILTER_SAFEHTML="Safe HTML" -PLG_FIELDS_TEXTAREA_PARAMS_FILTER_TEL="Telephone" -PLG_FIELDS_TEXTAREA_PARAMS_FILTER_TEXT="Text" PLG_FIELDS_TEXTAREA_PARAMS_ROWS_DESC="The number of rows of the field." PLG_FIELDS_TEXTAREA_PARAMS_ROWS_LABEL="Rows" -PLG_FIELDS_TEXTAREA_PARAMS_USE_GLOBAL="Use From Plugin" PLG_FIELDS_TEXTAREA_XML_DESCRIPTION="This plugin lets you create new fields of type 'textarea' in any extensions where custom fields are supported." diff --git a/administrator/language/en-GB/en-GB.plg_fields_url.ini b/administrator/language/en-GB/en-GB.plg_fields_url.ini index d522a80a66f98..d6840e557d1d6 100644 --- a/administrator/language/en-GB/en-GB.plg_fields_url.ini +++ b/administrator/language/en-GB/en-GB.plg_fields_url.ini @@ -9,5 +9,4 @@ PLG_FIELDS_URL_PARAMS_RELATIVE_DESC="Are relative URLs allowed." PLG_FIELDS_URL_PARAMS_RELATIVE_LABEL="Relative" PLG_FIELDS_URL_PARAMS_SCHEMES_DESC="The allowed schemes." PLG_FIELDS_URL_PARAMS_SCHEMES_LABEL="Schemes" -PLG_FIELDS_URL_PARAMS_USE_GLOBAL="Use From Plugin" PLG_FIELDS_URL_XML_DESCRIPTION="This plugin lets you create new fields of type 'url' in any extensions where custom fields are supported." diff --git a/administrator/language/en-GB/en-GB.plg_fields_usergrouplist.ini b/administrator/language/en-GB/en-GB.plg_fields_usergrouplist.ini index 6dac7cbcb5a27..ee48a11f19b60 100644 --- a/administrator/language/en-GB/en-GB.plg_fields_usergrouplist.ini +++ b/administrator/language/en-GB/en-GB.plg_fields_usergrouplist.ini @@ -7,5 +7,4 @@ PLG_FIELDS_USERGROUPLIST="Fields - Usergrouplist" PLG_FIELDS_USERGROUPLIST_LABEL="User Groups (%s)" PLG_FIELDS_USERGROUPLIST_PARAMS_MULTIPLE_DESC="Allow multiple values to be selected." PLG_FIELDS_USERGROUPLIST_PARAMS_MULTIPLE_LABEL="Multiple" -PLG_FIELDS_USERGROUPLIST_PARAMS_USE_GLOBAL="Use From Plugin" PLG_FIELDS_USERGROUPLIST_XML_DESCRIPTION="This plugin lets you create new fields of type 'usergrouplist' in any extensions where custom fields are supported." diff --git a/language/en-GB/en-GB.lib_joomla.ini b/language/en-GB/en-GB.lib_joomla.ini index 6620835ada766..81abfbc7b57fe 100644 --- a/language/en-GB/en-GB.lib_joomla.ini +++ b/language/en-GB/en-GB.lib_joomla.ini @@ -295,6 +295,14 @@ JLIB_FILESYSTEM_ERROR_STREAMS_FAILED_TO_OPEN_WRITER="Failed to open writer: %s" JLIB_FILESYSTEM_ERROR_STREAMS_FAILED_TO_OPEN_READER="Failed to open reader: %s" JLIB_FILESYSTEM_ERROR_STREAMS_NOT_UPLOADED_FILE="Not an uploaded file!" +JLIB_FILTER_PARAMS_RAW="Raw" +JLIB_FILTER_PARAMS_SAFEHTML="Safe HTML" +JLIB_FILTER_PARAMS_TEXT="Text" +JLIB_FILTER_PARAMS_ALNUM="Alpha Numeric" +JLIB_FILTER_PARAMS_INTEGER="Integer" +JLIB_FILTER_PARAMS_FLOAT="Float" +JLIB_FILTER_PARAMS_TEL="Telephone" + JLIB_FORM_BUTTON_CLEAR="Clear" JLIB_FORM_BUTTON_SELECT="Select" JLIB_FORM_CHANGE_IMAGE="Change Image" @@ -317,8 +325,8 @@ JLIB_FORM_SELECT_USER="Select a User" JLIB_FORM_VALIDATE_FIELD_INVALID="Invalid field: %s" JLIB_FORM_VALIDATE_FIELD_REQUIRED="Field required: %s" JLIB_FORM_VALIDATE_FIELD_RULE_MISSING="Validation Rule missing: %s" -JLIB_FORM_VALUE_CACHE_APC="Alternative PHP Cache" JLIB_FORM_VALIDATE_FIELD_URL_SCHEMA_MISSING="Invalid URL: URL schema is missing in %1$s. Please add one of the following at the beginning: %2$s." +JLIB_FORM_VALUE_CACHE_APC="Alternative PHP Cache" JLIB_FORM_VALUE_CACHE_APCU="APC User Cache" JLIB_FORM_VALUE_CACHE_CACHELITE="Cache_Lite" JLIB_FORM_VALUE_CACHE_EACCELERATOR="eAccelerator" diff --git a/plugins/fields/editor/editor.xml b/plugins/fields/editor/editor.xml index eeb0c40423189..13eff3fe54af0 100644 --- a/plugins/fields/editor/editor.xml +++ b/plugins/fields/editor/editor.xml @@ -69,13 +69,9 @@ description="PLG_FIELDS_EDITOR_PARAMS_FILTER_DESC" > - - - - - - - + + + diff --git a/plugins/fields/editor/params/editor.xml b/plugins/fields/editor/params/editor.xml index 75cac32447db8..1e4be443f6d1e 100644 --- a/plugins/fields/editor/params/editor.xml +++ b/plugins/fields/editor/params/editor.xml @@ -45,15 +45,11 @@ label="PLG_FIELDS_TEXT_PARAMS_FILTER_LABEL" description="PLG_FIELDS_TEXT_PARAMS_FILTER_DESC" > - + - - - - - - - + + + diff --git a/plugins/fields/imagelist/params/imagelist.xml b/plugins/fields/imagelist/params/imagelist.xml index d79f2e94c4563..afc1cf9b6e45f 100644 --- a/plugins/fields/imagelist/params/imagelist.xml +++ b/plugins/fields/imagelist/params/imagelist.xml @@ -22,7 +22,7 @@ label="PLG_FIELDS_IMAGELIST_PARAMS_MULTIPLE_LABEL" description="PLG_FIELDS_IMAGELIST_PARAMS_MULTIPLE_DESC" > - + diff --git a/plugins/fields/integer/params/integer.xml b/plugins/fields/integer/params/integer.xml index c748d27e9189a..637da7719b5f2 100644 --- a/plugins/fields/integer/params/integer.xml +++ b/plugins/fields/integer/params/integer.xml @@ -8,7 +8,7 @@ label="PLG_FIELDS_INTEGER_PARAMS_MULTIPLE_LABEL" description="PLG_FIELDS_INTEGER_PARAMS_MULTIPLE_DESC" > - + diff --git a/plugins/fields/media/params/media.xml b/plugins/fields/media/params/media.xml index 3bd676b84329d..fc454e937feb9 100644 --- a/plugins/fields/media/params/media.xml +++ b/plugins/fields/media/params/media.xml @@ -18,7 +18,7 @@ label="PLG_FIELDS_MEDIA_PARAMS_PREVIEW_LABEL" description="PLG_FIELDS_MEDIA_PARAMS_PREVIEW_DESC" > - + diff --git a/plugins/fields/sql/params/sql.xml b/plugins/fields/sql/params/sql.xml index 661cf6ce30d36..d9622b98d6c05 100644 --- a/plugins/fields/sql/params/sql.xml +++ b/plugins/fields/sql/params/sql.xml @@ -18,7 +18,7 @@ label="PLG_FIELDS_SQL_PARAMS_MULTIPLE_LABEL" description="PLG_FIELDS_SQL_PARAMS_MULTIPLE_DESC" > - + diff --git a/plugins/fields/text/params/text.xml b/plugins/fields/text/params/text.xml index 34616c7da9885..98c711f392336 100644 --- a/plugins/fields/text/params/text.xml +++ b/plugins/fields/text/params/text.xml @@ -9,15 +9,15 @@ label="PLG_FIELDS_TEXT_PARAMS_FILTER_LABEL" description="PLG_FIELDS_TEXT_PARAMS_FILTER_DESC" > - + - - - - - - - + + + + + + + diff --git a/plugins/fields/text/text.xml b/plugins/fields/text/text.xml index b9b6b3a524186..b948ec8b88726 100644 --- a/plugins/fields/text/text.xml +++ b/plugins/fields/text/text.xml @@ -30,13 +30,13 @@ description="PLG_FIELDS_TEXT_PARAMS_FILTER_DESC" > - - - - - - - + + + + + + + diff --git a/plugins/fields/textarea/params/textarea.xml b/plugins/fields/textarea/params/textarea.xml index a66dd2020556c..798524221364c 100644 --- a/plugins/fields/textarea/params/textarea.xml +++ b/plugins/fields/textarea/params/textarea.xml @@ -25,15 +25,15 @@ label="PLG_FIELDS_TEXTAREA_PARAMS_FILTER_LABEL" description="PLG_FIELDS_TEXTAREA_PARAMS_FILTER_DESC" > - + - - - - - - - + + + + + + + diff --git a/plugins/fields/textarea/textarea.xml b/plugins/fields/textarea/textarea.xml index b1b5bd4787674..0d3e210bde035 100644 --- a/plugins/fields/textarea/textarea.xml +++ b/plugins/fields/textarea/textarea.xml @@ -48,13 +48,13 @@ description="PLG_FIELDS_TEXTAREA_PARAMS_FILTER_DESC" > - - - - - - - + + + + + + + diff --git a/plugins/fields/url/params/url.xml b/plugins/fields/url/params/url.xml index 9528261733e52..d8cd96d0c000c 100644 --- a/plugins/fields/url/params/url.xml +++ b/plugins/fields/url/params/url.xml @@ -24,7 +24,7 @@ label="PLG_FIELDS_URL_PARAMS_RELATIVE_LABEL" description="PLG_FIELDS_URL_PARAMS_RELATIVE_DESC" > - + diff --git a/plugins/fields/usergrouplist/params/usergrouplist.xml b/plugins/fields/usergrouplist/params/usergrouplist.xml index 8adc49b6b82f7..da15d536254e7 100644 --- a/plugins/fields/usergrouplist/params/usergrouplist.xml +++ b/plugins/fields/usergrouplist/params/usergrouplist.xml @@ -8,7 +8,7 @@ label="PLG_FIELDS_USERGROUPLIST_PARAMS_MULTIPLE_LABEL" description="PLG_FIELDS_USERGROUPLIST_PARAMS_MULTIPLE_DESC" > - +