From 34d14ed95d5569508d5036c9f6f182d6291d14cd Mon Sep 17 00:00:00 2001 From: dev Date: Wed, 5 Apr 2017 14:21:10 +0100 Subject: [PATCH] gh-60 language translation component added, basic implementation --- README.md | 6 +- admin/README.txt | 6 +- admin/access.xml | 43 ++- admin/assets/css/admin.css | 2 +- admin/assets/css/custom_code.css | 4 +- admin/assets/css/custom_codes.css | 4 +- admin/assets/css/dashboard.css | 2 +- admin/assets/css/joomla_component.css | 4 +- admin/assets/css/joomla_components.css | 4 +- ...aceholder.css => language_translation.css} | 6 +- ...eholders.css => language_translations.css} | 6 +- .../images/icons/language_placeholder_add.png | Bin 43823 -> 0 bytes ...eholders.png => language_translations.png} | Bin admin/compiler/joomla_3/component.xml | 6 +- admin/compiler/joomla_3/settings.json | 24 -- admin/componentbuilder.php | 7 +- admin/controller.php | 4 +- admin/controllers/ajax.json.php | 83 +++++- admin/controllers/componentbuilder.php | 2 +- admin/controllers/custom_code.php | 4 +- admin/controllers/custom_codes.php | 4 +- admin/controllers/help.php | 2 +- admin/controllers/import.php | 2 +- .../controllers/import_joomla_components.php | 2 +- admin/controllers/joomla_component.php | 4 +- admin/controllers/joomla_components.php | 4 +- ...aceholder.php => language_translation.php} | 30 +- ...eholders.php => language_translations.php} | 36 +-- admin/helpers/compiler.php | 10 +- admin/helpers/compiler/a_Get.php | 258 +++++++++++++++++- admin/helpers/compiler/c_Fields.php | 2 +- admin/helpers/compiler/e_Interpretation.php | 97 +++---- admin/helpers/compiler/f_Infusion.php | 135 +++++++-- admin/helpers/componentbuilder.php | 76 +++++- admin/helpers/headercheck.php | 2 +- admin/helpers/html/batch_.php | 2 +- admin/helpers/indenter.php | 2 +- admin/helpers/js.php | 2 +- admin/helpers/minify.php | 2 +- .../en-GB/en-GB.com_componentbuilder.ini | 169 ++++++------ .../en-GB/en-GB.com_componentbuilder.sys.ini | 2 +- admin/layouts/admin_view/css_fullwidth.php | 2 +- .../admin_view/custom_buttons_fullwidth.php | 2 +- .../admin_view/custom_buttons_left.php | 2 +- .../admin_view/custom_import_fullwidth.php | 2 +- admin/layouts/admin_view/fields_fullwidth.php | 2 +- .../admin_view/javascript_fullwidth.php | 2 +- .../linked_components_fullwidth.php | 2 +- admin/layouts/admin_view/mysql_fullwidth.php | 2 +- admin/layouts/admin_view/mysql_left.php | 2 +- admin/layouts/admin_view/php_fullwidth.php | 2 +- admin/layouts/admin_view/publishing.php | 2 +- admin/layouts/admin_view/publlshing.php | 2 +- admin/layouts/admin_view/settings_above.php | 2 +- admin/layouts/admin_view/settings_left.php | 2 +- admin/layouts/admin_view/settings_right.php | 2 +- admin/layouts/admin_view/settings_under.php | 2 +- admin/layouts/batchselection.php | 2 +- .../custom_buttons_fullwidth.php | 2 +- .../custom_admin_view/custom_buttons_left.php | 2 +- .../custom_script_fullwidth.php | 2 +- .../custom_admin_view/details_above.php | 2 +- .../custom_admin_view/details_fullwidth.php | 2 +- .../custom_admin_view/details_left.php | 2 +- .../custom_admin_view/details_right.php | 2 +- .../custom_admin_view/details_rightside.php | 2 +- .../custom_admin_view/details_under.php | 2 +- .../linked_components_fullwidth.php | 2 +- .../layouts/custom_admin_view/publishing.php | 2 +- .../layouts/custom_admin_view/publlshing.php | 2 +- admin/layouts/custom_code/details_above.php | 2 +- .../layouts/custom_code/details_fullwidth.php | 2 +- admin/layouts/custom_code/details_left.php | 2 +- admin/layouts/custom_code/details_right.php | 2 +- admin/layouts/custom_code/details_under.php | 2 +- admin/layouts/custom_code/publishing.php | 2 +- admin/layouts/custom_code/publlshing.php | 2 +- .../layouts/dynamic_get/abacus_fullwidth.php | 2 +- admin/layouts/dynamic_get/abacus_left.php | 2 +- .../dynamic_get/custom_script_fullwidth.php | 2 +- admin/layouts/dynamic_get/gettable_above.php | 2 +- .../dynamic_get/gettable_fullwidth.php | 2 +- admin/layouts/dynamic_get/gettable_left.php | 2 +- admin/layouts/dynamic_get/gettable_right.php | 2 +- admin/layouts/dynamic_get/gettable_under.php | 2 +- admin/layouts/dynamic_get/publishing.php | 2 +- admin/layouts/dynamic_get/publlshing.php | 2 +- admin/layouts/field/details_fullwidth.php | 2 +- admin/layouts/field/details_left.php | 2 +- admin/layouts/field/details_right.php | 2 +- admin/layouts/field/details_under.php | 2 +- .../field/linked_admin_views_fullwidth.php | 2 +- admin/layouts/field/publishing.php | 2 +- admin/layouts/field/publlshing.php | 2 +- admin/layouts/field/scripts_left.php | 2 +- admin/layouts/field/scripts_right.php | 2 +- admin/layouts/fieldtype/details_left.php | 2 +- admin/layouts/fieldtype/details_right.php | 2 +- admin/layouts/fieldtype/fields_fullwidth.php | 2 +- admin/layouts/fieldtype/publishing.php | 2 +- admin/layouts/fieldtype/publlshing.php | 2 +- admin/layouts/help_document/details_above.php | 2 +- .../help_document/details_fullwidth.php | 2 +- admin/layouts/help_document/details_left.php | 2 +- admin/layouts/help_document/details_right.php | 2 +- admin/layouts/help_document/details_under.php | 2 +- admin/layouts/help_document/publishing.php | 2 +- admin/layouts/help_document/publlshing.php | 2 +- .../admin_views_fullwidth.php | 2 +- .../custom_admin_views_fullwidth.php | 2 +- .../joomla_component/details_above.php | 2 +- .../layouts/joomla_component/details_left.php | 2 +- .../joomla_component/details_right.php | 2 +- .../joomla_component/details_under.php | 2 +- .../dynamic_build_beta_fullwidth.php | 2 +- .../dynamic_integration_fullwidth.php | 2 +- .../libs_helpers_fullwidth.php | 2 +- .../joomla_component/mysql_fullwidth.php | 2 +- .../joomla_component/php_fullwidth.php | 2 +- admin/layouts/joomla_component/publishing.php | 2 +- admin/layouts/joomla_component/publlshing.php | 2 +- .../layouts/joomla_component/readme_left.php | 2 +- .../layouts/joomla_component/readme_right.php | 2 +- .../joomla_component/settings_left.php | 2 +- .../joomla_component/settings_right.php | 2 +- .../joomla_component/site_views_fullwidth.php | 2 +- admin/layouts/language/details_left.php | 2 +- admin/layouts/language/details_right.php | 2 +- admin/layouts/language/publishing.php | 2 +- admin/layouts/language/publlshing.php | 2 +- .../details_above.php | 2 +- .../details_fullwidth.php | 4 +- .../index.html | 0 .../publishing.php | 2 +- .../publlshing.php | 2 +- .../layout/custom_script_fullwidth.php | 2 +- admin/layouts/layout/details_fullwidth.php | 2 +- admin/layouts/layout/details_left.php | 2 +- admin/layouts/layout/details_right.php | 2 +- admin/layouts/layout/details_rightside.php | 2 +- admin/layouts/layout/details_under.php | 2 +- admin/layouts/layout/publishing.php | 2 +- admin/layouts/layout/publlshing.php | 2 +- .../site_view/custom_buttons_fullwidth.php | 2 +- .../layouts/site_view/custom_buttons_left.php | 2 +- .../site_view/custom_buttons_right.php | 2 +- admin/layouts/site_view/details_above.php | 2 +- admin/layouts/site_view/details_fullwidth.php | 2 +- admin/layouts/site_view/details_left.php | 2 +- admin/layouts/site_view/details_right.php | 2 +- admin/layouts/site_view/details_rightside.php | 2 +- admin/layouts/site_view/details_under.php | 2 +- .../site_view/javascript_css_fullwidth.php | 2 +- .../site_view/linked_components_fullwidth.php | 2 +- admin/layouts/site_view/php_fullwidth.php | 2 +- admin/layouts/site_view/publishing.php | 2 +- admin/layouts/site_view/publlshing.php | 2 +- admin/layouts/snippet/details_above.php | 2 +- admin/layouts/snippet/details_left.php | 2 +- admin/layouts/snippet/details_right.php | 2 +- admin/layouts/snippet/publishing.php | 2 +- admin/layouts/snippet/publlshing.php | 2 +- .../template/custom_script_fullwidth.php | 2 +- admin/layouts/template/details_fullwidth.php | 2 +- admin/layouts/template/details_left.php | 2 +- admin/layouts/template/details_right.php | 2 +- admin/layouts/template/details_rightside.php | 2 +- admin/layouts/template/details_under.php | 2 +- admin/layouts/template/publishing.php | 2 +- admin/layouts/template/publlshing.php | 2 +- admin/models/ajax.php | 222 ++++++++++++++- admin/models/componentbuilder.php | 15 +- admin/models/custom_code.php | 4 +- admin/models/custom_codes.php | 6 +- admin/models/fields/adminviewfolderlist.php | 2 +- admin/models/fields/adminviews.php | 2 +- admin/models/fields/articles.php | 2 +- admin/models/fields/component.php | 2 +- admin/models/fields/components.php | 2 +- admin/models/fields/customadminviews.php | 2 +- admin/models/fields/customfilelist.php | 2 +- admin/models/fields/customfolderlist.php | 2 +- admin/models/fields/customgets.php | 2 +- admin/models/fields/dbtables.php | 2 +- admin/models/fields/dynamicget.php | 2 +- admin/models/fields/dynamicgets.php | 2 +- admin/models/fields/fields.php | 2 +- admin/models/fields/fieldsmulti.php | 2 +- admin/models/fields/fieldtypes.php | 2 +- admin/models/fields/lang.php | 171 ++++++++++++ admin/models/fields/maingets.php | 2 +- admin/models/fields/siteviewfolderlist.php | 2 +- admin/models/fields/siteviews.php | 2 +- admin/models/fields/snippets.php | 2 +- admin/models/forms/custom_code.js | 4 +- admin/models/forms/custom_code.xml | 114 ++++---- admin/models/forms/joomla_component.js | 4 +- admin/models/forms/language_placeholder.js | 25 -- admin/models/forms/language_translation.js | 84 ++++++ ...aceholder.xml => language_translation.xml} | 77 +++--- admin/models/import.php | 2 +- admin/models/import_joomla_components.php | 2 +- admin/models/joomla_component.php | 4 +- admin/models/joomla_components.php | 8 +- ...aceholder.php => language_translation.php} | 82 ++++-- ...eholders.php => language_translations.php} | 42 ++- admin/sql/install.mysql.utf8.sql | 10 +- admin/sql/uninstall.mysql.utf8.sql | 2 +- admin/sql/updates/mysql/2.4.1.sql | 4 +- admin/tables/custom_code.php | 4 +- admin/tables/joomla_component.php | 4 +- ...aceholder.php => language_translation.php} | 28 +- admin/views/componentbuilder/tmpl/default.php | 2 +- ...sed_issues_the_closed_issues_on_github.php | 2 +- .../componentbuilder/tmpl/default_main.php | 2 +- ..._open_issues_the_open_issues_on_github.php | 2 +- .../tmpl/default_readme_information.php | 2 +- ...t_vast_development_method_notice_board.php | 2 +- .../componentbuilder/tmpl/default_vdm.php | 2 +- admin/views/componentbuilder/view.html.php | 2 +- admin/views/custom_code/submitbutton.js | 4 +- admin/views/custom_code/tmpl/edit.php | 7 +- admin/views/custom_code/view.html.php | 4 +- admin/views/custom_codes/tmpl/default.php | 4 +- .../custom_codes/tmpl/default_batch_body.php | 4 +- .../tmpl/default_batch_footer.php | 4 +- .../views/custom_codes/tmpl/default_body.php | 4 +- .../views/custom_codes/tmpl/default_foot.php | 4 +- .../views/custom_codes/tmpl/default_head.php | 4 +- .../custom_codes/tmpl/default_toolbar.php | 4 +- admin/views/custom_codes/view.html.php | 4 +- admin/views/import/tmpl/default.php | 2 +- admin/views/import/view.html.php | 2 +- .../import_joomla_components/tmpl/default.php | 2 +- .../import_joomla_components/view.html.php | 2 +- admin/views/joomla_component/submitbutton.js | 4 +- admin/views/joomla_component/tmpl/edit.php | 4 +- admin/views/joomla_component/view.html.php | 4 +- .../views/joomla_components/tmpl/default.php | 4 +- .../tmpl/default_batch_body.php | 4 +- .../tmpl/default_batch_footer.php | 4 +- .../joomla_components/tmpl/default_body.php | 4 +- .../joomla_components/tmpl/default_foot.php | 4 +- .../joomla_components/tmpl/default_head.php | 4 +- .../tmpl/default_toolbar.php | 4 +- admin/views/joomla_components/view.html.php | 4 +- .../submitbutton.js | 6 +- .../tmpl/edit.php | 54 +++- .../tmpl/index.html | 0 .../view.html.php | 75 ++--- .../index.html | 0 .../tmpl/default.php | 14 +- .../tmpl/default_batch_body.php | 6 +- .../tmpl/default_batch_footer.php | 6 +- .../tmpl/default_body.php | 30 +- .../tmpl/default_foot.php | 4 +- .../tmpl/default_head.php | 14 +- .../tmpl/default_toolbar.php | 6 +- .../tmpl/index.html | 0 .../view.html.php | 62 ++--- componentbuilder.xml | 6 +- script.php | 132 ++++----- 262 files changed, 1876 insertions(+), 928 deletions(-) rename admin/assets/css/{language_placeholder.css => language_translation.css} (92%) rename admin/assets/css/{language_placeholders.css => language_translations.css} (92%) delete mode 100644 admin/assets/images/icons/language_placeholder_add.png rename admin/assets/images/icons/{language_placeholders.png => language_translations.png} (100%) rename admin/controllers/{language_placeholder.php => language_translation.php} (85%) rename admin/controllers/{language_placeholders.php => language_translations.php} (78%) rename admin/layouts/{language_placeholder => language_translation}/details_above.php (96%) rename admin/layouts/{language_placeholder => language_translation}/details_fullwidth.php (96%) rename admin/layouts/{language_placeholder => language_translation}/index.html (100%) rename admin/layouts/{language_placeholder => language_translation}/publishing.php (96%) rename admin/layouts/{language_placeholder => language_translation}/publlshing.php (96%) create mode 100644 admin/models/fields/lang.php delete mode 100644 admin/models/forms/language_placeholder.js create mode 100644 admin/models/forms/language_translation.js rename admin/models/forms/{language_placeholder.xml => language_translation.xml} (64%) rename admin/models/{language_placeholder.php => language_translation.php} (87%) rename admin/models/{language_placeholders.php => language_translations.php} (84%) rename admin/tables/{language_placeholder.php => language_translation.php} (88%) rename admin/views/{language_placeholder => language_translation}/submitbutton.js (92%) rename admin/views/{language_placeholder => language_translation}/tmpl/edit.php (74%) rename admin/views/{language_placeholder => language_translation}/tmpl/index.html (100%) rename admin/views/{language_placeholder => language_translation}/view.html.php (65%) rename admin/views/{language_placeholders => language_translations}/index.html (100%) rename admin/views/{language_placeholders => language_translations}/tmpl/default.php (90%) rename admin/views/{language_placeholders => language_translations}/tmpl/default_batch_body.php (90%) rename admin/views/{language_placeholders => language_translations}/tmpl/default_batch_footer.php (93%) rename admin/views/{language_placeholders => language_translations}/tmpl/default_body.php (81%) rename admin/views/{language_placeholders => language_translations}/tmpl/default_foot.php (95%) rename admin/views/{language_placeholders => language_translations}/tmpl/default_head.php (86%) rename admin/views/{language_placeholders => language_translations}/tmpl/default_toolbar.php (96%) rename admin/views/{language_placeholders => language_translations}/tmpl/index.html (100%) rename admin/views/{language_placeholders => language_translations}/view.html.php (83%) diff --git a/README.md b/README.md index 883b3b30f..f83377068 100644 --- a/README.md +++ b/README.md @@ -105,12 +105,12 @@ Component Builder is mapped as a component in itself on my local development env + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io) + *Name*: [Component Builder](http://vdm.bz/component-builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 3rd April, 2017 ++ *Last Build*: 5th April, 2017 + *Version*: 2.4.2 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html -+ *Line count*: **104692** -+ *File count*: **639** ++ *Line count*: **105345** ++ *File count*: **638** + *Folder count*: **115** > This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder). diff --git a/admin/README.txt b/admin/README.txt index 883b3b30f..f83377068 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -105,12 +105,12 @@ Component Builder is mapped as a component in itself on my local development env + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io) + *Name*: [Component Builder](http://vdm.bz/component-builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 3rd April, 2017 ++ *Last Build*: 5th April, 2017 + *Version*: 2.4.2 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html -+ *Line count*: **104692** -+ *File count*: **639** ++ *Line count*: **105345** ++ *File count*: **638** + *Folder count*: **115** > This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder). diff --git a/admin/access.xml b/admin/access.xml index 6be89abce..9ff76fa7e 100644 --- a/admin/access.xml +++ b/admin/access.xml @@ -113,20 +113,19 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -268,14 +267,14 @@ -
- - - - - - - +
+ + + + + + +
diff --git a/admin/assets/css/admin.css b/admin/assets/css/admin.css index 3232356c4..a1ef075bd 100644 --- a/admin/assets/css/admin.css +++ b/admin/assets/css/admin.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin.css diff --git a/admin/assets/css/custom_code.css b/admin/assets/css/custom_code.css index b4b088076..5a1ec04dc 100644 --- a/admin/assets/css/custom_code.css +++ b/admin/assets/css/custom_code.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 81 of this MVC - @build 1st March, 2017 + @version @update number 82 of this MVC + @build 3rd April, 2017 @created 11th October, 2016 @package Component Builder @subpackage custom_code.css diff --git a/admin/assets/css/custom_codes.css b/admin/assets/css/custom_codes.css index 346222347..d3cee09a1 100644 --- a/admin/assets/css/custom_codes.css +++ b/admin/assets/css/custom_codes.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 81 of this MVC - @build 1st March, 2017 + @version @update number 82 of this MVC + @build 3rd April, 2017 @created 11th October, 2016 @package Component Builder @subpackage custom_codes.css diff --git a/admin/assets/css/dashboard.css b/admin/assets/css/dashboard.css index 9431eb91f..d2bf3b477 100644 --- a/admin/assets/css/dashboard.css +++ b/admin/assets/css/dashboard.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage dashboard.css diff --git a/admin/assets/css/joomla_component.css b/admin/assets/css/joomla_component.css index a7cffa02e..b6c71c520 100644 --- a/admin/assets/css/joomla_component.css +++ b/admin/assets/css/joomla_component.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 311 of this MVC - @build 1st April, 2017 + @version @update number 314 of this MVC + @build 5th April, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_component.css diff --git a/admin/assets/css/joomla_components.css b/admin/assets/css/joomla_components.css index a4176b676..93b6a7e2b 100644 --- a/admin/assets/css/joomla_components.css +++ b/admin/assets/css/joomla_components.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 311 of this MVC - @build 1st April, 2017 + @version @update number 314 of this MVC + @build 5th April, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_components.css diff --git a/admin/assets/css/language_placeholder.css b/admin/assets/css/language_translation.css similarity index 92% rename from admin/assets/css/language_placeholder.css rename to admin/assets/css/language_translation.css index 4380e5ceb..616479971 100644 --- a/admin/assets/css/language_placeholder.css +++ b/admin/assets/css/language_translation.css @@ -9,11 +9,11 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 8 of this MVC - @build 3rd April, 2017 + @version @update number 28 of this MVC + @build 5th April, 2017 @created 3rd April, 2017 @package Component Builder - @subpackage language_placeholder.css + @subpackage language_translation.css @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/assets/css/language_placeholders.css b/admin/assets/css/language_translations.css similarity index 92% rename from admin/assets/css/language_placeholders.css rename to admin/assets/css/language_translations.css index 13d0b9fed..fc9012f38 100644 --- a/admin/assets/css/language_placeholders.css +++ b/admin/assets/css/language_translations.css @@ -9,11 +9,11 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 8 of this MVC - @build 3rd April, 2017 + @version @update number 28 of this MVC + @build 5th April, 2017 @created 3rd April, 2017 @package Component Builder - @subpackage language_placeholders.css + @subpackage language_translations.css @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/assets/images/icons/language_placeholder_add.png b/admin/assets/images/icons/language_placeholder_add.png deleted file mode 100644 index e27635ba423e263411c077e7cdfbfef1495dbe38..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 43823 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 Hu0mjf=`_vv diff --git a/admin/assets/images/icons/language_placeholders.png b/admin/assets/images/icons/language_translations.png similarity index 100% rename from admin/assets/images/icons/language_placeholders.png rename to admin/assets/images/icons/language_translations.png diff --git a/admin/compiler/joomla_3/component.xml b/admin/compiler/joomla_3/component.xml index a51f9eb84..e729a86db 100644 --- a/admin/compiler/joomla_3/component.xml +++ b/admin/compiler/joomla_3/component.xml @@ -60,8 +60,7 @@ - language/en-GB/en-GB.com_###component###.ini - language/en-GB/en-GB.com_###component###.sys.ini + ###SITE_LANGUAGES### @@ -86,8 +85,7 @@ - language/en-GB/en-GB.com_###component###.ini - language/en-GB/en-GB.com_###component###.sys.ini + ###ADMIN_LANGUAGES### ###UPDATESERVER### diff --git a/admin/compiler/joomla_3/settings.json b/admin/compiler/joomla_3/settings.json index 878ecefbc..9e5cd8796 100644 --- a/admin/compiler/joomla_3/settings.json +++ b/admin/compiler/joomla_3/settings.json @@ -170,18 +170,6 @@ "rename": false, "type": "file" }, - "en-GB.com_admin.ini": { - "naam":"en-GB.com_admin.ini", - "path": "c0mp0n3nt/admin/language/en-GB", - "rename": "admin", - "type": "file" - }, - "en-GB.com_admin.sys.ini": { - "naam":"en-GB.com_admin.sys.ini", - "path": "c0mp0n3nt/admin/language/en-GB", - "rename": "admin", - "type": "file" - }, "install.mysql.utf8.sql": { "naam":"install.mysql.utf8.sql", "path": "c0mp0n3nt/admin/sql", @@ -219,18 +207,6 @@ "rename": false, "type": "file" }, - "en-GB.com_site.ini": { - "naam":"en-GB.com_site.ini", - "path": "c0mp0n3nt/site/language/en-GB", - "rename": "site", - "type": "file" - }, - "en-GB.com_site.sys.ini": { - "naam":"en-GB.com_site.sys.ini", - "path": "c0mp0n3nt/site/language/en-GB", - "rename": "site", - "type": "file" - }, "headercheck.php": { "naam":"headercheck.php", "path": "c0mp0n3nt/site/helpers", diff --git a/admin/componentbuilder.php b/admin/componentbuilder.php index 5b2dee12e..26de222cd 100644 --- a/admin/componentbuilder.php +++ b/admin/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php @@ -44,7 +44,10 @@ $document->addScript('components/com_componentbuilder/assets/js/admin.js'); // require helper files JLoader::register('ComponentbuilderHelper', dirname(__FILE__) . '/helpers/componentbuilder.php'); -JLoader::register('JHtmlBatch_', dirname(__FILE__) . '/helpers/html/batch_.php'); +JLoader::register('JHtmlBatch_', dirname(__FILE__) . '/helpers/html/batch_.php'); + +// Triger the Global Admin Event +ComponentbuilderHelper::globalEvent($document); // import joomla controller library jimport('joomla.application.component.controller'); diff --git a/admin/controller.php b/admin/controller.php index b2c493ed2..c6600ef7d 100644 --- a/admin/controller.php +++ b/admin/controller.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage controller.php @@ -99,7 +99,7 @@ class ComponentbuilderController extends JControllerLegacy 'snippet' => 'snippets', 'field' => 'fields', 'fieldtype' => 'fieldtypes', - 'language_placeholder' => 'language_placeholders', + 'language_translation' => 'language_translations', 'language' => 'languages', 'help_document' => 'help_documents' ); diff --git a/admin/controllers/ajax.json.php b/admin/controllers/ajax.json.php index 8bffcdea9..b024172d7 100644 --- a/admin/controllers/ajax.json.php +++ b/admin/controllers/ajax.json.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage ajax.json.php @@ -57,7 +57,9 @@ class ComponentbuilderControllerAjax extends JControllerLegacy $this->registerTask('viewTableColumns', 'ajax'); $this->registerTask('checkFunctionName', 'ajax'); $this->registerTask('usedin', 'ajax'); - $this->registerTask('fieldOptions', 'ajax'); + $this->registerTask('fieldOptions', 'ajax'); + $this->registerTask('getBuildTable', 'ajax'); + $this->registerTask('getButton', 'ajax'); } public function ajax() @@ -687,6 +689,83 @@ class ComponentbuilderControllerAjax extends JControllerLegacy echo "(".json_encode($e).");"; } } + break; + case 'getBuildTable': + try + { + $returnRaw = $jinput->get('raw', false, 'BOOLEAN'); + $idNameValue = $jinput->get('idName', NULL, 'CMD'); + $objectValue = $jinput->get('object', NULL, 'STRING'); + if($idNameValue && $objectValue && $user->id != 0) + { + $result = $this->getModel('ajax')->getBuildTable($idNameValue, $objectValue); + } + else + { + $result = false; + } + if($callback = $jinput->get('callback', null, 'CMD')) + { + echo $callback . "(".json_encode($result).");"; + } + elseif($returnRaw) + { + echo json_encode($result); + } + else + { + echo "(".json_encode($result).");"; + } + } + catch(Exception $e) + { + if($callback = $jinput->get('callback', null, 'CMD')) + { + echo $callback."(".json_encode($e).");"; + } + else + { + echo "(".json_encode($e).");"; + } + } + break; + case 'getButton': + try + { + $returnRaw = $jinput->get('raw', false, 'BOOLEAN'); + $typeValue = $jinput->get('type', NULL, 'WORD'); + if($typeValue && $user->id != 0) + { + $result = $this->getModel('ajax')->getButton($typeValue); + } + else + { + $result = false; + } + if($callback = $jinput->get('callback', null, 'CMD')) + { + echo $callback . "(".json_encode($result).");"; + } + elseif($returnRaw) + { + echo json_encode($result); + } + else + { + echo "(".json_encode($result).");"; + } + } + catch(Exception $e) + { + if($callback = $jinput->get('callback', null, 'CMD')) + { + echo $callback."(".json_encode($e).");"; + } + else + { + echo "(".json_encode($e).");"; + } + } break; } } diff --git a/admin/controllers/componentbuilder.php b/admin/controllers/componentbuilder.php index aa4cd6745..20c6ed0b4 100644 --- a/admin/controllers/componentbuilder.php +++ b/admin/controllers/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/controllers/custom_code.php b/admin/controllers/custom_code.php index b772871cb..bb3a1b148 100644 --- a/admin/controllers/custom_code.php +++ b/admin/controllers/custom_code.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 81 of this MVC - @build 1st March, 2017 + @version @update number 82 of this MVC + @build 3rd April, 2017 @created 11th October, 2016 @package Component Builder @subpackage custom_code.php diff --git a/admin/controllers/custom_codes.php b/admin/controllers/custom_codes.php index 6dc75d3b1..d4e4664ca 100644 --- a/admin/controllers/custom_codes.php +++ b/admin/controllers/custom_codes.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 81 of this MVC - @build 1st March, 2017 + @version @update number 82 of this MVC + @build 3rd April, 2017 @created 11th October, 2016 @package Component Builder @subpackage custom_codes.php diff --git a/admin/controllers/help.php b/admin/controllers/help.php index 9fcca801b..bc03b3068 100644 --- a/admin/controllers/help.php +++ b/admin/controllers/help.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage help.php diff --git a/admin/controllers/import.php b/admin/controllers/import.php index 3c0fb02ca..16823cffa 100644 --- a/admin/controllers/import.php +++ b/admin/controllers/import.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage import.php diff --git a/admin/controllers/import_joomla_components.php b/admin/controllers/import_joomla_components.php index f0ee219ae..d635787d8 100644 --- a/admin/controllers/import_joomla_components.php +++ b/admin/controllers/import_joomla_components.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage import_joomla_components.php diff --git a/admin/controllers/joomla_component.php b/admin/controllers/joomla_component.php index 3da08775a..52089d074 100644 --- a/admin/controllers/joomla_component.php +++ b/admin/controllers/joomla_component.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 311 of this MVC - @build 1st April, 2017 + @version @update number 314 of this MVC + @build 5th April, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_component.php diff --git a/admin/controllers/joomla_components.php b/admin/controllers/joomla_components.php index c03546916..ab30a2d10 100644 --- a/admin/controllers/joomla_components.php +++ b/admin/controllers/joomla_components.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 311 of this MVC - @build 1st April, 2017 + @version @update number 314 of this MVC + @build 5th April, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_components.php diff --git a/admin/controllers/language_placeholder.php b/admin/controllers/language_translation.php similarity index 85% rename from admin/controllers/language_placeholder.php rename to admin/controllers/language_translation.php index ebdf36177..021740473 100644 --- a/admin/controllers/language_placeholder.php +++ b/admin/controllers/language_translation.php @@ -10,11 +10,11 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 8 of this MVC - @build 3rd April, 2017 + @version @update number 28 of this MVC + @build 5th April, 2017 @created 3rd April, 2017 @package Component Builder - @subpackage language_placeholder.php + @subpackage language_translation.php @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html @@ -30,9 +30,9 @@ defined('_JEXEC') or die('Restricted access'); jimport('joomla.application.component.controllerform'); /** - * Language_placeholder Controller + * Language_translation Controller */ -class ComponentbuilderControllerLanguage_placeholder extends JControllerForm +class ComponentbuilderControllerLanguage_translation extends JControllerForm { /** * Current or most recently performed task. @@ -45,7 +45,7 @@ class ComponentbuilderControllerLanguage_placeholder extends JControllerForm public function __construct($config = array()) { - $this->view_list = 'Language_placeholders'; // safeguard for setting the return view listing to the main view. + $this->view_list = 'Language_translations'; // safeguard for setting the return view listing to the main view. parent::__construct($config); } @@ -61,13 +61,13 @@ class ComponentbuilderControllerLanguage_placeholder extends JControllerForm protected function allowAdd($data = array()) { // Access check. - $access = JFactory::getUser()->authorise('language_placeholder.access', 'com_componentbuilder'); + $access = JFactory::getUser()->authorise('language_translation.access', 'com_componentbuilder'); if (!$access) { return false; } // In the absense of better information, revert to the component permissions. - return JFactory::getUser()->authorise('language_placeholder.create', $this->option); + return JFactory::getUser()->authorise('language_translation.create', $this->option); } /** @@ -89,7 +89,7 @@ class ComponentbuilderControllerLanguage_placeholder extends JControllerForm // Access check. - $access = ($user->authorise('language_placeholder.access', 'com_componentbuilder.language_placeholder.' . (int) $recordId) && $user->authorise('language_placeholder.access', 'com_componentbuilder')); + $access = ($user->authorise('language_translation.access', 'com_componentbuilder.language_translation.' . (int) $recordId) && $user->authorise('language_translation.access', 'com_componentbuilder')); if (!$access) { return false; @@ -98,10 +98,10 @@ class ComponentbuilderControllerLanguage_placeholder extends JControllerForm if ($recordId) { // The record has been set. Check the record permissions. - $permission = $user->authorise('language_placeholder.edit', 'com_componentbuilder.language_placeholder.' . (int) $recordId); + $permission = $user->authorise('language_translation.edit', 'com_componentbuilder.language_translation.' . (int) $recordId); if (!$permission) { - if ($user->authorise('language_placeholder.edit.own', 'com_componentbuilder.language_placeholder.' . $recordId)) + if ($user->authorise('language_translation.edit.own', 'com_componentbuilder.language_translation.' . $recordId)) { // Now test the owner is the user. $ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0; @@ -120,7 +120,7 @@ class ComponentbuilderControllerLanguage_placeholder extends JControllerForm // If the owner matches 'me' then allow. if ($ownerId == $user->id) { - if ($user->authorise('language_placeholder.edit.own', 'com_componentbuilder')) + if ($user->authorise('language_translation.edit.own', 'com_componentbuilder')) { return true; } @@ -130,7 +130,7 @@ class ComponentbuilderControllerLanguage_placeholder extends JControllerForm } } // Since there is no permission, revert to the component permissions. - return $user->authorise('language_placeholder.edit', $this->option); + return $user->authorise('language_translation.edit', $this->option); } /** @@ -196,10 +196,10 @@ class ComponentbuilderControllerLanguage_placeholder extends JControllerForm JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN')); // Set the model - $model = $this->getModel('Language_placeholder', '', array()); + $model = $this->getModel('Language_translation', '', array()); // Preset the redirect - $this->setRedirect(JRoute::_('index.php?option=com_componentbuilder&view=language_placeholders' . $this->getRedirectToListAppend(), false)); + $this->setRedirect(JRoute::_('index.php?option=com_componentbuilder&view=language_translations' . $this->getRedirectToListAppend(), false)); return parent::batch($model); } diff --git a/admin/controllers/language_placeholders.php b/admin/controllers/language_translations.php similarity index 78% rename from admin/controllers/language_placeholders.php rename to admin/controllers/language_translations.php index 8d631ea6a..795a39648 100644 --- a/admin/controllers/language_placeholders.php +++ b/admin/controllers/language_translations.php @@ -10,11 +10,11 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 8 of this MVC - @build 3rd April, 2017 + @version @update number 28 of this MVC + @build 5th April, 2017 @created 3rd April, 2017 @package Component Builder - @subpackage language_placeholders.php + @subpackage language_translations.php @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html @@ -30,16 +30,16 @@ defined('_JEXEC') or die('Restricted access'); jimport('joomla.application.component.controlleradmin'); /** - * Language_placeholders Controller + * Language_translations Controller */ -class ComponentbuilderControllerLanguage_placeholders extends JControllerAdmin +class ComponentbuilderControllerLanguage_translations extends JControllerAdmin { - protected $text_prefix = 'COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDERS'; + protected $text_prefix = 'COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS'; /** * Proxy for getModel. * @since 2.5 */ - public function getModel($name = 'Language_placeholder', $prefix = 'ComponentbuilderModel', $config = array()) + public function getModel($name = 'Language_translation', $prefix = 'ComponentbuilderModel', $config = array()) { $model = parent::getModel($name, $prefix, array('ignore_request' => true)); @@ -52,7 +52,7 @@ class ComponentbuilderControllerLanguage_placeholders extends JControllerAdmin JSession::checkToken() or die(JText::_('JINVALID_TOKEN')); // check if export is allowed for this user. $user = JFactory::getUser(); - if ($user->authorise('language_placeholder.export', 'com_componentbuilder') && $user->authorise('core.export', 'com_componentbuilder')) + if ($user->authorise('language_translation.export', 'com_componentbuilder') && $user->authorise('core.export', 'com_componentbuilder')) { // Get the input $input = JFactory::getApplication()->input; @@ -60,19 +60,19 @@ class ComponentbuilderControllerLanguage_placeholders extends JControllerAdmin // Sanitize the input JArrayHelper::toInteger($pks); // Get the model - $model = $this->getModel('Language_placeholders'); + $model = $this->getModel('Language_translations'); // get the data to export $data = $model->getExportData($pks); if (ComponentbuilderHelper::checkArray($data)) { // now set the data to the spreadsheet $date = JFactory::getDate(); - ComponentbuilderHelper::xls($data,'Language_placeholders_'.$date->format('jS_F_Y'),'Language placeholders exported ('.$date->format('jS F, Y').')','language placeholders'); + ComponentbuilderHelper::xls($data,'Language_translations_'.$date->format('jS_F_Y'),'Language translations exported ('.$date->format('jS F, Y').')','language translations'); } } // Redirect to the list screen with error. $message = JText::_('COM_COMPONENTBUILDER_EXPORT_FAILED'); - $this->setRedirect(JRoute::_('index.php?option=com_componentbuilder&view=language_placeholders', false), $message, 'error'); + $this->setRedirect(JRoute::_('index.php?option=com_componentbuilder&view=language_translations', false), $message, 'error'); return; } @@ -83,10 +83,10 @@ class ComponentbuilderControllerLanguage_placeholders extends JControllerAdmin JSession::checkToken() or die(JText::_('JINVALID_TOKEN')); // check if import is allowed for this user. $user = JFactory::getUser(); - if ($user->authorise('language_placeholder.import', 'com_componentbuilder') && $user->authorise('core.import', 'com_componentbuilder')) + if ($user->authorise('language_translation.import', 'com_componentbuilder') && $user->authorise('core.import', 'com_componentbuilder')) { // Get the import model - $model = $this->getModel('Language_placeholders'); + $model = $this->getModel('Language_translations'); // get the headers to import $headers = $model->getExImPortHeaders(); if (ComponentbuilderHelper::checkObject($headers)) @@ -94,18 +94,18 @@ class ComponentbuilderControllerLanguage_placeholders extends JControllerAdmin // Load headers to session. $session = JFactory::getSession(); $headers = json_encode($headers); - $session->set('language_placeholder_VDM_IMPORTHEADERS', $headers); - $session->set('backto_VDM_IMPORT', 'language_placeholders'); - $session->set('dataType_VDM_IMPORTINTO', 'language_placeholder'); + $session->set('language_translation_VDM_IMPORTHEADERS', $headers); + $session->set('backto_VDM_IMPORT', 'language_translations'); + $session->set('dataType_VDM_IMPORTINTO', 'language_translation'); // Redirect to import view. - $message = JText::_('COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_LANGUAGE_PLACEHOLDERS'); + $message = JText::_('COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_LANGUAGE_TRANSLATIONS'); $this->setRedirect(JRoute::_('index.php?option=com_componentbuilder&view=import', false), $message); return; } } // Redirect to the list screen with error. $message = JText::_('COM_COMPONENTBUILDER_IMPORT_FAILED'); - $this->setRedirect(JRoute::_('index.php?option=com_componentbuilder&view=language_placeholders', false), $message, 'error'); + $this->setRedirect(JRoute::_('index.php?option=com_componentbuilder&view=language_translations', false), $message, 'error'); return; } diff --git a/admin/helpers/compiler.php b/admin/helpers/compiler.php index c8b003306..75b861d58 100644 --- a/admin/helpers/compiler.php +++ b/admin/helpers/compiler.php @@ -152,9 +152,7 @@ class Compiler extends Infusion protected function updateFiles() { if (isset($this->newFiles['static']) && ComponentbuilderHelper::checkArray($this->newFiles['static']) && isset($this->newFiles['dynamic']) && ComponentbuilderHelper::checkArray($this->newFiles['dynamic'])) - { - // we don't update lang now since we will still posible add custom code - $langCheck = 'en-GB.com_'.$this->fileContentStatic['###component###'].'.'; + { // get the bom file $bom = file_get_contents($this->bomPath); // first we do the static files @@ -162,12 +160,6 @@ class Compiler extends Infusion { if (JFile::exists($static['path'])) { - // skip lang files and store for later - if (strpos($static['path'], $langCheck)) - { - $this->langFiles[] = $static; - continue; - } $this->fileContentStatic['###FILENAME###'] = $static['name']; $php = ''; if (ComponentbuilderHelper::checkFileType($static['name'],'php')) diff --git a/admin/helpers/compiler/a_Get.php b/admin/helpers/compiler/a_Get.php index ca090fac7..8b5279a3b 100644 --- a/admin/helpers/compiler/a_Get.php +++ b/admin/helpers/compiler/a_Get.php @@ -163,11 +163,11 @@ class Get public $loadLineNr = false; /** - * The Language prefix + * The Placholder Language prefix * * @var string */ - public $langPrefix = 'COM_'; + public $langPrefix; /** * The Language content @@ -176,6 +176,34 @@ class Get */ public $langContent = array(); + /** + * The Languages bucket + * + * @var array + */ + public $languages = array('en-GB' => array()); + + /** + * The Multi Languages bucket + * + * @var array + */ + public $multiLangString = array(); + + /** + * The new lang to add + * + * @var array + */ + protected $newLangStrings = array(); + + /** + * The existing lang to update + * + * @var array + */ + protected $existingLangStrings = array(); + /** * The Component Code Name * @@ -460,7 +488,7 @@ class Get if ($name_code = ComponentbuilderHelper::getVar('joomla_component', $this->componentID, 'id', 'name_code')) { // set lang prefix - $this->langPrefix .= ComponentbuilderHelper::safeString($name_code,'U'); + $this->langPrefix = 'COM_'.ComponentbuilderHelper::safeString($name_code,'U'); // set component code name $this->componentCodeName = ComponentbuilderHelper::safeString($name_code); // set if placeholders should be added to customcode @@ -2979,6 +3007,230 @@ class Get unset($this->$remove); } + /** + * Get the other languages + * + * @param array $values The lang strings to get + * + * + * @return void + * + */ + public function getMultiLangStrings($values) + { + // Create a new query object. + $query = $this->db->getQuery(true); + $query->from($this->db->quoteName('#__componentbuilder_language_translation','a')); + if (ComponentbuilderHelper::checkArray($values)) + { + $query->select($this->db->quoteName(array('a.id','a.translation','a.entranslation','a.components'))); + $query->where($this->db->quoteName('a.entranslation') . ' IN (' . implode(',',array_map(function($a){ return $this->db->quote($a); }, $values)) . ')'); + $query->where($this->db->quoteName('a.published') . ' >= 1'); + $this->db->setQuery($query); + $this->db->execute(); + if ($this->db->getNumRows()) + { + return $this->db->loadAssocList('entranslation'); + } + } + return false; + } + + /** + * Set the Current language values to DB + * + * + * @return void + * + */ + public function setLangPlaceholders(&$strings) + { + $counterInsert = 0; + $counterUpdate = 0; + $today = JFactory::getDate()->toSql(); + foreach ($this->languages['en-GB'] as $area => $placeholders) + { + foreach ($placeholders as $placeholder => $string) + { + // to keep or remove + $remove = false; + // build the tranlations + if (isset($this->multiLangString[$string])) + { + // make sure we have converted the string to array + if (isset($this->multiLangString[$string]['translation']) && ComponentbuilderHelper::checkJson($this->multiLangString[$string]['translation'])) + { + $this->multiLangString[$string]['translation'] = json_decode($this->multiLangString[$string]['translation'], true); + } + // if we have an array continue + if (isset($this->multiLangString[$string]['translation']) + && ComponentbuilderHelper::checkArray($this->multiLangString[$string]['translation']) + && isset($this->multiLangString[$string]['translation']['translation']) + && isset($this->multiLangString[$string]['translation']['language']) + && ComponentbuilderHelper::checkArray($this->multiLangString[$string]['translation']['language']) + && ComponentbuilderHelper::checkArray($this->multiLangString[$string]['translation']['translation'])) + { + // great lets build the multi languages strings + foreach ($this->multiLangString[$string]['translation']['translation'] as $at => $lang) + { + $_tag = $this->multiLangString[$string]['translation']['language'][$at]; + // build arrays + if (!isset($this->languages[$_tag])) + { + $this->languages[$_tag] = array(); + } + if (!isset($this->languages[$_tag][$area])) + { + $this->languages[$_tag][$area] = array(); + } + $this->languages[$_tag][$area][$placeholder] = $lang; + } + } + else + { + // remove this string not to be checked again + $remove = true; + } + } + // do the database managment + if(($key = array_search($string, $strings)) !== false) + { + if (isset($this->multiLangString[$string])) + { + // update the existing placeholder in db + $id = $this->multiLangString[$string]['id']; + if (ComponentbuilderHelper::checkJson($this->multiLangString[$string]['components'])) + { + $components = (array) json_decode($this->multiLangString[$string]['components'], true); + if (in_array($this->componentID, $components)) + { + continue; + } + else + { + $components[] = $this->componentID; + } + } + else + { + $components = array($this->componentID); + } + // start the bucket for this lang + $this->existingLangStrings[$counterUpdate] = array(); + $this->existingLangStrings[$counterUpdate]['id'] = (int) $id; + $this->existingLangStrings[$counterUpdate]['conditions'] = array(); + $this->existingLangStrings[$counterUpdate]['conditions'][] = $this->db->quoteName('id') . ' = ' . $this->db->quote($id); + $this->existingLangStrings[$counterUpdate]['fields'] = array(); + $this->existingLangStrings[$counterUpdate]['fields'][] = $this->db->quoteName('components') . ' = ' . $this->db->quote(json_encode($components)); + + $counterUpdate++; + + // load to db + $this->setExistingLangStrings(50); + // remove string if needed + if ($remove) + { + unset($this->multiLangString[$string]); + } + } + else + { + // add the new lang placeholder to the db + $this->newLangStrings[$counterInsert] = array(); + $this->newLangStrings[$counterInsert][] = $this->db->quote(json_encode(array($this->componentID))); // 'components' + $this->newLangStrings[$counterInsert][] = $this->db->quote($string); // 'entranslation' + $this->newLangStrings[$counterInsert][] = $this->db->quote(1); // 'published' + $this->newLangStrings[$counterInsert][] = $this->db->quote($today); // 'created' + $this->newLangStrings[$counterInsert][] = $this->db->quote((int) $this->user->id); // 'created_by' + $this->newLangStrings[$counterInsert][] = $this->db->quote(1); // 'version' + $this->newLangStrings[$counterInsert][] = $this->db->quote(1); // 'access' + + $counterInsert++; + + // load to db + $this->setNewLangStrings(100); + } + // only set the string once + unset($strings[$key]); + } + } + } + // just to make sure all is done + $this->setExistingLangStrings(); + $this->setNewLangStrings(); + } + + /** + * store the language placeholders + * + * @param int $when To set when to update + * + * @return void + * + */ + protected function setNewLangStrings($when = 1) + { + if (count($this->newLangStrings) >= $when) + { + // Create a new query object. + $query = $this->db->getQuery(true); + $continue = false; + // Insert columns. + $columns = array('components','entranslation','published','created','created_by','version','access'); + // Prepare the insert query. + $query->insert($this->db->quoteName('#__componentbuilder_language_translation')); + $query->columns($this->db->quoteName($columns)); + foreach($this->newLangStrings as $values) + { + if (count($values) == 7) + { + $query->values(implode(',', $values)); + $continue = true; + } + else + { + // TODO line mismatch... should not happen + } + } + // clear the values array + $this->newLangStrings = array(); + if (!$continue) + { + return false; // insure we dont continue if no values were loaded + } + // Set the query using our newly populated query object and execute it. + $this->db->setQuery($query); + $this->db->execute(); + } + } + + /** + * update the language placeholders + * + * @param int $when To set when to update + * + * @return void + * + */ + protected function setExistingLangStrings($when = 1) + { + if (count($this->existingLangStrings) >= $when) + { + foreach($this->existingLangStrings as $values) + { + // Create a new query object. + $query = $this->db->getQuery(true); + // Prepare the update query. + $query->update($this->db->quoteName('#__componentbuilder_language_translation'))->set($values['fields'])->where($values['conditions']); + // Set the query using our newly populated query object and execute it. + $this->db->setQuery($query); + $this->db->execute(); + } + // clear the values array + $this->existingLangStrings = array(); + } + } + /** * get the custom code from the system * diff --git a/admin/helpers/compiler/c_Fields.php b/admin/helpers/compiler/c_Fields.php index a6514a582..d6ba83837 100644 --- a/admin/helpers/compiler/c_Fields.php +++ b/admin/helpers/compiler/c_Fields.php @@ -1790,7 +1790,7 @@ class Fields extends Structure // set the custom builder if (ComponentbuilderHelper::checkArray($custom) && $typeName != 'category' && $typeName != 'repeatable') { - $this->customBuilder[$listViewName][] = array('type' => $typeName, 'code' => $name, 'lang' => $listLangName, 'custom' => $custom); + $this->customBuilder[$listViewName][] = array('type' => $typeName, 'code' => $name, 'lang' => $listLangName, 'custom' => $custom, 'method' => $field['settings']->store); // set the custom fields needed in content type data if (!isset($this->customFieldLinksBuilder[$viewName])) { diff --git a/admin/helpers/compiler/e_Interpretation.php b/admin/helpers/compiler/e_Interpretation.php index d71b70880..28cce9bbd 100644 --- a/admin/helpers/compiler/e_Interpretation.php +++ b/admin/helpers/compiler/e_Interpretation.php @@ -5092,20 +5092,14 @@ class Interpretation extends Fields if (isset($this->langContent['admin']) && ComponentbuilderHelper::checkArray($this->langContent['admin'])) { ksort($this->langContent['admin']); - foreach ($this->langContent['admin'] as $key => $value) - { - if (strlen($key) > 0) - { - if (!isset($lang)) - { - $lang = ''; - } - $lang .= $key.'="'.$value.'"'.PHP_EOL; - } - } - return $lang; + // load to global languages + $this->languages['en-GB']['admin'] = $this->langContent['admin']; + // remove tmp array + unset($this->langContent['admin']); + + return true; } - return ''; + return false; } public function setLangSite() @@ -5141,20 +5135,14 @@ class Interpretation extends Fields if (isset($this->langContent['site']) && ComponentbuilderHelper::checkArray($this->langContent['site'])) { ksort($this->langContent['site']); - foreach ($this->langContent['site'] as $key => $value) - { - if (strlen($key) > 0) - { - if (!isset($lang)) - { - $lang = ''; - } - $lang .= $key.'="'.$value.'"'.PHP_EOL; - } - } - return $lang; + // load to global languages + $this->languages['en-GB']['site'] = $this->langContent['site']; + // remove tmp array + unset($this->langContent['site']); + + return true; } - return ''; + return false; } public function setLangSiteSys() @@ -5165,20 +5153,14 @@ class Interpretation extends Fields if (isset($this->langContent['sitesys']) && ComponentbuilderHelper::checkArray($this->langContent['sitesys'])) { ksort($this->langContent['sitesys']); - foreach ($this->langContent['sitesys'] as $key => $value) - { - if (strlen($key) > 0) - { - if (!isset($lang)) - { - $lang = ''; - } - $lang .= $key.'="'.$value.'"'.PHP_EOL; - } - } - return $lang; + // load to global languages + $this->languages['en-GB']['sitesys'] = $this->langContent['sitesys']; + // remove tmp array + unset($this->langContent['sitesys']); + + return true; } - return ''; + return false; } public function setLangAdminSys() @@ -5186,20 +5168,14 @@ class Interpretation extends Fields if (isset($this->langContent['adminsys']) && ComponentbuilderHelper::checkArray($this->langContent['adminsys'])) { ksort($this->langContent['adminsys']); - foreach ($this->langContent['adminsys'] as $key => $value) - { - if (strlen($key) > 0) - { - if (!isset($lang)) - { - $lang = ''; - } - $lang .= $key.'="'.$value.'"'.PHP_EOL; - } - } - return $lang; + // load to global languages + $this->languages['en-GB']['adminsys'] = $this->langContent['adminsys']; + // remove tmp array + unset($this->langContent['adminsys']); + + return true; } - return ''; + return false; } public function setCustomAdminViewListLink($view,$viewName_list) @@ -7206,7 +7182,7 @@ class Interpretation extends Fields $query .= PHP_EOL."\t\t\tif (\$db->getNumRows())"; $query .= PHP_EOL."\t\t\t{"; $query .= PHP_EOL."\t\t\t\t\$items = \$db->loadObjectList();"; - $query .= $this->setGetItemsMethodStringFix($viewName_single,$this->fileContentStatic['###Component###'],"\t\t",true); + $query .= $this->setGetItemsMethodStringFix($viewName_single, $this->fileContentStatic['###Component###'], "\t\t", true); // add custom php to getitems method after all $query .= $this->getCustomScriptBuilder('php_getitems_after_all', $viewName_single, PHP_EOL.PHP_EOL."\t\t"); $query .= PHP_EOL."\t\t\t\treturn \$items;"; @@ -7572,7 +7548,8 @@ class Interpretation extends Fields && ComponentbuilderHelper::checkArray($this->customBuilderList[$viewName_list]) && in_array($filter['code'],$this->customBuilderList[$viewName_list]) && isset($filter['custom']['table']) - && ComponentbuilderHelper::checkString($filter['custom']['table'])) + && ComponentbuilderHelper::checkString($filter['custom']['table']) + && $filter['method'] == 0) { $query .= PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." From the ".ComponentbuilderHelper::safeString(ComponentbuilderHelper::safeString($filter['custom']['table'],'w'))." table."; $query .= PHP_EOL."\t\t\$query->select(\$db->quoteName('".$filter['custom']['db'].".".$filter['custom']['text']."','".$filter['code']."_".$filter['custom']['text']."'));"; @@ -10643,7 +10620,7 @@ class Interpretation extends Fields return $checkin; } - public function setGetItemsMethodStringFix($view,$Component,$tab = '',$export = false) + public function setGetItemsMethodStringFix($view, $Component, $tab = '', $export = false) { // add the fix if this view has the need for it $fix = ''; @@ -10849,7 +10826,15 @@ class Interpretation extends Fields { // TODO we check if this works well. $fix .= PHP_EOL."\t".$tab."\t\t\t//".$this->setLine(__LINE__)." convert ".$item['name']; - $fix .= PHP_EOL."\t".$tab."\t\t\t\$item->".$item['name']." = ".$Component."Helper::jsonToString(\$item->".$item['name'].", ', ', '".$item['name']."');"; + if (isset($item['custom']['table'])) + { + $keyTableNAme = str_replace('#__'.$this->fileContentStatic['###component###'] .'_', '', $item['custom']['table']); + $fix .= PHP_EOL."\t".$tab."\t\t\t\$item->".$item['name']." = ".$Component."Helper::jsonToString(\$item->".$item['name'].", ', ', '".$keyTableNAme."');"; + } + else + { + $fix .= PHP_EOL."\t".$tab."\t\t\t\$item->".$item['name']." = ".$Component."Helper::jsonToString(\$item->".$item['name'].", ', ', '".$item['name']."');"; + } } else { diff --git a/admin/helpers/compiler/f_Infusion.php b/admin/helpers/compiler/f_Infusion.php index c462b82e4..715a42033 100644 --- a/admin/helpers/compiler/f_Infusion.php +++ b/admin/helpers/compiler/f_Infusion.php @@ -1067,33 +1067,124 @@ class Infusion extends Interpretation * @return boolean on success * */ - public function setLangFileData() { - // First we build the strings - $lang = array(); - // ###LANG_ADMIN### - $lang['###LANG_ADMIN###'] = $this->setLangAdmin(); - // ###LANG_ADMIN_SYS### - $lang['###LANG_ADMIN_SYS###'] = $this->setLangAdminSys(); - // ###LANG_SITE### - $lang['###LANG_SITE###'] = $this->setLangSite(); - // ###LANG_SITE_SYS### - $lang['###LANG_SITE_SYS###'] = $this->setLangSiteSys(); - // now we insert the values into the files - if (ComponentbuilderHelper::checkArray($this->langFiles)) + $values = array(); + $mainLangLoader = array(); + // check the admin lang is set + if ($this->setLangAdmin()) { - foreach ($this->langFiles as $file) + $values[] = array_values($this->languages['en-GB']['admin']); + $mainLangLoader['admin'] = count($this->languages['en-GB']['admin']); + } + // check the admin system lang is set + if ($this->setLangAdminSys()) + { + $values[] = array_values($this->languages['en-GB']['adminsys']); + $mainLangLoader['adminsys'] = count($this->languages['en-GB']['adminsys']); + } + // check the site lang is set + if (!$this->removeSiteFolder && $this->setLangSite()) + { + $values[] = array_values($this->languages['en-GB']['site']); + $mainLangLoader['site'] = count($this->languages['en-GB']['site']); + } + // check the site system lang is set + if (!$this->removeSiteFolder && $this->setLangSiteSys()) + { + $values[] = array_values($this->languages['en-GB']['sitesys']); + $mainLangLoader['sitesys'] = count($this->languages['en-GB']['sitesys']); + } + $values = array_unique(ComponentbuilderHelper::mergeArrays($values)); + // get the other lang strings if there is any + $this->multiLangString = $this->getMultiLangStrings($values); + // update insert the current lang in to DB + $this->setLangPlaceholders($values); + // path to INI file + $getPAth = $this->templatePath . '/en-GB.com_admin.ini'; + // now we insert the values into the files + if (ComponentbuilderHelper::checkArray($this->languages)) + { + $langXML = array(); + foreach ($this->languages as $tag => $areas) { - $string = file_get_contents($file['path']); - // load the data - $answer = $this->setPlaceholders($string, $lang, 3); - // add to zip array - $this->writeFile($file['path'],$answer); - // set the line counter - $this->lineCount = $this->lineCount + substr_count($answer, PHP_EOL); + foreach ($areas as $area => $languageStrings) + { + // check if we sould install this translation (must be atleast 50% ready + $dif = bcdiv(count($languageStrings), $mainLangLoader[$area]); + $percentage = bcmul($dif, 100); + if ($percentage < 50) + { + // dont add + continue; + } + $p = 'admin'; + $t = ''; + if (strpos($area, 'site') !== false) + { + if ($this->removeSiteFolder) + { + continue; + } + $p = 'site'; + } + if (strpos($area, 'sys') !== false) + { + $t = '.sys'; + } + // build the path to to place the lang file + $path = $this->componentPath.'/'.$p.'/language/'.$tag; + if (!JFolder::exists($path)) + { + JFolder::create($path); + // count the folder created + $this->folderCount++; + } + // build the file name + $fileName = $tag . '.com_' . $this->componentCodeName . $t . '.ini'; + // move the file to its place + JFile::copy($getPAth, $path.'/'.$fileName); + // count the file created + $this->fileCount++; + // add content to it + $lang = ''; + foreach ($languageStrings as $place => $string) + { + $lang .= $place.'="'.$string.'"'.PHP_EOL; + } + // add to language file + $this->writeFile($path.'/'.$fileName, $lang); + // set the line counter + $this->lineCount = $this->lineCount + substr_count($lang, PHP_EOL); + // build xml strings + if (!isset($langXML[$p])) + { + $langXML[$p] = array(); + } + $langXML[$p][] = 'language/'.$tag.'/'.$fileName.''; + } + } + // load the lang xml + if (ComponentbuilderHelper::checkArray($langXML)) + { + $replace = array(); + if (isset($langXML['admin']) && ComponentbuilderHelper::checkArray($langXML['admin'])) + { + $replace['###ADMIN_LANGUAGES###'] = implode(PHP_EOL."\t\t\t", $langXML['admin']); + } + if (!$this->removeSiteFolder && isset($langXML['site']) && ComponentbuilderHelper::checkArray($langXML['site'])) + { + $replace['###SITE_LANGUAGES###'] = implode(PHP_EOL."\t\t", $langXML['site']); + } + // build xml path + $xmlPath = $this->componentPath . '/'. $this->fileContentStatic['###component###']. '.xml'; + // get the content in xml + $componentXML = file_get_contents($xmlPath); + // update the xml content + $componentXML = $this->setPlaceholders($componentXML, $replace); + // store the values back to xml + $this->writeFile($xmlPath,$componentXML); } } } - } diff --git a/admin/helpers/componentbuilder.php b/admin/helpers/componentbuilder.php index 8b3a69a5d..b809ab676 100644 --- a/admin/helpers/componentbuilder.php +++ b/admin/helpers/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php @@ -30,7 +30,16 @@ defined('_JEXEC') or die('Restricted access'); * Componentbuilder component helper. */ abstract class ComponentbuilderHelper -{ +{ + + /** + * The Global Admin Event Method. + **/ + public static function globalEvent($document) + { + // the Session keeps track of all data related to the current session of this user + self::loadSession(); + } /* * Autoloader @@ -1065,7 +1074,64 @@ abstract class ComponentbuilderHelper } return false; } - + + /** + * set the session defaults if not set + **/ + protected static function setSessionDefaults() + { + // noting for now + return true; + } + + /** + * the Butler + **/ + public static $session = array(); + + /** + * the Butler Assistant + **/ + protected static $localSession = array(); + + /** + * start a session if not already set, and load with data + **/ + public static function loadSession() + { + if (!isset(self::$session) || !self::checkObject(self::$session)) + { + self::$session = JFactory::getSession(); + } + // set the defaults + self::setSessionDefaults(); + } + + /** + * give Session more to keep + **/ + public static function set($key, $value) + { + // set to local memory to speed up program + self::$localSession[$key] = $value; + // load to session for later use + return self::$session->set($key, self::$localSession[$key]); + } + + /** + * get info from Session + **/ + public static function get($key, $default = null) + { + // check if in local memory + if (!isset(self::$localSession[$key])) + { + // set to local memory to speed up program + self::$localSession[$key] = self::$session->get($key, $default); + } + return self::$localSession[$key]; + } + /** * Load the Component xml manifest. **/ @@ -1245,9 +1311,9 @@ abstract class ComponentbuilderHelper JHtmlSidebar::addEntry(JText::_('COM_COMPONENTBUILDER_SUBMENU_FIELDTYPES'), 'index.php?option=com_componentbuilder&view=fieldtypes', $submenu === 'fieldtypes'); JHtmlSidebar::addEntry(JText::_('COM_COMPONENTBUILDER_FIELDTYPE_FIELDTYPE_CATEGORY'), 'index.php?option=com_categories&view=categories&extension=com_componentbuilder.fieldtypes', $submenu === 'categories.fieldtypes'); } - if ($user->authorise('language_placeholder.access', 'com_componentbuilder') && $user->authorise('language_placeholder.submenu', 'com_componentbuilder')) + if ($user->authorise('language_translation.access', 'com_componentbuilder') && $user->authorise('language_translation.submenu', 'com_componentbuilder')) { - JHtmlSidebar::addEntry(JText::_('COM_COMPONENTBUILDER_SUBMENU_LANGUAGE_PLACEHOLDERS'), 'index.php?option=com_componentbuilder&view=language_placeholders', $submenu === 'language_placeholders'); + JHtmlSidebar::addEntry(JText::_('COM_COMPONENTBUILDER_SUBMENU_LANGUAGE_TRANSLATIONS'), 'index.php?option=com_componentbuilder&view=language_translations', $submenu === 'language_translations'); } if ($user->authorise('language.access', 'com_componentbuilder') && $user->authorise('language.submenu', 'com_componentbuilder')) { diff --git a/admin/helpers/headercheck.php b/admin/helpers/headercheck.php index fc9cf2e68..21fa40c14 100644 --- a/admin/helpers/headercheck.php +++ b/admin/helpers/headercheck.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage headercheck.php diff --git a/admin/helpers/html/batch_.php b/admin/helpers/html/batch_.php index f223e253c..91a315f18 100644 --- a/admin/helpers/html/batch_.php +++ b/admin/helpers/html/batch_.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage batch_.php diff --git a/admin/helpers/indenter.php b/admin/helpers/indenter.php index 2393af18d..65ee15ba6 100644 --- a/admin/helpers/indenter.php +++ b/admin/helpers/indenter.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage indenter.php diff --git a/admin/helpers/js.php b/admin/helpers/js.php index dc6dcef98..f4aab0e13 100644 --- a/admin/helpers/js.php +++ b/admin/helpers/js.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage js.php diff --git a/admin/helpers/minify.php b/admin/helpers/minify.php index 56167fae6..740d97da5 100644 --- a/admin/helpers/minify.php +++ b/admin/helpers/minify.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage minify.php diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.ini b/admin/language/en-GB/en-GB.com_componentbuilder.ini index 22797d706..85db72709 100644 --- a/admin/language/en-GB/en-GB.com_componentbuilder.ini +++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini @@ -696,6 +696,7 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_ZOOM_IN="Zoom In" COM_COMPONENTBUILDER_ADMIN_VIEW_ZOOM_OUT="Zoom Out" COM_COMPONENTBUILDER_ALL_IS_GOOD_PLEASE_CHECK_AGAIN_LATTER="All is good, please check again latter." COM_COMPONENTBUILDER_ALL_IS_GOOD_THERE_IN_NO_NOTICE_AT_THIS_TIME="All is good, there in no notice at this time." +COM_COMPONENTBUILDER_ALL_UNSAVED_WORK_WILL_BE_LOST_ARE_YOU_SURE_YOU_WANT_TO_CONTINUE="All unsaved work will be lost, are you sure you want to continue?" COM_COMPONENTBUILDER_ALWAYS_INSURE_THAT_YOU_HAVE_YOUR_LOCAL_COMPONENTS_BACKED_UP_BY_MAKING_AN_EXPORT_OF_ALL_YOUR_LOCAL_COMPONENTS_BEFORE_IMPORTING_ANY_NEW_COMPONENTS_SMALLMAKE_BSUREB_TO_MOVE_THIS_ZIPPED_BACKUP_PACKAGE_OUT_OF_THE_TMP_FOLDER_BEFORE_DOING_AN_IMPORTSMALLBR_IF_YOU_ARE_IMPORTING_A_PACKAGE_OF_A_THREERD_PARTY_JCB_PACKAGE_DEVELOPER_BMAKE_SURE_IT_IS_A_REPUTABLE_JCB_PACKAGE_DEVELOPERSB="Always insure that you have your local components backed up, by making an export of all your local components before importing any new components. (Make SURE to move this zipped backup package out of the tmp folder before doing an import)
If you are importing a package of a 3rd party JCB package developer, make sure it is a reputable JCB package developers!" COM_COMPONENTBUILDER_AUTHOR="Author" COM_COMPONENTBUILDER_A_FEW_CLOSED_ISSUES_FROM_GITHUB_IS_LOADING="A few closed issues from Github is loading" @@ -1489,8 +1490,7 @@ COM_COMPONENTBUILDER_DASHBOARD_HELP_DOCUMENTS="Help Documents

" COM_COMPONENTBUILDER_DASHBOARD_HELP_DOCUMENT_ADD="Add Help Document

" COM_COMPONENTBUILDER_DASHBOARD_JOOMLA_COMPONENTS="Joomla Components

" COM_COMPONENTBUILDER_DASHBOARD_JOOMLA_COMPONENT_ADD="Add Joomla Component

" -COM_COMPONENTBUILDER_DASHBOARD_LANGUAGE_PLACEHOLDERS="Language Placeholders

" -COM_COMPONENTBUILDER_DASHBOARD_LANGUAGE_PLACEHOLDER_ADD="Add Language Placeholder

" +COM_COMPONENTBUILDER_DASHBOARD_LANGUAGE_TRANSLATIONS="Language Translations

" COM_COMPONENTBUILDER_DASHBOARD_LAYOUTS="Layouts

" COM_COMPONENTBUILDER_DASHBOARD_LAYOUT_ADD="Add Layout

" COM_COMPONENTBUILDER_DASHBOARD_SITE_VIEWS="Site Views

" @@ -2269,7 +2269,7 @@ COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_FIELDTYPES="Select the file to impor COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_HELP_DOCUMENTS="Select the file to import data to help_documents." COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_JOOMLA_COMPONENTS="Select the file to import data to joomla_components." COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_LANGUAGES="Select the file to import data to languages." -COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_LANGUAGE_PLACEHOLDERS="Select the file to import data to language_placeholders." +COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_LANGUAGE_TRANSLATIONS="Select the file to import data to language_translations." COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_LAYOUTS="Select the file to import data to layouts." COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_SITE_VIEWS="Select the file to import data to site_views." COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_SNIPPETS="Select the file to import data to snippets." @@ -3070,90 +3070,88 @@ COM_COMPONENTBUILDER_LANGUAGE_NAME_LABEL="Name" COM_COMPONENTBUILDER_LANGUAGE_NEW="A New Language" COM_COMPONENTBUILDER_LANGUAGE_ORDERING_LABEL="Ordering" COM_COMPONENTBUILDER_LANGUAGE_PERMISSION="Permissions" -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDER="Language Placeholder" -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDERS="Language Placeholders" -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDERS_ACCESS="Language Placeholders Access" -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDERS_ACCESS_DESC="Allows the users in this group to access access language placeholders" -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDERS_BATCH_OPTIONS="Batch process the selected Language Placeholders" -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDERS_BATCH_TIP="All changes will be applied to all selected Language Placeholders" -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDERS_BATCH_USE="Language Placeholders Batch Use" -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDERS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch language placeholders" -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDERS_CREATE="Language Placeholders Create" -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDERS_CREATE_DESC="Allows the users in this group to create create language placeholders" -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDERS_DASHBOARD_ADD="Language Placeholders Dashboard Add" -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDERS_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the language placeholder" -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDERS_DASHBOARD_LIST="Language Placeholders Dashboard List" -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDERS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the language placeholder" -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDERS_DELETE="Language Placeholders Delete" -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDERS_DELETE_DESC="Allows the users in this group to delete delete language placeholders" -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDERS_EDIT="Language Placeholders Edit" -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDERS_EDIT_DESC="Allows the users in this group to edit the language placeholder" -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDERS_EDIT_OWN="Language Placeholders Edit Own" -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDERS_EDIT_OWN_DESC="Allows the users in this group to edit edit own language placeholders created by them" -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDERS_EDIT_STATE="Language Placeholders Edit State" -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDERS_EDIT_STATE_DESC="Allows the users in this group to update the state of the language placeholder" -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDERS_EDIT_VERSION="Language Placeholders Edit Version" -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDERS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version language placeholders" -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDERS_EXPORT="Language Placeholders Export" -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDERS_EXPORT_DESC="Allows the users in this group to export export language placeholders" -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDERS_IMPORT="Language Placeholders Import" -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDERS_IMPORT_DESC="Allows the users in this group to import import language placeholders" -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDERS_N_ITEMS_ARCHIVED="%s Language Placeholders archived." -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDERS_N_ITEMS_ARCHIVED_1="%s Language Placeholder archived." -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDERS_N_ITEMS_CHECKED_IN_0="No Language Placeholder successfully checked in." -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDERS_N_ITEMS_CHECKED_IN_1="%d Language Placeholder successfully checked in." -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDERS_N_ITEMS_CHECKED_IN_MORE="%d Language Placeholders successfully checked in." -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDERS_N_ITEMS_DELETED="%s Language Placeholders deleted." -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDERS_N_ITEMS_DELETED_1="%s Language Placeholder deleted." -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDERS_N_ITEMS_FEATURED="%s Language Placeholders featured." -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDERS_N_ITEMS_FEATURED_1="%s Language Placeholder featured." -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDERS_N_ITEMS_PUBLISHED="%s Language Placeholders published." -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDERS_N_ITEMS_PUBLISHED_1="%s Language Placeholder published." -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDERS_N_ITEMS_TRASHED="%s Language Placeholders trashed." -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDERS_N_ITEMS_TRASHED_1="%s Language Placeholder trashed." -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDERS_N_ITEMS_UNFEATURED="%s Language Placeholders unfeatured." -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDERS_N_ITEMS_UNFEATURED_1="%s Language Placeholder unfeatured." -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDERS_N_ITEMS_UNPUBLISHED="%s Language Placeholders unpublished." -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDERS_N_ITEMS_UNPUBLISHED_1="%s Language Placeholder unpublished." -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDERS_SUBMENU="Language Placeholders Submenu" -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDERS_SUBMENU_DESC="Allows the users in this group to update the submenu of the language placeholder" -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDER_COMPONENTS="Components" -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDER_COMPONENTS_LABEL="Components" -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDER_CREATED_BY_DESC="The user that created this Language Placeholder." -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDER_CREATED_BY_LABEL="Created By" -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDER_CREATED_DATE_DESC="The date this Language Placeholder was created." -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDER_CREATED_DATE_LABEL="Created Date" -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDER_DETAILS="Details" -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDER_EDIT="Editing the Language Placeholder" -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDER_ERROR_UNIQUE_ALIAS="Another Language Placeholder has the same alias." -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDER_ID="Id" -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDER_LANGUAGE_LABEL="Language" -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDER_MODIFIED_BY_DESC="The last user that modified this Language Placeholder." -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDER_MODIFIED_BY_LABEL="Modified By" -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDER_MODIFIED_DATE_DESC="The date this Language Placeholder was modified." -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDER_MODIFIED_DATE_LABEL="Modified Date" -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDER_NEW="A New Language Placeholder" -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDER_ORDERING_LABEL="Ordering" -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDER_PERMISSION="Permissions" -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDER_PLACEHOLDER="Placeholder" -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDER_PLACEHOLDER_DESCRIPTION="The language placeholder in the code" -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDER_PLACEHOLDER_HINT="Automatically generated!" -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDER_PLACEHOLDER_LABEL="Placeholder" -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDER_PUBLISHING="Publishing" -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDER_SAVE_WARNING="Alias already existed so a number was added at the end. You can re-edit the Language Placeholder to customise the alias." -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDER_STATUS="Status" -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDER_TRANSLATION="Translation" -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDER_TRANSLATION_DESCRIPTION="The translation strings." -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDER_TRANSLATION_HINT="Translated String Here" -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDER_TRANSLATION_LABEL="Translated String" -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDER_TRANSLATION_SELECT="Click here" -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDER_UPDATE_PLACEHOLDERS_BUTTON_ACCESS="Language Placeholder Update Placeholders Button Access" -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDER_UPDATE_PLACEHOLDERS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the update placeholders button." -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDER_VERSION_DESC="A count of the number of times this Language Placeholder has been revised." -COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDER_VERSION_LABEL="Revision" COM_COMPONENTBUILDER_LANGUAGE_PUBLISHING="Publishing" COM_COMPONENTBUILDER_LANGUAGE_SAVE_WARNING="Alias already existed so a number was added at the end. You can re-edit the Language to customise the alias." COM_COMPONENTBUILDER_LANGUAGE_STATUS="Status" +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION="Language Translation" +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS="Language Translations" +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_ACCESS="Language Translations Access" +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_ACCESS_DESC="Allows the users in this group to access access language translations" +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_BATCH_OPTIONS="Batch process the selected Language Translations" +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_BATCH_TIP="All changes will be applied to all selected Language Translations" +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_BATCH_USE="Language Translations Batch Use" +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch language translations" +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_CREATE="Language Translations Create" +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_CREATE_DESC="Allows the users in this group to create create language translations" +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_DASHBOARD_LIST="Language Translations Dashboard List" +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the language translation" +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_DELETE="Language Translations Delete" +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_DELETE_DESC="Allows the users in this group to delete delete language translations" +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EDIT="Language Translations Edit" +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EDIT_DESC="Allows the users in this group to edit the language translation" +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EDIT_OWN="Language Translations Edit Own" +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EDIT_OWN_DESC="Allows the users in this group to edit edit own language translations created by them" +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EDIT_STATE="Language Translations Edit State" +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EDIT_STATE_DESC="Allows the users in this group to update the state of the language translation" +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EDIT_VERSION="Language Translations Edit Version" +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version language translations" +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EXPORT="Language Translations Export" +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_EXPORT_DESC="Allows the users in this group to export export language translations" +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_IMPORT="Language Translations Import" +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_IMPORT_DESC="Allows the users in this group to import import language translations" +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_N_ITEMS_ARCHIVED="%s Language Translations archived." +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_N_ITEMS_ARCHIVED_1="%s Language Translation archived." +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_N_ITEMS_CHECKED_IN_0="No Language Translation successfully checked in." +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_N_ITEMS_CHECKED_IN_1="%d Language Translation successfully checked in." +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_N_ITEMS_CHECKED_IN_MORE="%d Language Translations successfully checked in." +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_N_ITEMS_DELETED="%s Language Translations deleted." +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_N_ITEMS_DELETED_1="%s Language Translation deleted." +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_N_ITEMS_FEATURED="%s Language Translations featured." +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_N_ITEMS_FEATURED_1="%s Language Translation featured." +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_N_ITEMS_PUBLISHED="%s Language Translations published." +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_N_ITEMS_PUBLISHED_1="%s Language Translation published." +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_N_ITEMS_TRASHED="%s Language Translations trashed." +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_N_ITEMS_TRASHED_1="%s Language Translation trashed." +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_N_ITEMS_UNFEATURED="%s Language Translations unfeatured." +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_N_ITEMS_UNFEATURED_1="%s Language Translation unfeatured." +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_N_ITEMS_UNPUBLISHED="%s Language Translations unpublished." +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_N_ITEMS_UNPUBLISHED_1="%s Language Translation unpublished." +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_SUBMENU="Language Translations Submenu" +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_SUBMENU_DESC="Allows the users in this group to update the submenu of the language translation" +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_COMPONENTS="Components" +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_COMPONENTS_LABEL="Components" +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_CREATED_BY_DESC="The user that created this Language Translation." +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_CREATED_BY_LABEL="Created By" +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_CREATED_DATE_DESC="The date this Language Translation was created." +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_CREATED_DATE_LABEL="Created Date" +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_DETAILS="Details" +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_EDIT="Editing the Language Translation" +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_ENTRANSLATION="Entranslation" +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_ENTRANSLATION_HINT="Automatically generated!" +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_ENTRANSLATION_LABEL="English String" +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_ERROR_UNIQUE_ALIAS="Another Language Translation has the same alias." +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_ID="Id" +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_LANGUAGE="Language" +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_LANGUAGE_LABEL="Language" +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_MODIFIED_BY_DESC="The last user that modified this Language Translation." +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_MODIFIED_BY_LABEL="Modified By" +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_MODIFIED_DATE_DESC="The date this Language Translation was modified." +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_MODIFIED_DATE_LABEL="Modified Date" +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_NEW="A New Language Translation" +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_ORDERING_LABEL="Ordering" +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_PERMISSION="Permissions" +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_PUBLISHING="Publishing" +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_SAVE_WARNING="Alias already existed so a number was added at the end. You can re-edit the Language Translation to customise the alias." +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_STATUS="Status" +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_TRANSLATION="Translation" +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_TRANSLATION_DESCRIPTION="The translation strings." +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_TRANSLATION_HINT="Translated String Here" +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_TRANSLATION_LABEL="Translated String" +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_TRANSLATION_SELECT="add/edit" +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_UPDATE_PLACEHOLDERS_BUTTON_ACCESS="Language Translation Update Placeholders Button Access" +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_UPDATE_PLACEHOLDERS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the update placeholders button." +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_VERSION_DESC="A count of the number of times this Language Translation has been revised." +COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_VERSION_LABEL="Revision" COM_COMPONENTBUILDER_LANGUAGE_VERSION_DESC="A count of the number of times this Language has been revised." COM_COMPONENTBUILDER_LANGUAGE_VERSION_LABEL="Revision" COM_COMPONENTBUILDER_LAYOUT="Layout" @@ -3833,7 +3831,7 @@ COM_COMPONENTBUILDER_SUBMENU_FIELDTYPES="Fieldtypes" COM_COMPONENTBUILDER_SUBMENU_HELP_DOCUMENTS="Help Documents" COM_COMPONENTBUILDER_SUBMENU_JOOMLA_COMPONENTS="Joomla Components" COM_COMPONENTBUILDER_SUBMENU_LANGUAGES="Languages" -COM_COMPONENTBUILDER_SUBMENU_LANGUAGE_PLACEHOLDERS="Language Placeholders" +COM_COMPONENTBUILDER_SUBMENU_LANGUAGE_TRANSLATIONS="Language Translations" COM_COMPONENTBUILDER_SUBMENU_LAYOUTS="Layouts" COM_COMPONENTBUILDER_SUBMENU_SITE_VIEWS="Site Views" COM_COMPONENTBUILDER_SUBMENU_SNIPPETS="Snippets" @@ -3951,6 +3949,7 @@ COM_COMPONENTBUILDER_THE_README_IS_LOADING="The readme is loading" COM_COMPONENTBUILDER_THE_WIKI_IS_LOADING="The wiki is loading" COM_COMPONENTBUILDER_THIS_PACKAGE_HAS_NO_KEY="This package has no key." COM_COMPONENTBUILDER_TO_CHANGE_THE_PACKAGE_OWNER_DEFAULTS_OPEN_THE_BJCB_GLOBAL_OPTIONSB_GO_TO_THE_BCOMPANYB_TAB_AND_ADD_THE_CORRECT_COMPANY_DETAILS_THERE="To change the package owner defaults. Open the JCB Global Options, go to the Company tab and add the correct company details there." +COM_COMPONENTBUILDER_TRANSLATION="Translation" COM_COMPONENTBUILDER_UPDATE_PLACEHOLDERS="Update Placeholders" COM_COMPONENTBUILDER_USE_BATCH="Use Batch" COM_COMPONENTBUILDER_USE_BATCH_DESC=" Allows users in this group to use batch copy/update method." diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.sys.ini b/admin/language/en-GB/en-GB.com_componentbuilder.sys.ini index f6bb5169e..16073e5f2 100644 --- a/admin/language/en-GB/en-GB.com_componentbuilder.sys.ini +++ b/admin/language/en-GB/en-GB.com_componentbuilder.sys.ini @@ -10,7 +10,7 @@ COM_COMPONENTBUILDER_MENU_FIELDS="Fields" COM_COMPONENTBUILDER_MENU_FIELDTYPES="Fieldtypes" COM_COMPONENTBUILDER_MENU_HELP_DOCUMENTS="Help Documents" COM_COMPONENTBUILDER_MENU_JOOMLA_COMPONENTS="Joomla Components" -COM_COMPONENTBUILDER_MENU_LANGUAGE_PLACEHOLDERS="Language Placeholders" +COM_COMPONENTBUILDER_MENU_LANGUAGE_TRANSLATIONS="Language Translations" COM_COMPONENTBUILDER_MENU_LAYOUTS="Layouts" COM_COMPONENTBUILDER_MENU_SITE_VIEWS="Site Views" COM_COMPONENTBUILDER_MENU_SNIPPETS="Snippets" diff --git a/admin/layouts/admin_view/css_fullwidth.php b/admin/layouts/admin_view/css_fullwidth.php index 550c0dae9..0cb611922 100644 --- a/admin/layouts/admin_view/css_fullwidth.php +++ b/admin/layouts/admin_view/css_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage css_fullwidth.php diff --git a/admin/layouts/admin_view/custom_buttons_fullwidth.php b/admin/layouts/admin_view/custom_buttons_fullwidth.php index 102e6a03a..706c3bbe0 100644 --- a/admin/layouts/admin_view/custom_buttons_fullwidth.php +++ b/admin/layouts/admin_view/custom_buttons_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_fullwidth.php diff --git a/admin/layouts/admin_view/custom_buttons_left.php b/admin/layouts/admin_view/custom_buttons_left.php index 61c408bfb..8c417c045 100644 --- a/admin/layouts/admin_view/custom_buttons_left.php +++ b/admin/layouts/admin_view/custom_buttons_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_left.php diff --git a/admin/layouts/admin_view/custom_import_fullwidth.php b/admin/layouts/admin_view/custom_import_fullwidth.php index 6944ad102..d8b46734c 100644 --- a/admin/layouts/admin_view/custom_import_fullwidth.php +++ b/admin/layouts/admin_view/custom_import_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_import_fullwidth.php diff --git a/admin/layouts/admin_view/fields_fullwidth.php b/admin/layouts/admin_view/fields_fullwidth.php index 6c1af6d8b..ac277b713 100644 --- a/admin/layouts/admin_view/fields_fullwidth.php +++ b/admin/layouts/admin_view/fields_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields_fullwidth.php diff --git a/admin/layouts/admin_view/javascript_fullwidth.php b/admin/layouts/admin_view/javascript_fullwidth.php index b67fdf81e..f257dc31f 100644 --- a/admin/layouts/admin_view/javascript_fullwidth.php +++ b/admin/layouts/admin_view/javascript_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage javascript_fullwidth.php diff --git a/admin/layouts/admin_view/linked_components_fullwidth.php b/admin/layouts/admin_view/linked_components_fullwidth.php index 3039789b5..994d07cc7 100644 --- a/admin/layouts/admin_view/linked_components_fullwidth.php +++ b/admin/layouts/admin_view/linked_components_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage linked_components_fullwidth.php diff --git a/admin/layouts/admin_view/mysql_fullwidth.php b/admin/layouts/admin_view/mysql_fullwidth.php index f9f7d484a..08cfebad3 100644 --- a/admin/layouts/admin_view/mysql_fullwidth.php +++ b/admin/layouts/admin_view/mysql_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage mysql_fullwidth.php diff --git a/admin/layouts/admin_view/mysql_left.php b/admin/layouts/admin_view/mysql_left.php index bbf4680d6..0e15001d6 100644 --- a/admin/layouts/admin_view/mysql_left.php +++ b/admin/layouts/admin_view/mysql_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage mysql_left.php diff --git a/admin/layouts/admin_view/php_fullwidth.php b/admin/layouts/admin_view/php_fullwidth.php index cecc00e79..0f9ee9163 100644 --- a/admin/layouts/admin_view/php_fullwidth.php +++ b/admin/layouts/admin_view/php_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage php_fullwidth.php diff --git a/admin/layouts/admin_view/publishing.php b/admin/layouts/admin_view/publishing.php index fd7f0e9c1..b33a65282 100644 --- a/admin/layouts/admin_view/publishing.php +++ b/admin/layouts/admin_view/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/admin_view/publlshing.php b/admin/layouts/admin_view/publlshing.php index 102b733fa..7505c2d8b 100644 --- a/admin/layouts/admin_view/publlshing.php +++ b/admin/layouts/admin_view/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/admin_view/settings_above.php b/admin/layouts/admin_view/settings_above.php index 0ca0ff6d5..99e29760d 100644 --- a/admin/layouts/admin_view/settings_above.php +++ b/admin/layouts/admin_view/settings_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_above.php diff --git a/admin/layouts/admin_view/settings_left.php b/admin/layouts/admin_view/settings_left.php index 6fdeeef5c..6241ae506 100644 --- a/admin/layouts/admin_view/settings_left.php +++ b/admin/layouts/admin_view/settings_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_left.php diff --git a/admin/layouts/admin_view/settings_right.php b/admin/layouts/admin_view/settings_right.php index 1ffb265b4..6cf9e090a 100644 --- a/admin/layouts/admin_view/settings_right.php +++ b/admin/layouts/admin_view/settings_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_right.php diff --git a/admin/layouts/admin_view/settings_under.php b/admin/layouts/admin_view/settings_under.php index b09035ef6..d03126be0 100644 --- a/admin/layouts/admin_view/settings_under.php +++ b/admin/layouts/admin_view/settings_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_under.php diff --git a/admin/layouts/batchselection.php b/admin/layouts/batchselection.php index bee289666..18002ac46 100644 --- a/admin/layouts/batchselection.php +++ b/admin/layouts/batchselection.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage batchselection.php diff --git a/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php b/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php index 7673dde26..063f67d61 100644 --- a/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php +++ b/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_fullwidth.php diff --git a/admin/layouts/custom_admin_view/custom_buttons_left.php b/admin/layouts/custom_admin_view/custom_buttons_left.php index 61c408bfb..8c417c045 100644 --- a/admin/layouts/custom_admin_view/custom_buttons_left.php +++ b/admin/layouts/custom_admin_view/custom_buttons_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_left.php diff --git a/admin/layouts/custom_admin_view/custom_script_fullwidth.php b/admin/layouts/custom_admin_view/custom_script_fullwidth.php index 3a97729c4..3198d3abe 100644 --- a/admin/layouts/custom_admin_view/custom_script_fullwidth.php +++ b/admin/layouts/custom_admin_view/custom_script_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_script_fullwidth.php diff --git a/admin/layouts/custom_admin_view/details_above.php b/admin/layouts/custom_admin_view/details_above.php index 504996d9f..34e490c28 100644 --- a/admin/layouts/custom_admin_view/details_above.php +++ b/admin/layouts/custom_admin_view/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/custom_admin_view/details_fullwidth.php b/admin/layouts/custom_admin_view/details_fullwidth.php index cce076d1b..1186f0475 100644 --- a/admin/layouts/custom_admin_view/details_fullwidth.php +++ b/admin/layouts/custom_admin_view/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/custom_admin_view/details_left.php b/admin/layouts/custom_admin_view/details_left.php index 4f0775c74..cc5e07514 100644 --- a/admin/layouts/custom_admin_view/details_left.php +++ b/admin/layouts/custom_admin_view/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/custom_admin_view/details_right.php b/admin/layouts/custom_admin_view/details_right.php index 4eb6d2668..3c5d9b135 100644 --- a/admin/layouts/custom_admin_view/details_right.php +++ b/admin/layouts/custom_admin_view/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/custom_admin_view/details_rightside.php b/admin/layouts/custom_admin_view/details_rightside.php index 88e5cd21a..1ba61b2bc 100644 --- a/admin/layouts/custom_admin_view/details_rightside.php +++ b/admin/layouts/custom_admin_view/details_rightside.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_rightside.php diff --git a/admin/layouts/custom_admin_view/details_under.php b/admin/layouts/custom_admin_view/details_under.php index 6b7267268..a4c7b61cc 100644 --- a/admin/layouts/custom_admin_view/details_under.php +++ b/admin/layouts/custom_admin_view/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/custom_admin_view/linked_components_fullwidth.php b/admin/layouts/custom_admin_view/linked_components_fullwidth.php index 63103555e..85e97268d 100644 --- a/admin/layouts/custom_admin_view/linked_components_fullwidth.php +++ b/admin/layouts/custom_admin_view/linked_components_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage linked_components_fullwidth.php diff --git a/admin/layouts/custom_admin_view/publishing.php b/admin/layouts/custom_admin_view/publishing.php index fd7f0e9c1..b33a65282 100644 --- a/admin/layouts/custom_admin_view/publishing.php +++ b/admin/layouts/custom_admin_view/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/custom_admin_view/publlshing.php b/admin/layouts/custom_admin_view/publlshing.php index 102b733fa..7505c2d8b 100644 --- a/admin/layouts/custom_admin_view/publlshing.php +++ b/admin/layouts/custom_admin_view/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/custom_code/details_above.php b/admin/layouts/custom_code/details_above.php index 86f1de6af..ef90f262a 100644 --- a/admin/layouts/custom_code/details_above.php +++ b/admin/layouts/custom_code/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/custom_code/details_fullwidth.php b/admin/layouts/custom_code/details_fullwidth.php index 504b775b8..542f0d0cb 100644 --- a/admin/layouts/custom_code/details_fullwidth.php +++ b/admin/layouts/custom_code/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/custom_code/details_left.php b/admin/layouts/custom_code/details_left.php index 341593b48..d3490529a 100644 --- a/admin/layouts/custom_code/details_left.php +++ b/admin/layouts/custom_code/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/custom_code/details_right.php b/admin/layouts/custom_code/details_right.php index 2a9885434..06c1df0d4 100644 --- a/admin/layouts/custom_code/details_right.php +++ b/admin/layouts/custom_code/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/custom_code/details_under.php b/admin/layouts/custom_code/details_under.php index 6b7267268..a4c7b61cc 100644 --- a/admin/layouts/custom_code/details_under.php +++ b/admin/layouts/custom_code/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/custom_code/publishing.php b/admin/layouts/custom_code/publishing.php index fd7f0e9c1..b33a65282 100644 --- a/admin/layouts/custom_code/publishing.php +++ b/admin/layouts/custom_code/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/custom_code/publlshing.php b/admin/layouts/custom_code/publlshing.php index 102b733fa..7505c2d8b 100644 --- a/admin/layouts/custom_code/publlshing.php +++ b/admin/layouts/custom_code/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/dynamic_get/abacus_fullwidth.php b/admin/layouts/dynamic_get/abacus_fullwidth.php index e79581b91..837a3e010 100644 --- a/admin/layouts/dynamic_get/abacus_fullwidth.php +++ b/admin/layouts/dynamic_get/abacus_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage abacus_fullwidth.php diff --git a/admin/layouts/dynamic_get/abacus_left.php b/admin/layouts/dynamic_get/abacus_left.php index cd978c29e..297af2b5a 100644 --- a/admin/layouts/dynamic_get/abacus_left.php +++ b/admin/layouts/dynamic_get/abacus_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage abacus_left.php diff --git a/admin/layouts/dynamic_get/custom_script_fullwidth.php b/admin/layouts/dynamic_get/custom_script_fullwidth.php index 286f1a279..df2c91bba 100644 --- a/admin/layouts/dynamic_get/custom_script_fullwidth.php +++ b/admin/layouts/dynamic_get/custom_script_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_script_fullwidth.php diff --git a/admin/layouts/dynamic_get/gettable_above.php b/admin/layouts/dynamic_get/gettable_above.php index fe8cab238..059fd9440 100644 --- a/admin/layouts/dynamic_get/gettable_above.php +++ b/admin/layouts/dynamic_get/gettable_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage gettable_above.php diff --git a/admin/layouts/dynamic_get/gettable_fullwidth.php b/admin/layouts/dynamic_get/gettable_fullwidth.php index 49cfba9c5..750e8441d 100644 --- a/admin/layouts/dynamic_get/gettable_fullwidth.php +++ b/admin/layouts/dynamic_get/gettable_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage gettable_fullwidth.php diff --git a/admin/layouts/dynamic_get/gettable_left.php b/admin/layouts/dynamic_get/gettable_left.php index 573df0c6b..2b2b47e9a 100644 --- a/admin/layouts/dynamic_get/gettable_left.php +++ b/admin/layouts/dynamic_get/gettable_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage gettable_left.php diff --git a/admin/layouts/dynamic_get/gettable_right.php b/admin/layouts/dynamic_get/gettable_right.php index ab92d21ed..784a02992 100644 --- a/admin/layouts/dynamic_get/gettable_right.php +++ b/admin/layouts/dynamic_get/gettable_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage gettable_right.php diff --git a/admin/layouts/dynamic_get/gettable_under.php b/admin/layouts/dynamic_get/gettable_under.php index 89dcb1824..e43f3c349 100644 --- a/admin/layouts/dynamic_get/gettable_under.php +++ b/admin/layouts/dynamic_get/gettable_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage gettable_under.php diff --git a/admin/layouts/dynamic_get/publishing.php b/admin/layouts/dynamic_get/publishing.php index fd7f0e9c1..b33a65282 100644 --- a/admin/layouts/dynamic_get/publishing.php +++ b/admin/layouts/dynamic_get/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/dynamic_get/publlshing.php b/admin/layouts/dynamic_get/publlshing.php index 102b733fa..7505c2d8b 100644 --- a/admin/layouts/dynamic_get/publlshing.php +++ b/admin/layouts/dynamic_get/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/field/details_fullwidth.php b/admin/layouts/field/details_fullwidth.php index 4e29edd30..44d8baccf 100644 --- a/admin/layouts/field/details_fullwidth.php +++ b/admin/layouts/field/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/field/details_left.php b/admin/layouts/field/details_left.php index 3995154e7..191999e08 100644 --- a/admin/layouts/field/details_left.php +++ b/admin/layouts/field/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/field/details_right.php b/admin/layouts/field/details_right.php index b59a4ce91..fa056bd4b 100644 --- a/admin/layouts/field/details_right.php +++ b/admin/layouts/field/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/field/details_under.php b/admin/layouts/field/details_under.php index 6b7267268..a4c7b61cc 100644 --- a/admin/layouts/field/details_under.php +++ b/admin/layouts/field/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/field/linked_admin_views_fullwidth.php b/admin/layouts/field/linked_admin_views_fullwidth.php index d57f044f1..4a0b49177 100644 --- a/admin/layouts/field/linked_admin_views_fullwidth.php +++ b/admin/layouts/field/linked_admin_views_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage linked_admin_views_fullwidth.php diff --git a/admin/layouts/field/publishing.php b/admin/layouts/field/publishing.php index fd7f0e9c1..b33a65282 100644 --- a/admin/layouts/field/publishing.php +++ b/admin/layouts/field/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/field/publlshing.php b/admin/layouts/field/publlshing.php index 102b733fa..7505c2d8b 100644 --- a/admin/layouts/field/publlshing.php +++ b/admin/layouts/field/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/field/scripts_left.php b/admin/layouts/field/scripts_left.php index ad05034b4..2c8fec09c 100644 --- a/admin/layouts/field/scripts_left.php +++ b/admin/layouts/field/scripts_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage scripts_left.php diff --git a/admin/layouts/field/scripts_right.php b/admin/layouts/field/scripts_right.php index 83967e257..e56eb310c 100644 --- a/admin/layouts/field/scripts_right.php +++ b/admin/layouts/field/scripts_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage scripts_right.php diff --git a/admin/layouts/fieldtype/details_left.php b/admin/layouts/fieldtype/details_left.php index 4c6d7851d..2d4b44214 100644 --- a/admin/layouts/fieldtype/details_left.php +++ b/admin/layouts/fieldtype/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/fieldtype/details_right.php b/admin/layouts/fieldtype/details_right.php index 5a5c2c7eb..2cd249bee 100644 --- a/admin/layouts/fieldtype/details_right.php +++ b/admin/layouts/fieldtype/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/fieldtype/fields_fullwidth.php b/admin/layouts/fieldtype/fields_fullwidth.php index b1026dc58..28f1a2baf 100644 --- a/admin/layouts/fieldtype/fields_fullwidth.php +++ b/admin/layouts/fieldtype/fields_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields_fullwidth.php diff --git a/admin/layouts/fieldtype/publishing.php b/admin/layouts/fieldtype/publishing.php index fd7f0e9c1..b33a65282 100644 --- a/admin/layouts/fieldtype/publishing.php +++ b/admin/layouts/fieldtype/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/fieldtype/publlshing.php b/admin/layouts/fieldtype/publlshing.php index 102b733fa..7505c2d8b 100644 --- a/admin/layouts/fieldtype/publlshing.php +++ b/admin/layouts/fieldtype/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/help_document/details_above.php b/admin/layouts/help_document/details_above.php index be3f279c1..8aeea4642 100644 --- a/admin/layouts/help_document/details_above.php +++ b/admin/layouts/help_document/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/help_document/details_fullwidth.php b/admin/layouts/help_document/details_fullwidth.php index 3860f070c..73fccb3df 100644 --- a/admin/layouts/help_document/details_fullwidth.php +++ b/admin/layouts/help_document/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/help_document/details_left.php b/admin/layouts/help_document/details_left.php index 620d9a485..b3cb99a24 100644 --- a/admin/layouts/help_document/details_left.php +++ b/admin/layouts/help_document/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/help_document/details_right.php b/admin/layouts/help_document/details_right.php index 86b4974f9..9bc7cf32b 100644 --- a/admin/layouts/help_document/details_right.php +++ b/admin/layouts/help_document/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/help_document/details_under.php b/admin/layouts/help_document/details_under.php index 6b7267268..a4c7b61cc 100644 --- a/admin/layouts/help_document/details_under.php +++ b/admin/layouts/help_document/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/help_document/publishing.php b/admin/layouts/help_document/publishing.php index fd7f0e9c1..b33a65282 100644 --- a/admin/layouts/help_document/publishing.php +++ b/admin/layouts/help_document/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/help_document/publlshing.php b/admin/layouts/help_document/publlshing.php index bfe84d83b..a5f98e954 100644 --- a/admin/layouts/help_document/publlshing.php +++ b/admin/layouts/help_document/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/joomla_component/admin_views_fullwidth.php b/admin/layouts/joomla_component/admin_views_fullwidth.php index 821ca1c1e..05a9cac95 100644 --- a/admin/layouts/joomla_component/admin_views_fullwidth.php +++ b/admin/layouts/joomla_component/admin_views_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_views_fullwidth.php diff --git a/admin/layouts/joomla_component/custom_admin_views_fullwidth.php b/admin/layouts/joomla_component/custom_admin_views_fullwidth.php index 66d714542..bc89a5555 100644 --- a/admin/layouts/joomla_component/custom_admin_views_fullwidth.php +++ b/admin/layouts/joomla_component/custom_admin_views_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_admin_views_fullwidth.php diff --git a/admin/layouts/joomla_component/details_above.php b/admin/layouts/joomla_component/details_above.php index 504996d9f..34e490c28 100644 --- a/admin/layouts/joomla_component/details_above.php +++ b/admin/layouts/joomla_component/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/joomla_component/details_left.php b/admin/layouts/joomla_component/details_left.php index 05344d065..f17052143 100644 --- a/admin/layouts/joomla_component/details_left.php +++ b/admin/layouts/joomla_component/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/joomla_component/details_right.php b/admin/layouts/joomla_component/details_right.php index c584cc88c..25d0c15bf 100644 --- a/admin/layouts/joomla_component/details_right.php +++ b/admin/layouts/joomla_component/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/joomla_component/details_under.php b/admin/layouts/joomla_component/details_under.php index 6b7267268..a4c7b61cc 100644 --- a/admin/layouts/joomla_component/details_under.php +++ b/admin/layouts/joomla_component/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/joomla_component/dynamic_build_beta_fullwidth.php b/admin/layouts/joomla_component/dynamic_build_beta_fullwidth.php index ba1c42727..1cdbf48b0 100644 --- a/admin/layouts/joomla_component/dynamic_build_beta_fullwidth.php +++ b/admin/layouts/joomla_component/dynamic_build_beta_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage dynamic_build_beta_fullwidth.php diff --git a/admin/layouts/joomla_component/dynamic_integration_fullwidth.php b/admin/layouts/joomla_component/dynamic_integration_fullwidth.php index 647c9ffa5..6fbe413de 100644 --- a/admin/layouts/joomla_component/dynamic_integration_fullwidth.php +++ b/admin/layouts/joomla_component/dynamic_integration_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage dynamic_integration_fullwidth.php diff --git a/admin/layouts/joomla_component/libs_helpers_fullwidth.php b/admin/layouts/joomla_component/libs_helpers_fullwidth.php index 76695645d..44d216622 100644 --- a/admin/layouts/joomla_component/libs_helpers_fullwidth.php +++ b/admin/layouts/joomla_component/libs_helpers_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage libs_helpers_fullwidth.php diff --git a/admin/layouts/joomla_component/mysql_fullwidth.php b/admin/layouts/joomla_component/mysql_fullwidth.php index d44e2d48f..4711b8cc1 100644 --- a/admin/layouts/joomla_component/mysql_fullwidth.php +++ b/admin/layouts/joomla_component/mysql_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage mysql_fullwidth.php diff --git a/admin/layouts/joomla_component/php_fullwidth.php b/admin/layouts/joomla_component/php_fullwidth.php index 50ca04d72..ccf25863c 100644 --- a/admin/layouts/joomla_component/php_fullwidth.php +++ b/admin/layouts/joomla_component/php_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage php_fullwidth.php diff --git a/admin/layouts/joomla_component/publishing.php b/admin/layouts/joomla_component/publishing.php index fd7f0e9c1..b33a65282 100644 --- a/admin/layouts/joomla_component/publishing.php +++ b/admin/layouts/joomla_component/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/joomla_component/publlshing.php b/admin/layouts/joomla_component/publlshing.php index 102b733fa..7505c2d8b 100644 --- a/admin/layouts/joomla_component/publlshing.php +++ b/admin/layouts/joomla_component/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/joomla_component/readme_left.php b/admin/layouts/joomla_component/readme_left.php index 9856adfcd..fde1474a5 100644 --- a/admin/layouts/joomla_component/readme_left.php +++ b/admin/layouts/joomla_component/readme_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage readme_left.php diff --git a/admin/layouts/joomla_component/readme_right.php b/admin/layouts/joomla_component/readme_right.php index 93168fe04..0d4902683 100644 --- a/admin/layouts/joomla_component/readme_right.php +++ b/admin/layouts/joomla_component/readme_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage readme_right.php diff --git a/admin/layouts/joomla_component/settings_left.php b/admin/layouts/joomla_component/settings_left.php index a9448bca5..43537ac04 100644 --- a/admin/layouts/joomla_component/settings_left.php +++ b/admin/layouts/joomla_component/settings_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_left.php diff --git a/admin/layouts/joomla_component/settings_right.php b/admin/layouts/joomla_component/settings_right.php index 17b1f2fd7..fb394b979 100644 --- a/admin/layouts/joomla_component/settings_right.php +++ b/admin/layouts/joomla_component/settings_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_right.php diff --git a/admin/layouts/joomla_component/site_views_fullwidth.php b/admin/layouts/joomla_component/site_views_fullwidth.php index 882082134..6c19ac874 100644 --- a/admin/layouts/joomla_component/site_views_fullwidth.php +++ b/admin/layouts/joomla_component/site_views_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage site_views_fullwidth.php diff --git a/admin/layouts/language/details_left.php b/admin/layouts/language/details_left.php index bbd6dcc61..af41d6b66 100644 --- a/admin/layouts/language/details_left.php +++ b/admin/layouts/language/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/language/details_right.php b/admin/layouts/language/details_right.php index 5668a76fa..ac453907c 100644 --- a/admin/layouts/language/details_right.php +++ b/admin/layouts/language/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/language/publishing.php b/admin/layouts/language/publishing.php index fd7f0e9c1..b33a65282 100644 --- a/admin/layouts/language/publishing.php +++ b/admin/layouts/language/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/language/publlshing.php b/admin/layouts/language/publlshing.php index 102b733fa..7505c2d8b 100644 --- a/admin/layouts/language/publlshing.php +++ b/admin/layouts/language/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/language_placeholder/details_above.php b/admin/layouts/language_translation/details_above.php similarity index 96% rename from admin/layouts/language_placeholder/details_above.php rename to admin/layouts/language_translation/details_above.php index cd900471d..4306eae55 100644 --- a/admin/layouts/language_placeholder/details_above.php +++ b/admin/layouts/language_translation/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/language_placeholder/details_fullwidth.php b/admin/layouts/language_translation/details_fullwidth.php similarity index 96% rename from admin/layouts/language_placeholder/details_fullwidth.php rename to admin/layouts/language_translation/details_fullwidth.php index 7931472c5..9cfcbf79e 100644 --- a/admin/layouts/language_placeholder/details_fullwidth.php +++ b/admin/layouts/language_translation/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php @@ -30,7 +30,7 @@ defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); $fields = $displayData->get('fields') ?: array( - 'placeholder', + 'entranslation', 'translation' ); diff --git a/admin/layouts/language_placeholder/index.html b/admin/layouts/language_translation/index.html similarity index 100% rename from admin/layouts/language_placeholder/index.html rename to admin/layouts/language_translation/index.html diff --git a/admin/layouts/language_placeholder/publishing.php b/admin/layouts/language_translation/publishing.php similarity index 96% rename from admin/layouts/language_placeholder/publishing.php rename to admin/layouts/language_translation/publishing.php index fd7f0e9c1..b33a65282 100644 --- a/admin/layouts/language_placeholder/publishing.php +++ b/admin/layouts/language_translation/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/language_placeholder/publlshing.php b/admin/layouts/language_translation/publlshing.php similarity index 96% rename from admin/layouts/language_placeholder/publlshing.php rename to admin/layouts/language_translation/publlshing.php index 102b733fa..7505c2d8b 100644 --- a/admin/layouts/language_placeholder/publlshing.php +++ b/admin/layouts/language_translation/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/layout/custom_script_fullwidth.php b/admin/layouts/layout/custom_script_fullwidth.php index 03dbc25a1..291a49bb9 100644 --- a/admin/layouts/layout/custom_script_fullwidth.php +++ b/admin/layouts/layout/custom_script_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_script_fullwidth.php diff --git a/admin/layouts/layout/details_fullwidth.php b/admin/layouts/layout/details_fullwidth.php index 58b1d4d47..751b2c3e0 100644 --- a/admin/layouts/layout/details_fullwidth.php +++ b/admin/layouts/layout/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/layout/details_left.php b/admin/layouts/layout/details_left.php index 1b871120b..f16793487 100644 --- a/admin/layouts/layout/details_left.php +++ b/admin/layouts/layout/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/layout/details_right.php b/admin/layouts/layout/details_right.php index b7c3154a7..cf36704f8 100644 --- a/admin/layouts/layout/details_right.php +++ b/admin/layouts/layout/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/layout/details_rightside.php b/admin/layouts/layout/details_rightside.php index 15e0158f2..9fa9979c9 100644 --- a/admin/layouts/layout/details_rightside.php +++ b/admin/layouts/layout/details_rightside.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_rightside.php diff --git a/admin/layouts/layout/details_under.php b/admin/layouts/layout/details_under.php index 6b7267268..a4c7b61cc 100644 --- a/admin/layouts/layout/details_under.php +++ b/admin/layouts/layout/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/layout/publishing.php b/admin/layouts/layout/publishing.php index fd7f0e9c1..b33a65282 100644 --- a/admin/layouts/layout/publishing.php +++ b/admin/layouts/layout/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/layout/publlshing.php b/admin/layouts/layout/publlshing.php index 102b733fa..7505c2d8b 100644 --- a/admin/layouts/layout/publlshing.php +++ b/admin/layouts/layout/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/site_view/custom_buttons_fullwidth.php b/admin/layouts/site_view/custom_buttons_fullwidth.php index 7673dde26..063f67d61 100644 --- a/admin/layouts/site_view/custom_buttons_fullwidth.php +++ b/admin/layouts/site_view/custom_buttons_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_fullwidth.php diff --git a/admin/layouts/site_view/custom_buttons_left.php b/admin/layouts/site_view/custom_buttons_left.php index 4c313eafb..1221a2927 100644 --- a/admin/layouts/site_view/custom_buttons_left.php +++ b/admin/layouts/site_view/custom_buttons_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_left.php diff --git a/admin/layouts/site_view/custom_buttons_right.php b/admin/layouts/site_view/custom_buttons_right.php index 58bf7c7ee..b1df3418b 100644 --- a/admin/layouts/site_view/custom_buttons_right.php +++ b/admin/layouts/site_view/custom_buttons_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_right.php diff --git a/admin/layouts/site_view/details_above.php b/admin/layouts/site_view/details_above.php index 504996d9f..34e490c28 100644 --- a/admin/layouts/site_view/details_above.php +++ b/admin/layouts/site_view/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/site_view/details_fullwidth.php b/admin/layouts/site_view/details_fullwidth.php index cce076d1b..1186f0475 100644 --- a/admin/layouts/site_view/details_fullwidth.php +++ b/admin/layouts/site_view/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/site_view/details_left.php b/admin/layouts/site_view/details_left.php index 4f0775c74..cc5e07514 100644 --- a/admin/layouts/site_view/details_left.php +++ b/admin/layouts/site_view/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/site_view/details_right.php b/admin/layouts/site_view/details_right.php index b7c3154a7..cf36704f8 100644 --- a/admin/layouts/site_view/details_right.php +++ b/admin/layouts/site_view/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/site_view/details_rightside.php b/admin/layouts/site_view/details_rightside.php index 88e5cd21a..1ba61b2bc 100644 --- a/admin/layouts/site_view/details_rightside.php +++ b/admin/layouts/site_view/details_rightside.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_rightside.php diff --git a/admin/layouts/site_view/details_under.php b/admin/layouts/site_view/details_under.php index 6b7267268..a4c7b61cc 100644 --- a/admin/layouts/site_view/details_under.php +++ b/admin/layouts/site_view/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/site_view/javascript_css_fullwidth.php b/admin/layouts/site_view/javascript_css_fullwidth.php index ae709dcf6..7776933af 100644 --- a/admin/layouts/site_view/javascript_css_fullwidth.php +++ b/admin/layouts/site_view/javascript_css_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage javascript_css_fullwidth.php diff --git a/admin/layouts/site_view/linked_components_fullwidth.php b/admin/layouts/site_view/linked_components_fullwidth.php index ea33c894b..2dce96820 100644 --- a/admin/layouts/site_view/linked_components_fullwidth.php +++ b/admin/layouts/site_view/linked_components_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage linked_components_fullwidth.php diff --git a/admin/layouts/site_view/php_fullwidth.php b/admin/layouts/site_view/php_fullwidth.php index e3b21813e..61885aa73 100644 --- a/admin/layouts/site_view/php_fullwidth.php +++ b/admin/layouts/site_view/php_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage php_fullwidth.php diff --git a/admin/layouts/site_view/publishing.php b/admin/layouts/site_view/publishing.php index fd7f0e9c1..b33a65282 100644 --- a/admin/layouts/site_view/publishing.php +++ b/admin/layouts/site_view/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/site_view/publlshing.php b/admin/layouts/site_view/publlshing.php index 102b733fa..7505c2d8b 100644 --- a/admin/layouts/site_view/publlshing.php +++ b/admin/layouts/site_view/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/snippet/details_above.php b/admin/layouts/snippet/details_above.php index ae3f9befe..274b24757 100644 --- a/admin/layouts/snippet/details_above.php +++ b/admin/layouts/snippet/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/snippet/details_left.php b/admin/layouts/snippet/details_left.php index 91c917bb4..4a29cdf44 100644 --- a/admin/layouts/snippet/details_left.php +++ b/admin/layouts/snippet/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/snippet/details_right.php b/admin/layouts/snippet/details_right.php index 4ab0fdb12..2de423150 100644 --- a/admin/layouts/snippet/details_right.php +++ b/admin/layouts/snippet/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/snippet/publishing.php b/admin/layouts/snippet/publishing.php index fd7f0e9c1..b33a65282 100644 --- a/admin/layouts/snippet/publishing.php +++ b/admin/layouts/snippet/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/snippet/publlshing.php b/admin/layouts/snippet/publlshing.php index 102b733fa..7505c2d8b 100644 --- a/admin/layouts/snippet/publlshing.php +++ b/admin/layouts/snippet/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/template/custom_script_fullwidth.php b/admin/layouts/template/custom_script_fullwidth.php index 03dbc25a1..291a49bb9 100644 --- a/admin/layouts/template/custom_script_fullwidth.php +++ b/admin/layouts/template/custom_script_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_script_fullwidth.php diff --git a/admin/layouts/template/details_fullwidth.php b/admin/layouts/template/details_fullwidth.php index f71dfae2d..518a316db 100644 --- a/admin/layouts/template/details_fullwidth.php +++ b/admin/layouts/template/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/template/details_left.php b/admin/layouts/template/details_left.php index 1b871120b..f16793487 100644 --- a/admin/layouts/template/details_left.php +++ b/admin/layouts/template/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/template/details_right.php b/admin/layouts/template/details_right.php index b7c3154a7..cf36704f8 100644 --- a/admin/layouts/template/details_right.php +++ b/admin/layouts/template/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/template/details_rightside.php b/admin/layouts/template/details_rightside.php index 15e0158f2..9fa9979c9 100644 --- a/admin/layouts/template/details_rightside.php +++ b/admin/layouts/template/details_rightside.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_rightside.php diff --git a/admin/layouts/template/details_under.php b/admin/layouts/template/details_under.php index 6b7267268..a4c7b61cc 100644 --- a/admin/layouts/template/details_under.php +++ b/admin/layouts/template/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/template/publishing.php b/admin/layouts/template/publishing.php index fd7f0e9c1..b33a65282 100644 --- a/admin/layouts/template/publishing.php +++ b/admin/layouts/template/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/template/publlshing.php b/admin/layouts/template/publlshing.php index 102b733fa..7505c2d8b 100644 --- a/admin/layouts/template/publlshing.php +++ b/admin/layouts/template/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/models/ajax.php b/admin/models/ajax.php index b940f5ce9..01e5c1848 100644 --- a/admin/models/ajax.php +++ b/admin/models/ajax.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage ajax.php @@ -1055,5 +1055,225 @@ class ComponentbuilderModelAjax extends JModelList return $field; } return false; + } + + // Used in language_translation + protected $functionArray = array( + 'translation' => 'checkString', + 'language' => 'getLanguageName'); + + protected function checkString($header, $value) + { + return $value; + } + + protected function getLanguageName($header, $value) + { + if ($name = ComponentbuilderHelper::getVar($header, $value, 'langtag', 'name')) + { + return $name . ' (' . $value . ')'; + } + return $value; + } + + protected function setAutoLangZero() + { + // set the headers + $headers = array( + 'translation' => JText::_('COM_COMPONENTBUILDER_TRANSLATION'), + 'language' => JText::_('COM_COMPONENTBUILDER_LANGUAGE') + ); + // loop the array + foreach ($headers as $key => $lang) + { + $this->setLanguage($key,$lang); + } + } + + protected $languageArray = array(); + + protected function setLanguage($key,$lang) + { + $this->languageArray[$key] = $lang; + } + + public function getLanguage() + { + // return the language string that were set + return $this->languageArray; + } + + protected function autoLoader() + { + $functions = range(0,10); + foreach ($functions as $function) + { + $function = 'setAutoLang'.ComponentbuilderHelper::safeString($function, 'f'); + if (method_exists($this, $function)) + { + $this->{$function}(); + } + } + foreach ($functions as $function) + { + $function = 'setAutoFunc'.ComponentbuilderHelper::safeString($function, 'f'); + if (method_exists($this, $function)) + { + $this->{$function}(); + } + } + } + + public function getBuildTable($idName, $oject) + { + if (ComponentbuilderHelper::checkJson($oject) && ComponentbuilderHelper::checkString($idName)) + { + $array = json_decode($oject, true); + if (ComponentbuilderHelper::checkArray($array)) + { + // make sure we run the autoloader to insure all is set + $this->autoLoader(); + // set the target headers + $targetHeaders = $this->getLanguage(); + // start table build + $table = ''; + $rows = array(); + foreach ($array as $header => $values) + { + if (ComponentbuilderHelper::checkArray($values)) + { + $targetHeader = (isset($targetHeaders[$header])) ? $targetHeaders[$header] : ComponentbuilderHelper::safeString($header, 'W'); + $table .= ''; + + foreach ($values as $nr => $value) + { + // set the value for the row + $this->setRows($nr, $this->setValue($header, $value), $rows); + } + } + } + // close header start body + $table .= ''; + // add rows to table + if (ComponentbuilderHelper::checkArray($rows)) + { + foreach ($rows as $row) + { + $table .= ''.$row.''; + } + } + // close the body and table + $table .= '
'.$targetHeader.'
'; + // return the table + return $table; + } + } + return false; + } + + protected function setValue($header, $value) + { + if (array_key_exists($header, $this->functionArray) && method_exists($this, $this->functionArray[$header])) + { + $value = $this->{$this->functionArray[$header]}($header, $value); + } + // if no value are set + if (!ComponentbuilderHelper::checkString($value)) + { + $value = '-'; + } + // make total stand out + if ('total' == $header) + { + $value = ''.$value.''; + } + return $value; + } + + protected function setRows($nr, $value, &$rows) + { + // build rows + if (!isset($rows[$nr])) + { + $rows[$nr] = ''.$value.''; + } + else + { + $rows[$nr] .= ''.$value.''; + } + } + + protected $viewid = array(); + + protected function getViewID($call = 'table') + { + if (!isset($this->viewid[$call])) + { + // get the vdm key + $jinput = JFactory::getApplication()->input; + $vdm = $jinput->get('vdm', null, 'WORD'); + if ($vdm) + { + if ($view = ComponentbuilderHelper::get($vdm)) + { + $current = (array) explode('__', $view); + if (ComponentbuilderHelper::checkString($current[0]) && isset($current[1]) && is_numeric($current[1])) + { + // get the view name & id + $this->viewid[$call] = array( + 'a_id' => (int) $current[1], + 'a_view' => $current[0] + ); + } + } + } + } + if (isset($this->viewid[$call])) + { + return $this->viewid[$call]; + } + return false; + } + + protected $buttonArray = array( + 'language' => true); + + public function getButton($type) + { + if (isset($this->buttonArray[$type])) + { + $user = JFactory::getUser(); + // only add if user allowed to create + if ($user->authorise($type.'.create', 'com_componentbuilder')) + { + // get the input from url + $jinput = JFactory::getApplication()->input; + // get the view name & id + $values = $this->getViewID(); + // check if new item + $ref = ''; + if (!is_null($values['a_id']) && $values['a_id'] > 0 && strlen($values['a_view'])) + { + // only load referal if not new item. + $ref = '&ref=' . $values['a_view'] . '&refid=' . $values['a_id']; + } + // build the button + $button = ''; + // return the button attached to input field + return $button; + } + return ''; + } + return false; } } diff --git a/admin/models/componentbuilder.php b/admin/models/componentbuilder.php index 31ea9ed7b..1686b2d4a 100644 --- a/admin/models/componentbuilder.php +++ b/admin/models/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php @@ -43,7 +43,7 @@ class ComponentbuilderModelComponentbuilder extends JModelList $icons = array(); // view groups array $viewGroups = array( - 'main' => array('png.compiler', 'png.joomla_component.add', 'png.joomla_components', 'png.admin_view.add', 'png.admin_views', 'png.custom_admin_view.add', 'png.custom_admin_views', 'png.site_view.add', 'png.site_views', 'png.template.add', 'png.templates', 'png.layout.add', 'png.layouts', 'png.dynamic_get.add', 'png.dynamic_gets', 'png.custom_codes', 'png.snippet.add', 'png.snippets', 'png.field.add', 'png.fields', 'png.fields.catid', 'png.fieldtype.add', 'png.fieldtypes', 'png.fieldtypes.catid', 'png.language_placeholder.add', 'png.language_placeholders', 'png.help_document.add', 'png.help_documents') + 'main' => array('png.compiler', 'png.joomla_component.add', 'png.joomla_components', 'png.admin_view.add', 'png.admin_views', 'png.custom_admin_view.add', 'png.custom_admin_views', 'png.site_view.add', 'png.site_views', 'png.template.add', 'png.templates', 'png.layout.add', 'png.layouts', 'png.dynamic_get.add', 'png.dynamic_gets', 'png.custom_codes', 'png.snippet.add', 'png.snippets', 'png.field.add', 'png.fields', 'png.fields.catid', 'png.fieldtype.add', 'png.fieldtypes', 'png.fieldtypes.catid', 'png.language_translations', 'png.help_document.add', 'png.help_documents') ); // view access array $viewAccess = array( @@ -107,12 +107,11 @@ class ComponentbuilderModelComponentbuilder extends JModelList 'fieldtypes.submenu' => 'fieldtype.submenu', 'fieldtypes.dashboard_list' => 'fieldtype.dashboard_list', 'fieldtype.dashboard_add' => 'fieldtype.dashboard_add', - 'language_placeholder.create' => 'language_placeholder.create', - 'language_placeholders.access' => 'language_placeholder.access', - 'language_placeholder.access' => 'language_placeholder.access', - 'language_placeholders.submenu' => 'language_placeholder.submenu', - 'language_placeholders.dashboard_list' => 'language_placeholder.dashboard_list', - 'language_placeholder.dashboard_add' => 'language_placeholder.dashboard_add', + 'language_translation.create' => 'language_translation.create', + 'language_translations.access' => 'language_translation.access', + 'language_translation.access' => 'language_translation.access', + 'language_translations.submenu' => 'language_translation.submenu', + 'language_translations.dashboard_list' => 'language_translation.dashboard_list', 'language.create' => 'language.create', 'languages.access' => 'language.access', 'language.access' => 'language.access', diff --git a/admin/models/custom_code.php b/admin/models/custom_code.php index fd32e8234..f3c0bab94 100644 --- a/admin/models/custom_code.php +++ b/admin/models/custom_code.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 81 of this MVC - @build 1st March, 2017 + @version @update number 82 of this MVC + @build 3rd April, 2017 @created 11th October, 2016 @package Component Builder @subpackage custom_code.php diff --git a/admin/models/custom_codes.php b/admin/models/custom_codes.php index b361506a2..1a0f38663 100644 --- a/admin/models/custom_codes.php +++ b/admin/models/custom_codes.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 81 of this MVC - @build 1st March, 2017 + @version @update number 82 of this MVC + @build 3rd April, 2017 @created 11th October, 2016 @package Component Builder @subpackage custom_codes.php @@ -280,7 +280,7 @@ class ComponentbuilderModelCustom_codes extends JModelList else { $search = $db->quote('%' . $db->escape($search) . '%'); - $query->where('(a.component LIKE '.$search.' OR g.system_name LIKE '.$search.' OR a.path LIKE '.$search.' OR a.comment_type LIKE '.$search.' OR a.system_name LIKE '.$search.' OR a.function_name LIKE '.$search.')'); + $query->where('(a.component LIKE '.$search.' OR g.system_name LIKE '.$search.' OR a.path LIKE '.$search.' OR a.comment_type LIKE '.$search.' OR a.function_name LIKE '.$search.' OR a.system_name LIKE '.$search.')'); } } diff --git a/admin/models/fields/adminviewfolderlist.php b/admin/models/fields/adminviewfolderlist.php index 6bd862dcc..d883578ab 100644 --- a/admin/models/fields/adminviewfolderlist.php +++ b/admin/models/fields/adminviewfolderlist.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage adminviewfolderlist.php diff --git a/admin/models/fields/adminviews.php b/admin/models/fields/adminviews.php index 21cd45aae..3a74a62b3 100644 --- a/admin/models/fields/adminviews.php +++ b/admin/models/fields/adminviews.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage adminviews.php diff --git a/admin/models/fields/articles.php b/admin/models/fields/articles.php index da5c24105..315ae86cc 100644 --- a/admin/models/fields/articles.php +++ b/admin/models/fields/articles.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage articles.php diff --git a/admin/models/fields/component.php b/admin/models/fields/component.php index 62bb7a857..8db383156 100644 --- a/admin/models/fields/component.php +++ b/admin/models/fields/component.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage component.php diff --git a/admin/models/fields/components.php b/admin/models/fields/components.php index 932631b2c..683a5b056 100644 --- a/admin/models/fields/components.php +++ b/admin/models/fields/components.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage components.php diff --git a/admin/models/fields/customadminviews.php b/admin/models/fields/customadminviews.php index 82c2254ef..d7ea3bcfd 100644 --- a/admin/models/fields/customadminviews.php +++ b/admin/models/fields/customadminviews.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage customadminviews.php diff --git a/admin/models/fields/customfilelist.php b/admin/models/fields/customfilelist.php index ef0423759..b60eeebc1 100644 --- a/admin/models/fields/customfilelist.php +++ b/admin/models/fields/customfilelist.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage customfilelist.php diff --git a/admin/models/fields/customfolderlist.php b/admin/models/fields/customfolderlist.php index 61349411d..dfda4c17d 100644 --- a/admin/models/fields/customfolderlist.php +++ b/admin/models/fields/customfolderlist.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage customfolderlist.php diff --git a/admin/models/fields/customgets.php b/admin/models/fields/customgets.php index 9901bab42..697419c8d 100644 --- a/admin/models/fields/customgets.php +++ b/admin/models/fields/customgets.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage customgets.php diff --git a/admin/models/fields/dbtables.php b/admin/models/fields/dbtables.php index 92e299f13..289d6a192 100644 --- a/admin/models/fields/dbtables.php +++ b/admin/models/fields/dbtables.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage dbtables.php diff --git a/admin/models/fields/dynamicget.php b/admin/models/fields/dynamicget.php index c909976ae..90f37a006 100644 --- a/admin/models/fields/dynamicget.php +++ b/admin/models/fields/dynamicget.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage dynamicget.php diff --git a/admin/models/fields/dynamicgets.php b/admin/models/fields/dynamicgets.php index 104a58dc7..a5aafeafd 100644 --- a/admin/models/fields/dynamicgets.php +++ b/admin/models/fields/dynamicgets.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage dynamicgets.php diff --git a/admin/models/fields/fields.php b/admin/models/fields/fields.php index 1a227063f..498067c68 100644 --- a/admin/models/fields/fields.php +++ b/admin/models/fields/fields.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields.php diff --git a/admin/models/fields/fieldsmulti.php b/admin/models/fields/fieldsmulti.php index 133027a89..1c894c34d 100644 --- a/admin/models/fields/fieldsmulti.php +++ b/admin/models/fields/fieldsmulti.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage fieldsmulti.php diff --git a/admin/models/fields/fieldtypes.php b/admin/models/fields/fieldtypes.php index 5a6c23401..f27a9f953 100644 --- a/admin/models/fields/fieldtypes.php +++ b/admin/models/fields/fieldtypes.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage fieldtypes.php diff --git a/admin/models/fields/lang.php b/admin/models/fields/lang.php new file mode 100644 index 000000000..6f7dd4da6 --- /dev/null +++ b/admin/models/fields/lang.php @@ -0,0 +1,171 @@ + + @copyright Copyright (C) 2015. All Rights Reserved + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Builds Complex Joomla Components + +/-----------------------------------------------------------------------------------------------------------------------------*/ + +// No direct access to this file +defined('_JEXEC') or die('Restricted access'); + +// import the list field type +jimport('joomla.form.helper'); +JFormHelper::loadFieldClass('list'); + +/** + * Lang Form Field class for the Componentbuilder component + */ +class JFormFieldLang extends JFormFieldList +{ + /** + * The lang field type. + * + * @var string + */ + public $type = 'lang'; + /** + * Override to add new button + * + * @return string The field input markup. + * + * @since 3.2 + */ + protected function getInput() + { + // see if we should add buttons + $setButton = $this->getAttribute('button'); + // get html + $html = parent::getInput(); + // if true set button + if ($setButton === 'true') + { + $button = array(); + $script = array(); + $buttonName = $this->getAttribute('name'); + // get the input from url + $app = JFactory::getApplication(); + $jinput = $app->input; + // get the view name & id + $values = $jinput->getArray(array( + 'id' => 'int', + 'view' => 'word' + )); + // check if new item + $ref = ''; + $refJ = ''; + if (!is_null($values['id']) && strlen($values['view'])) + { + // only load referal if not new item. + $ref = '&ref=' . $values['view'] . '&refid=' . $values['id']; + $refJ = '&ref=' . $values['view'] . '&refid=' . $values['id']; + } + $user = JFactory::getUser(); + // only add if user allowed to create language + if ($user->authorise('language.create', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area. + { + // build Create button + $buttonNamee = trim($buttonName); + $buttonNamee = preg_replace('/_+/', ' ', $buttonNamee); + $buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee); + $buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee); + $buttonNamee = ucfirst(strtolower($buttonNamee)); + $button[] = ' + '; + } + // only add if user allowed to edit language + if (($buttonName === 'language' || $buttonName === 'languages') && $user->authorise('language.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area. + { + // build edit button + $buttonNamee = trim($buttonName); + $buttonNamee = preg_replace('/_+/', ' ', $buttonNamee); + $buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee); + $buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee); + $buttonNamee = ucfirst(strtolower($buttonNamee)); + $button[] = ''; + // build script + $script[] = " + jQuery(document).ready(function() { + jQuery('#adminForm').on('change', '#jform_".$buttonName."',function (e) { + e.preventDefault(); + var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val(); + ".$buttonName."Button(".$buttonName."Value); + }); + var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val(); + ".$buttonName."Button(".$buttonName."Value); + }); + function ".$buttonName."Button(value) { + if (value > 0) { + // hide the create button + jQuery('#".$buttonName."Create').hide(); + // show edit button + jQuery('#".$buttonName."Edit').show(); + var url = 'index.php?option=com_componentbuilder&view=languages&task=language.edit&id='+value+'".$refJ."'; + jQuery('#".$buttonName."Edit').attr('href', url); + } else { + // show the create button + jQuery('#".$buttonName."Create').show(); + // hide edit button + jQuery('#".$buttonName."Edit').hide(); + } + }"; + } + // check if button was created for language field. + if (is_array($button) && count($button) > 0) + { + // Load the needed script. + $document = JFactory::getDocument(); + $document->addScriptDeclaration(implode(' ',$script)); + // return the button attached to input field. + return '
' .$html . implode('',$button).'
'; + } + } + return $html; + } + + /** + * Method to get a list of options for a list input. + * + * @return array An array of JHtml options. + */ + public function getOptions() + { + $db = JFactory::getDBO(); + $query = $db->getQuery(true); + $query->select($db->quoteName(array('a.langtag','a.name'),array('langtag','language_name'))); + $query->from($db->quoteName('#__componentbuilder_language', 'a')); + $query->where($db->quoteName('a.published') . ' >= 1'); + $query->order('a.langtag ASC'); + $db->setQuery((string)$query); + $items = $db->loadObjectList(); + $options = array(); + if ($items) + { + $options[] = JHtml::_('select.option', '', 'Select an option'); + foreach($items as $item) + { + $options[] = JHtml::_('select.option', $item->langtag, $item->language_name . ' (' .$item->langtag.')'); + } + } + return $options; + } +} diff --git a/admin/models/fields/maingets.php b/admin/models/fields/maingets.php index 8952a7086..99fe46aa0 100644 --- a/admin/models/fields/maingets.php +++ b/admin/models/fields/maingets.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage maingets.php diff --git a/admin/models/fields/siteviewfolderlist.php b/admin/models/fields/siteviewfolderlist.php index 1f0b409d9..5592d356e 100644 --- a/admin/models/fields/siteviewfolderlist.php +++ b/admin/models/fields/siteviewfolderlist.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage siteviewfolderlist.php diff --git a/admin/models/fields/siteviews.php b/admin/models/fields/siteviews.php index 0018c3303..0c29038f7 100644 --- a/admin/models/fields/siteviews.php +++ b/admin/models/fields/siteviews.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage siteviews.php diff --git a/admin/models/fields/snippets.php b/admin/models/fields/snippets.php index 4908d2b00..e9834b4d1 100644 --- a/admin/models/fields/snippets.php +++ b/admin/models/fields/snippets.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage snippets.php diff --git a/admin/models/forms/custom_code.js b/admin/models/forms/custom_code.js index c7440f10f..31257c178 100644 --- a/admin/models/forms/custom_code.js +++ b/admin/models/forms/custom_code.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 81 of this MVC - @build 1st March, 2017 + @version @update number 82 of this MVC + @build 3rd April, 2017 @created 11th October, 2016 @package Component Builder @subpackage custom_code.js diff --git a/admin/models/forms/custom_code.xml b/admin/models/forms/custom_code.xml index 4a04184ed..2957cb13a 100644 --- a/admin/models/forms/custom_code.xml +++ b/admin/models/forms/custom_code.xml @@ -159,43 +159,33 @@ - + - + - - - - - - - + + + + + + + - - + + diff --git a/admin/models/forms/joomla_component.js b/admin/models/forms/joomla_component.js index 414da787c..d0ca23757 100644 --- a/admin/models/forms/joomla_component.js +++ b/admin/models/forms/joomla_component.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 311 of this MVC - @build 1st April, 2017 + @version @update number 314 of this MVC + @build 5th April, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_component.js diff --git a/admin/models/forms/language_placeholder.js b/admin/models/forms/language_placeholder.js deleted file mode 100644 index b1815115b..000000000 --- a/admin/models/forms/language_placeholder.js +++ /dev/null @@ -1,25 +0,0 @@ -/*--------------------------------------------------------------------------------------------------------| www.vdm.io |------/ - __ __ _ _____ _ _ __ __ _ _ _ - \ \ / / | | | __ \ | | | | | \/ | | | | | | | - \ \ / /_ _ ___| |_ | | | | _____ _____| | ___ _ __ _ __ ___ ___ _ __ | |_ | \ / | ___| |_| |__ ___ __| | - \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | - \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | - \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| - | | - |_| -/-------------------------------------------------------------------------------------------------------------------------------/ - - @version @update number 8 of this MVC - @build 3rd April, 2017 - @created 3rd April, 2017 - @package Component Builder - @subpackage language_placeholder.js - @author Llewellyn van der Merwe - @copyright Copyright (C) 2015. All Rights Reserved - @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - - Builds Complex Joomla Components - -/-----------------------------------------------------------------------------------------------------------------------------*/ - - diff --git a/admin/models/forms/language_translation.js b/admin/models/forms/language_translation.js new file mode 100644 index 000000000..160fe7208 --- /dev/null +++ b/admin/models/forms/language_translation.js @@ -0,0 +1,84 @@ +/*--------------------------------------------------------------------------------------------------------| www.vdm.io |------/ + __ __ _ _____ _ _ __ __ _ _ _ + \ \ / / | | | __ \ | | | | | \/ | | | | | | | + \ \ / /_ _ ___| |_ | | | | _____ _____| | ___ _ __ _ __ ___ ___ _ __ | |_ | \ / | ___| |_| |__ ___ __| | + \ \/ / _` / __| __| | | | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` | + \ / (_| \__ \ |_ | |__| | __/\ V / __/ | (_) | |_) | | | | | | __/ | | | |_ | | | | __/ |_| | | | (_) | (_| | + \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_| |_|\___|\__|_| |_|\___/ \__,_| + | | + |_| +/-------------------------------------------------------------------------------------------------------------------------------/ + + @version @update number 28 of this MVC + @build 5th April, 2017 + @created 3rd April, 2017 + @package Component Builder + @subpackage language_translation.js + @author Llewellyn van der Merwe + @copyright Copyright (C) 2015. All Rights Reserved + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Builds Complex Joomla Components + +/-----------------------------------------------------------------------------------------------------------------------------*/ + + + +jQuery(document).ready(function($) +{ + // build table of translations + var translation = encodeURIComponent(jQuery('#jform_translation').val()); + if (translation) { + getBuildTable(translation,'jform_translation'); + } + // set button to add more languages + addButton('language','components'); +}); + +function getBuildTable_server(string, idName){ + var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getBuildTable&format=json&vdm="+vastDevMod); + if(token.length > 0 && string.length > 0 && idName.length > 0){ + var request = 'token='+token+'&idName='+idName+'&object='+string; + } + return jQuery.ajax({ + type: 'GET', + url: getUrl, + dataType: 'jsonp', + data: request, + jsonp: 'callback' + }); +} +function getBuildTable(string, idName){ + getBuildTable_server(string, idName).done(function(result) { + jQuery('#table_'+idName).remove(); + if(result){ + addData(result, '#'+idName); + } + }) +} +function addData(result, where){ + jQuery(where).closest('.control-group').parent().append(result); +} +function addButton_server(type){ + var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getButton&format=json&vdm="+vastDevMod); + if(token.length > 0 && type.length > 0){ + var request = 'token='+token+'&type='+type; + } + return jQuery.ajax({ + type: 'GET', + url: getUrl, + dataType: 'jsonp', + data: request, + jsonp: 'callback' + }); +} +function addButton(type, where){ + addButton_server(type).done(function(result) { + if(result){ + setButton(result, '#jform_'+where); + } + }); +} +function setButton(result, where){ + jQuery(where).closest('.control-group').append(result); +} diff --git a/admin/models/forms/language_placeholder.xml b/admin/models/forms/language_translation.xml similarity index 64% rename from admin/models/forms/language_placeholder.xml rename to admin/models/forms/language_translation.xml index cfc1ca8d6..f667c60ec 100644 --- a/admin/models/forms/language_placeholder.xml +++ b/admin/models/forms/language_translation.xml @@ -16,8 +16,8 @@ - + \ No newline at end of file diff --git a/admin/models/import.php b/admin/models/import.php index 60c63a4f5..d927eff8f 100644 --- a/admin/models/import.php +++ b/admin/models/import.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage import.php diff --git a/admin/models/import_joomla_components.php b/admin/models/import_joomla_components.php index 146c3319b..7c6a36574 100644 --- a/admin/models/import_joomla_components.php +++ b/admin/models/import_joomla_components.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage import_joomla_components.php diff --git a/admin/models/joomla_component.php b/admin/models/joomla_component.php index 31f52904b..bc9fd785a 100644 --- a/admin/models/joomla_component.php +++ b/admin/models/joomla_component.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 311 of this MVC - @build 1st April, 2017 + @version @update number 314 of this MVC + @build 5th April, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_component.php diff --git a/admin/models/joomla_components.php b/admin/models/joomla_components.php index f6138aef6..ab3b0f9e4 100644 --- a/admin/models/joomla_components.php +++ b/admin/models/joomla_components.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 311 of this MVC - @build 1st April, 2017 + @version @update number 314 of this MVC + @build 5th April, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_components.php @@ -101,7 +101,7 @@ class ComponentbuilderModelJoomla_components extends JModelList $query = $db->getQuery(true); // Select some fields - $query->select($db->quoteName('a.*')); + $query->select(array('a.*')); // From the componentbuilder_joomla_component table $query->from($db->quoteName('#__componentbuilder_joomla_component', 'a')); @@ -459,7 +459,7 @@ class ComponentbuilderModelJoomla_components extends JModelList $query = $db->getQuery(true); // Select some fields - $query->select($db->quoteName('a.*')); + $query->select(array('a.*')); // From the componentbuilder_ANY table $query->from($db->quoteName('#__componentbuilder_'. $table, 'a')); diff --git a/admin/models/language_placeholder.php b/admin/models/language_translation.php similarity index 87% rename from admin/models/language_placeholder.php rename to admin/models/language_translation.php index d32829de5..f1cee6b35 100644 --- a/admin/models/language_placeholder.php +++ b/admin/models/language_translation.php @@ -10,11 +10,11 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 8 of this MVC - @build 3rd April, 2017 + @version @update number 28 of this MVC + @build 5th April, 2017 @created 3rd April, 2017 @package Component Builder - @subpackage language_placeholder.php + @subpackage language_translation.php @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html @@ -32,9 +32,9 @@ use Joomla\Registry\Registry; jimport('joomla.application.component.modeladmin'); /** - * Componentbuilder Language_placeholder Model + * Componentbuilder Language_translation Model */ -class ComponentbuilderModelLanguage_placeholder extends JModelAdmin +class ComponentbuilderModelLanguage_translation extends JModelAdmin { /** * @var string The prefix to use with controller messages. @@ -48,7 +48,7 @@ class ComponentbuilderModelLanguage_placeholder extends JModelAdmin * @var string * @since 3.2 */ - public $typeAlias = 'com_componentbuilder.language_placeholder'; + public $typeAlias = 'com_componentbuilder.language_translation'; /** * Returns a Table object, always creating it @@ -61,9 +61,14 @@ class ComponentbuilderModelLanguage_placeholder extends JModelAdmin * * @since 1.6 */ - public function getTable($type = 'language_placeholder', $prefix = 'ComponentbuilderTable', $config = array()) + public function getTable($type = 'language_translation', $prefix = 'ComponentbuilderTable', $config = array()) { return JTable::getInstance($type, $prefix, $config); + } + + public function getVDM() + { + return $this->vastDevMod; } /** @@ -99,12 +104,33 @@ class ComponentbuilderModelLanguage_placeholder extends JModelAdmin { // JSON Decode components. $item->components = json_decode($item->components); + } + + + if (empty($item->id)) + { + $id = 0; } + else + { + $id = $item->id; + } + // set the id and view name to session + if ($vdm = ComponentbuilderHelper::get('language_placeholder__'.$id)) + { + $this->vastDevMod = $vdm; + } + else + { + $this->vastDevMod = ComponentbuilderHelper::randomkey(50); + ComponentbuilderHelper::set($this->vastDevMod, 'language_placeholder__'.$id); + ComponentbuilderHelper::set('language_placeholder__'.$id, $this->vastDevMod); + } if (!empty($item->id)) { $item->tags = new JHelperTags; - $item->tags->getTagIds($item->id, 'com_componentbuilder.language_placeholder'); + $item->tags->getTagIds($item->id, 'com_componentbuilder.language_translation'); } } @@ -124,7 +150,7 @@ class ComponentbuilderModelLanguage_placeholder extends JModelAdmin public function getForm($data = array(), $loadData = true) { // Get the form. - $form = $this->loadForm('com_componentbuilder.language_placeholder', 'language_placeholder', array('control' => 'jform', 'load_data' => $loadData)); + $form = $this->loadForm('com_componentbuilder.language_translation', 'language_translation', array('control' => 'jform', 'load_data' => $loadData)); if (empty($form)) { @@ -148,8 +174,8 @@ class ComponentbuilderModelLanguage_placeholder extends JModelAdmin // Check for existing item. // Modify the form based on Edit State access controls. - if ($id != 0 && (!$user->authorise('language_placeholder.edit.state', 'com_componentbuilder.language_placeholder.' . (int) $id)) - || ($id == 0 && !$user->authorise('language_placeholder.edit.state', 'com_componentbuilder'))) + if ($id != 0 && (!$user->authorise('language_translation.edit.state', 'com_componentbuilder.language_translation.' . (int) $id)) + || ($id == 0 && !$user->authorise('language_translation.edit.state', 'com_componentbuilder'))) { // Disable fields for display. $form->setFieldAttribute('ordering', 'disabled', 'true'); @@ -206,7 +232,7 @@ class ComponentbuilderModelLanguage_placeholder extends JModelAdmin */ public function getScript() { - return 'administrator/components/com_componentbuilder/models/forms/language_placeholder.js'; + return 'administrator/components/com_componentbuilder/models/forms/language_translation.js'; } /** @@ -229,7 +255,7 @@ class ComponentbuilderModelLanguage_placeholder extends JModelAdmin $user = JFactory::getUser(); // The record has been set. Check the record permissions. - return $user->authorise('language_placeholder.delete', 'com_componentbuilder.language_placeholder.' . (int) $record->id); + return $user->authorise('language_translation.delete', 'com_componentbuilder.language_translation.' . (int) $record->id); } return false; } @@ -251,14 +277,14 @@ class ComponentbuilderModelLanguage_placeholder extends JModelAdmin if ($recordId) { // The record has been set. Check the record permissions. - $permission = $user->authorise('language_placeholder.edit.state', 'com_componentbuilder.language_placeholder.' . (int) $recordId); + $permission = $user->authorise('language_translation.edit.state', 'com_componentbuilder.language_translation.' . (int) $recordId); if (!$permission && !is_null($permission)) { return false; } } // In the absense of better information, revert to the component permissions. - return $user->authorise('language_placeholder.edit.state', 'com_componentbuilder'); + return $user->authorise('language_translation.edit.state', 'com_componentbuilder'); } /** @@ -275,7 +301,7 @@ class ComponentbuilderModelLanguage_placeholder extends JModelAdmin // Check specific edit permission then general edit permission. $user = JFactory::getUser(); - return $user->authorise('language_placeholder.edit', 'com_componentbuilder.language_placeholder.'. ((int) isset($data[$key]) ? $data[$key] : 0)) or $user->authorise('language_placeholder.edit', 'com_componentbuilder'); + return $user->authorise('language_translation.edit', 'com_componentbuilder.language_translation.'. ((int) isset($data[$key]) ? $data[$key] : 0)) or $user->authorise('language_translation.edit', 'com_componentbuilder'); } /** @@ -316,7 +342,7 @@ class ComponentbuilderModelLanguage_placeholder extends JModelAdmin $db = JFactory::getDbo(); $query = $db->getQuery(true) ->select('MAX(ordering)') - ->from($db->quoteName('#__componentbuilder_language_placeholder')); + ->from($db->quoteName('#__componentbuilder_language_translation')); $db->setQuery($query); $max = $db->loadResult(); @@ -346,7 +372,7 @@ class ComponentbuilderModelLanguage_placeholder extends JModelAdmin protected function loadFormData() { // Check the session for previously entered form data. - $data = JFactory::getApplication()->getUserState('com_componentbuilder.edit.language_placeholder.data', array()); + $data = JFactory::getApplication()->getUserState('com_componentbuilder.edit.language_translation.data', array()); if (empty($data)) { @@ -444,7 +470,7 @@ class ComponentbuilderModelLanguage_placeholder extends JModelAdmin $this->tableClassName = get_class($this->table); $this->contentType = new JUcmType; $this->type = $this->contentType->getTypeByTable($this->tableClassName); - $this->canDo = ComponentbuilderHelper::getActions('language_placeholder'); + $this->canDo = ComponentbuilderHelper::getActions('language_translation'); $this->batchSet = true; if (!$this->canDo->get('core.batch')) @@ -524,10 +550,10 @@ class ComponentbuilderModelLanguage_placeholder extends JModelAdmin $this->tableClassName = get_class($this->table); $this->contentType = new JUcmType; $this->type = $this->contentType->getTypeByTable($this->tableClassName); - $this->canDo = ComponentbuilderHelper::getActions('language_placeholder'); + $this->canDo = ComponentbuilderHelper::getActions('language_translation'); } - if (!$this->canDo->get('language_placeholder.create') && !$this->canDo->get('language_placeholder.batch')) + if (!$this->canDo->get('language_translation.create') && !$this->canDo->get('language_translation.batch')) { return false; } @@ -542,7 +568,7 @@ class ComponentbuilderModelLanguage_placeholder extends JModelAdmin { $values['published'] = 0; } - elseif (isset($values['published']) && !$this->canDo->get('language_placeholder.edit.state')) + elseif (isset($values['published']) && !$this->canDo->get('language_translation.edit.state')) { $values['published'] = 0; } @@ -559,7 +585,7 @@ class ComponentbuilderModelLanguage_placeholder extends JModelAdmin // only allow copy if user may edit this item. - if (!$this->user->authorise('language_placeholder.edit', $contexts[$pk])) + if (!$this->user->authorise('language_translation.edit', $contexts[$pk])) { @@ -589,7 +615,7 @@ class ComponentbuilderModelLanguage_placeholder extends JModelAdmin } } - $this->table->placeholder = $this->generateUniqe('placeholder',$this->table->placeholder); + $this->table->entranslation = $this->generateUniqe('entranslation',$this->table->entranslation); // insert all set values if (ComponentbuilderHelper::checkArray($values)) @@ -673,17 +699,17 @@ class ComponentbuilderModelLanguage_placeholder extends JModelAdmin $this->tableClassName = get_class($this->table); $this->contentType = new JUcmType; $this->type = $this->contentType->getTypeByTable($this->tableClassName); - $this->canDo = ComponentbuilderHelper::getActions('language_placeholder'); + $this->canDo = ComponentbuilderHelper::getActions('language_translation'); } - if (!$this->canDo->get('language_placeholder.edit') && !$this->canDo->get('language_placeholder.batch')) + if (!$this->canDo->get('language_translation.edit') && !$this->canDo->get('language_translation.batch')) { $this->setError(JText::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT')); return false; } // make sure published only updates if user has the permission. - if (isset($values['published']) && !$this->canDo->get('language_placeholder.edit.state')) + if (isset($values['published']) && !$this->canDo->get('language_translation.edit.state')) { unset($values['published']); } @@ -693,7 +719,7 @@ class ComponentbuilderModelLanguage_placeholder extends JModelAdmin // Parent exists so we proceed foreach ($pks as $pk) { - if (!$this->user->authorise('language_placeholder.edit', $contexts[$pk])) + if (!$this->user->authorise('language_translation.edit', $contexts[$pk])) { $this->setError(JText::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT')); diff --git a/admin/models/language_placeholders.php b/admin/models/language_translations.php similarity index 84% rename from admin/models/language_placeholders.php rename to admin/models/language_translations.php index 38a579882..2f85084e6 100644 --- a/admin/models/language_placeholders.php +++ b/admin/models/language_translations.php @@ -10,11 +10,11 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 8 of this MVC - @build 3rd April, 2017 + @version @update number 28 of this MVC + @build 5th April, 2017 @created 3rd April, 2017 @package Component Builder - @subpackage language_placeholders.php + @subpackage language_translations.php @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html @@ -30,9 +30,9 @@ defined('_JEXEC') or die('Restricted access'); jimport('joomla.application.component.modellist'); /** - * Language_placeholders Model + * Language_translations Model */ -class ComponentbuilderModelLanguage_placeholders extends JModelList +class ComponentbuilderModelLanguage_translations extends JModelList { public function __construct($config = array()) { @@ -44,7 +44,7 @@ class ComponentbuilderModelLanguage_placeholders extends JModelList 'a.ordering','ordering', 'a.created_by','created_by', 'a.modified_by','modified_by', - 'a.placeholder','placeholder' + 'a.entranslation','entranslation' ); } @@ -65,8 +65,8 @@ class ComponentbuilderModelLanguage_placeholders extends JModelList { $this->context .= '.' . $layout; } - $placeholder = $this->getUserStateFromRequest($this->context . '.filter.placeholder', 'filter_placeholder'); - $this->setState('filter.placeholder', $placeholder); + $entranslation = $this->getUserStateFromRequest($this->context . '.filter.entranslation', 'filter_entranslation'); + $this->setState('filter.entranslation', $entranslation); $sorting = $this->getUserStateFromRequest($this->context . '.filter.sorting', 'filter_sorting', 0, 'int'); $this->setState('filter.sorting', $sorting); @@ -110,7 +110,7 @@ class ComponentbuilderModelLanguage_placeholders extends JModelList $user = JFactory::getUser(); foreach ($items as $nr => &$item) { - $access = ($user->authorise('language_placeholder.access', 'com_componentbuilder.language_placeholder.' . (int) $item->id) && $user->authorise('language_placeholder.access', 'com_componentbuilder')); + $access = ($user->authorise('language_translation.access', 'com_componentbuilder.language_translation.' . (int) $item->id) && $user->authorise('language_translation.access', 'com_componentbuilder')); if (!$access) { unset($items[$nr]); @@ -118,7 +118,7 @@ class ComponentbuilderModelLanguage_placeholders extends JModelList } // convert components - $item->components = ComponentbuilderHelper::jsonToString($item->components, ', ', 'components'); + $item->components = ComponentbuilderHelper::jsonToString($item->components, ', ', 'joomla_component'); } } @@ -143,11 +143,7 @@ class ComponentbuilderModelLanguage_placeholders extends JModelList $query->select('a.*'); // From the componentbuilder_item table - $query->from($db->quoteName('#__componentbuilder_language_placeholder', 'a')); - - // From the componentbuilder_joomla_component table. - $query->select($db->quoteName('g.system_name','components_system_name')); - $query->join('LEFT', $db->quoteName('#__componentbuilder_joomla_component', 'g') . ' ON (' . $db->quoteName('a.components') . ' = ' . $db->quoteName('g.id') . ')'); + $query->from($db->quoteName('#__componentbuilder_language_translation', 'a')); // Filter by published state $published = $this->getState('filter.published'); @@ -185,7 +181,7 @@ class ComponentbuilderModelLanguage_placeholders extends JModelList else { $search = $db->quote('%' . $db->escape($search) . '%'); - $query->where('(a.placeholder LIKE '.$search.' OR a.components LIKE '.$search.' OR g.system_name LIKE '.$search.')'); + $query->where('(a.entranslation LIKE '.$search.' OR a.components LIKE '.$search.' OR g.system_name LIKE '.$search.')'); } } @@ -222,8 +218,8 @@ class ComponentbuilderModelLanguage_placeholders extends JModelList // Select some fields $query->select('a.*'); - // From the componentbuilder_language_placeholder table - $query->from($db->quoteName('#__componentbuilder_language_placeholder', 'a')); + // From the componentbuilder_language_translation table + $query->from($db->quoteName('#__componentbuilder_language_translation', 'a')); $query->where('a.id IN (' . implode(',',$pks) . ')'); // Implement View Level Access if (!$user->authorise('core.options', 'com_componentbuilder')) @@ -249,7 +245,7 @@ class ComponentbuilderModelLanguage_placeholders extends JModelList $user = JFactory::getUser(); foreach ($items as $nr => &$item) { - $access = ($user->authorise('language_placeholder.access', 'com_componentbuilder.language_placeholder.' . (int) $item->id) && $user->authorise('language_placeholder.access', 'com_componentbuilder')); + $access = ($user->authorise('language_translation.access', 'com_componentbuilder.language_translation.' . (int) $item->id) && $user->authorise('language_translation.access', 'com_componentbuilder')); if (!$access) { unset($items[$nr]); @@ -284,7 +280,7 @@ class ComponentbuilderModelLanguage_placeholders extends JModelList // Get a db connection. $db = JFactory::getDbo(); // get the columns - $columns = $db->getTableColumns("#__componentbuilder_language_placeholder"); + $columns = $db->getTableColumns("#__componentbuilder_language_translation"); if (ComponentbuilderHelper::checkArray($columns)) { // remove the headers you don't import/export. @@ -316,7 +312,7 @@ class ComponentbuilderModelLanguage_placeholders extends JModelList $id .= ':' . $this->getState('filter.ordering'); $id .= ':' . $this->getState('filter.created_by'); $id .= ':' . $this->getState('filter.modified_by'); - $id .= ':' . $this->getState('filter.placeholder'); + $id .= ':' . $this->getState('filter.entranslation'); return parent::getStoreId($id); } @@ -340,7 +336,7 @@ class ComponentbuilderModelLanguage_placeholders extends JModelList // reset query $query = $db->getQuery(true); $query->select('*'); - $query->from($db->quoteName('#__componentbuilder_language_placeholder')); + $query->from($db->quoteName('#__componentbuilder_language_translation')); $db->setQuery($query); $db->execute(); if ($db->getNumRows()) @@ -363,7 +359,7 @@ class ComponentbuilderModelLanguage_placeholders extends JModelList ); // Check table - $query->update($db->quoteName('#__componentbuilder_language_placeholder'))->set($fields)->where($conditions); + $query->update($db->quoteName('#__componentbuilder_language_translation'))->set($fields)->where($conditions); $db->setQuery($query); diff --git a/admin/sql/install.mysql.utf8.sql b/admin/sql/install.mysql.utf8.sql index c81eb1db0..64cbd78e3 100644 --- a/admin/sql/install.mysql.utf8.sql +++ b/admin/sql/install.mysql.utf8.sql @@ -558,9 +558,9 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_custom_code` ( KEY `idx_component` (`component`), KEY `idx_target` (`target`), KEY `idx_type` (`type`), + KEY `idx_to_line` (`to_line`), KEY `idx_function_name` (`function_name`), - KEY `idx_from_line` (`from_line`), - KEY `idx_to_line` (`to_line`) + KEY `idx_from_line` (`from_line`) ) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `#__componentbuilder_snippet` ( @@ -683,11 +683,11 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_fieldtype` ( KEY `idx_catid` (`catid`) ) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8; -CREATE TABLE IF NOT EXISTS `#__componentbuilder_language_placeholder` ( +CREATE TABLE IF NOT EXISTS `#__componentbuilder_language_translation` ( `id` INT(11) NOT NULL AUTO_INCREMENT, `asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.', `components` TEXT NOT NULL, - `placeholder` TEXT NOT NULL, + `entranslation` TEXT NOT NULL, `translation` TEXT NOT NULL, `params` text NOT NULL DEFAULT '', `published` TINYINT(3) NOT NULL DEFAULT 1, @@ -950,7 +950,7 @@ INSERT INTO `#__componentbuilder_fieldtype` (`id`, `catid`, `description`, `name (20, '', 'The spacer form field type provides a visual separator between parameter field elements. It is purely a visual aid and no field value is stored.', 'Spacer', '{\"name\":[\"type\",\"name\",\"label\",\"description\",\"hr\",\"class\"],\"example\":[\"spacer\",\"myspacer\",\"The notice\",\"The notice description\",\"\",\"\"],\"adjustable\":[\"0\",\"1\",\"1\",\"1\",\"1\",\"1\"],\"mandatory\":[\"1\",\"1\",\"0\",\"0\",\"0\",\"0\"],\"translatable\":[\"0\",\"0\",\"1\",\"1\",\"0\",\"0\"],\"description\":[\"(mandatory) must be spacer.\",\"(mandatory) is the unique name of the field.\",\"(optional) (translatable) is the text to use as a spacer.\",\"(optional) (translatable) is text that will be shown as a tooltip when the user moves the mouse over the drop-down box.\",\"(optional) is whether to display a horizontal rule (\'true\' or \'false\'). If this attribute is \'true\', the label attribute will be ignored.\",\"(optional) is a CSS class name for the HTML form field.\"]}', 'provides a visual separator between form fields. It is purely a visual aid and no value is stored.', '', 1, 1, '', ''), (23, '', 'The tel field type is an alias for a text field. Telephone numbers can be validated using the tel rule and filtered using the tel input filter.', 'Tel', '{\"name\":[\"type\",\"name\",\"label\",\"size\",\"maxlength\",\"default\",\"description\",\"class\",\"readonly\",\"disabled\",\"required\",\"filter\",\"validated\",\"message\",\"hint\",\"showon\",\"onchange\"],\"example\":[\"text\",\"phone\",\"Phone\",\"10\",\"50\",\"\",\"Enter phone number\",\"text_area\",\"false\",\"false\",\"false\",\"tel\",\"tel\",\"Error! Please add phone number here.\",\"Your Phone Number\",\"\",\"\"],\"adjustable\":[\"0\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\"],\"mandatory\":[\"1\",\"1\",\"1\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\"],\"translatable\":[\"0\",\"0\",\"1\",\"0\",\"0\",\"0\",\"1\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"1\",\"0\",\"0\"],\"description\":[\"(mandatory) must be text.\",\"(mandatory) is the unique name of the field.\",\"(mandatory) (translatable) is the descriptive title of the field.\",\"(optional) is the width of the text box in characters. If omitted the width is determined by the browser. The value of size does not limit the number of characters that may be entered.\",\"(optional) limits the number of characters that may be entered.\",\"(optional) (not translatable) is the default value.\",\"(optional) (translatable) is text that will be shown as a tooltip when the user moves the mouse over the drop-down box.\",\"(optional) is a CSS class name for the HTML form field. If omitted this will default to \'text_area\'.\",\"(optional) The field cannot be changed and will automatically inherit the default value\",\"(optional) The field cannot be changed and will automatically inherit the default value - it will also not submit\",\"(optional) The field must be filled before submitting the form.\",\"(optional) allow the system to save certain html tags or raw data.\",\"(optional) allow the system to validated the input data.\",\"(optional) The error message that will be displayed instead of the default message.\",\"(optional) The placeholder to display inside the text box.\",\"(optional) Allows you to hide the field based on the value(s) of another field; for Joomla 3.2.4+\",\"(optional) HTML equivalent attribute (javascript use)\"]}', 'provides an input field for a telephone number.', '', 1, 4, '', ''), (24, '', 'The text form field type provides a text box for data entry. If the field has a value saved, this value is displayed when the page is first loaded. If not, the default value (if any) is selected.', 'Text', '{\"name\":[\"type\",\"name\",\"label\",\"size\",\"maxlength\",\"default\",\"description\",\"class\",\"readonly\",\"disabled\",\"required\",\"filter\",\"validate\",\"field\",\"message\",\"hint\",\"showon\",\"onchange\"],\"example\":[\"text\",\"mytextvalue\",\"Enter some text\",\"10\",\"50\",\"Some text\",\"Enter some description\",\"text_area\",\"false\",\"false\",\"false\",\"STRING\",\"\",\"\",\"Error! Please add some text here.\",\"Your Name Here\",\"\",\"\"],\"adjustable\":[\"0\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\"],\"mandatory\":[\"1\",\"1\",\"1\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\"],\"translatable\":[\"0\",\"0\",\"1\",\"0\",\"0\",\"0\",\"1\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"1\",\"0\",\"0\"],\"description\":[\"(mandatory) must be text.\",\"(mandatory) is the unique name of the field.\",\"(mandatory) (translatable) is the descriptive title of the field.\",\"(optional) is the width of the text box in characters. If omitted the width is determined by the browser. The value of size does not limit the number of characters that may be entered.\",\"(optional) limits the number of characters that may be entered.\",\"(optional) (not translatable) is the default value.\",\"(optional) (translatable) is text that will be shown as a tooltip when the user moves the mouse over the drop-down box.\",\"(optional) is a CSS class name for the HTML form field. If omitted this will default to \'text_area\'.\",\"(optional) The field cannot be changed and will automatically inherit the default value\",\"(optional) The field cannot be changed and will automatically inherit the default value - it will also not submit\",\"(optional) The field must be filled before submitting the form.\",\"(optional) allow the system to save certain html tags or raw data.\",\"(optional) makes the system validate the data.\",\"(optional) used in validation of \\\"equals\\\" to link the field to match.\",\"(optional) The error message that will be displayed instead of the default message.\",\"(optional) The placeholder to display inside the text box.\",\"(optional) Allows you to hide the field based on the value(s) of another field; for Joomla 3.2.4+\",\"(optional) HTML equivalent attribute (javascript use)\"]}', 'provides a text box for data entry.', '', 1, 5, '', ''), -(25, '', 'The textarea form field type provides a text area for entry of multi-line text. If the field has a value saved, this value is displayed when the page is first loaded. If not, the default value (if any) is selected.', 'Textarea', '{\"name\":[\"type\",\"name\",\"label\",\"rows\",\"cols\",\"default\",\"description\",\"class\",\"filter\",\"hint\",\"required\",\"showon\",\"onchange\"],\"example\":[\"textarea\",\"mytextarea\",\"Enter some text\",\"10\",\"5\",\"default text\",\"Text Area\",\"text_area\",\"raw\",\"\",\"\",\"\",\"\"],\"adjustable\":[\"0\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\"],\"mandatory\":[\"1\",\"1\",\"1\",\"1\",\"1\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\"],\"translatable\":[\"0\",\"0\",\"1\",\"0\",\"0\",\"0\",\"1\",\"0\",\"0\",\"1\",\"0\",\"0\",\"0\"],\"description\":[\"(mandatory) must be textarea.\",\"(mandatory) is the unique name of the field.\",\"(mandatory) (translatable) is the descriptive title of the field.\",\"(mandatory) is the height of the visible text area in lines. If omitted the width is determined by the browser. The value of rows does not limit the number of lines that may be entered.\",\"(mandatory) is the width of the visible text area in characters. If omitted the width is determined by the browser. The value of cols does not limit the number of characters that may be entered.\",\"(optional) (not translatable) is the default value.\",\"(optional) (translatable) is text that will be shown as a tooltip when the user moves the mouse over the drop-down box.\",\"(optional) is a CSS class name for the HTML form field. If omitted this will default to \'text_area\'.\",\"(optional) allow the system to save certain html tags or raw data.\",\"(optional) The placeholder to display inside the textarea.\",\"(optional) The field must be filled before submitting the form.\",\"(optional) Allows you to hide the field based on the value(s) of another field; for Joomla 3.2.4+\",\"(optional) HTML equivalent attribute (javascript use)\"]}', 'provides a text area for entry of multi-line text.', '', 1, 4, '', ''), +(25, '', 'The textarea form field type provides a text area for entry of multi-line text. If the field has a value saved, this value is displayed when the page is first loaded. If not, the default value (if any) is selected.', 'Textarea', '{\"name\":[\"type\",\"name\",\"label\",\"rows\",\"cols\",\"default\",\"description\",\"class\",\"filter\",\"hint\",\"required\",\"readonly\",\"disabled\",\"showon\",\"onchange\"],\"example\":[\"textarea\",\"mytextarea\",\"Enter some text\",\"10\",\"5\",\"default text\",\"Text Area\",\"text_area\",\"raw\",\"\",\"false\",\"false\",\"false\",\"\",\"\"],\"adjustable\":[\"0\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\"],\"mandatory\":[\"1\",\"1\",\"1\",\"1\",\"1\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\"],\"translatable\":[\"0\",\"0\",\"1\",\"0\",\"0\",\"0\",\"1\",\"0\",\"0\",\"1\",\"0\",\"0\",\"0\",\"0\",\"0\"],\"description\":[\"(mandatory) must be textarea.\",\"(mandatory) is the unique name of the field.\",\"(mandatory) (translatable) is the descriptive title of the field.\",\"(mandatory) is the height of the visible text area in lines. If omitted the width is determined by the browser. The value of rows does not limit the number of lines that may be entered.\",\"(mandatory) is the width of the visible text area in characters. If omitted the width is determined by the browser. The value of cols does not limit the number of characters that may be entered.\",\"(optional) (not translatable) is the default value.\",\"(optional) (translatable) is text that will be shown as a tooltip when the user moves the mouse over the drop-down box.\",\"(optional) is a CSS class name for the HTML form field. If omitted this will default to \'text_area\'.\",\"(optional) allow the system to save certain html tags or raw data.\",\"(optional) The placeholder to display inside the textarea.\",\"(optional) The field must be filled before submitting the form.\",\"(optional) The field cannot be changed and will automatically inherit the default value\",\"(optional) The field cannot be changed and will automatically inherit the default value - it will also not submit\",\"(optional) Allows you to hide the field based on the value(s) of another field; for Joomla 3.2.4+\",\"(optional) HTML equivalent attribute (javascript use)\"]}', 'provides a text area for entry of multi-line text.', '', 1, 5, '', ''), (26, '', 'The timezones form field type provides a drop down list of time zones. If the field has a value saved, this value is displayed when the page is first loaded. If not, the default value (if any) is selected.', 'Timezone', '{\"name\":[\"type\",\"name\",\"label\",\"default\",\"description\",\"showon\"],\"example\":[\"timezone\",\"timezone\",\"Timezone\",\"\",\"\",\"\"],\"adjustable\":[\"0\",\"1\",\"1\",\"1\",\"1\",\"1\"],\"mandatory\":[\"1\",\"1\",\"1\",\"0\",\"0\",\"0\"],\"translatable\":[\"0\",\"0\",\"1\",\"0\",\"1\",\"0\"],\"description\":[\"(mandatory) must be timezone.\",\"(mandatory) is the unique name of the field.\",\"(mandatory) (translatable) is the descriptive title of the field.\",\"(optional) is the default time zone. For example, use \'-10\' for \'(UTC -10:00) Hawaii\'.\",\"(optional) (translatable) is text that will be shown as a tooltip when the user moves the mouse over the drop-down box.\",\"(optional) show this field on the bases of the value in another field.\"]}', 'provides a drop down list of time zones.', '', 1, 2, '', ''), (27, '', 'This field essentially is a text field with the type of url. If a fully qualified url (that is one with a scheme and domain such as http://example.com) is entered and it uses idn (that is uses characters that are non ascii such as ê or Ψ) it will translat', 'URL', '{\"name\":[\"type\",\"name\",\"label\",\"size\",\"maxlength\",\"default\",\"description\",\"class\",\"readonly\",\"disabled\",\"required\",\"filter\",\"validated\",\"message\",\"hint\",\"showon\",\"onchange\"],\"example\":[\"url\",\"website\",\"Website\",\"10\",\"50\",\"\",\"Enter website address\",\"text_area\",\"\",\"\",\"\",\"url\",\"url\",\"Error! Please add website here.\",\"Your Website Here\",\"\",\"\"],\"adjustable\":[\"0\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\"],\"mandatory\":[\"1\",\"1\",\"1\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\"],\"translatable\":[\"0\",\"0\",\"1\",\"0\",\"0\",\"0\",\"1\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"1\",\"0\",\"0\"],\"description\":[\"(mandatory) must be url.\",\"(mandatory) is the unique name of the field.\",\"(mandatory) (translatable) is the descriptive title of the field.\",\"(optional) is the width of the text box in characters. If omitted the width is determined by the browser. The value of size does not limit the number of characters that may be entered.\",\"(optional) limits the number of characters that may be entered.\",\"(optional) (not translatable) is the default value.\",\"(optional) (translatable) is text that will be shown as a tooltip when the user moves the mouse over the drop-down box.\",\"(optional) is a CSS class name for the HTML form field. If omitted this will default to \'text_area\'.\",\"(optional) The field cannot be changed and will automatically inherit the default value\",\"(optional) The field cannot be changed and will automatically inherit the default value - it will also not submit\",\"(optional) The field must be filled before submitting the form.\",\"(optional) allow the system to save certain html tags or raw data.\",\"(optional) allow the system to validated the input data.\",\"(optional) The error message that will be displayed instead of the default message.\",\"(optional) The placeholder to display inside the text box.\",\"(optional) Allows you to hide the field based on the value(s) of another field; for Joomla 3.2.4+\",\"(optional) HTML equivalent attribute (javascript use)\"]}', 'provides a URL text input field.', '', 1, 4, '', ''); diff --git a/admin/sql/uninstall.mysql.utf8.sql b/admin/sql/uninstall.mysql.utf8.sql index fcddac080..7212c0456 100644 --- a/admin/sql/uninstall.mysql.utf8.sql +++ b/admin/sql/uninstall.mysql.utf8.sql @@ -9,6 +9,6 @@ DROP TABLE IF EXISTS `#__componentbuilder_custom_code`; DROP TABLE IF EXISTS `#__componentbuilder_snippet`; DROP TABLE IF EXISTS `#__componentbuilder_field`; DROP TABLE IF EXISTS `#__componentbuilder_fieldtype`; -DROP TABLE IF EXISTS `#__componentbuilder_language_placeholder`; +DROP TABLE IF EXISTS `#__componentbuilder_language_translation`; DROP TABLE IF EXISTS `#__componentbuilder_language`; DROP TABLE IF EXISTS `#__componentbuilder_help_document`; diff --git a/admin/sql/updates/mysql/2.4.1.sql b/admin/sql/updates/mysql/2.4.1.sql index a4a9eb87d..a03ca162e 100644 --- a/admin/sql/updates/mysql/2.4.1.sql +++ b/admin/sql/updates/mysql/2.4.1.sql @@ -1,8 +1,8 @@ -CREATE TABLE IF NOT EXISTS `#__componentbuilder_language_placeholder` ( +CREATE TABLE IF NOT EXISTS `#__componentbuilder_language_translation` ( `id` INT(11) NOT NULL AUTO_INCREMENT, `asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.', `components` TEXT NOT NULL, - `placeholder` TEXT NOT NULL, + `entranslation` TEXT NOT NULL, `translation` TEXT NOT NULL, `params` text NOT NULL DEFAULT '', `published` TINYINT(3) NOT NULL DEFAULT 1, diff --git a/admin/tables/custom_code.php b/admin/tables/custom_code.php index cf8fb28eb..0eb9dfbfb 100644 --- a/admin/tables/custom_code.php +++ b/admin/tables/custom_code.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 81 of this MVC - @build 1st March, 2017 + @version @update number 82 of this MVC + @build 3rd April, 2017 @created 11th October, 2016 @package Component Builder @subpackage custom_code.php diff --git a/admin/tables/joomla_component.php b/admin/tables/joomla_component.php index fed5dd789..ad6a2cf51 100644 --- a/admin/tables/joomla_component.php +++ b/admin/tables/joomla_component.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 311 of this MVC - @build 1st April, 2017 + @version @update number 314 of this MVC + @build 5th April, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_component.php diff --git a/admin/tables/language_placeholder.php b/admin/tables/language_translation.php similarity index 88% rename from admin/tables/language_placeholder.php rename to admin/tables/language_translation.php index 7390e2769..3ad379a5d 100644 --- a/admin/tables/language_placeholder.php +++ b/admin/tables/language_translation.php @@ -10,11 +10,11 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 8 of this MVC - @build 3rd April, 2017 + @version @update number 28 of this MVC + @build 5th April, 2017 @created 3rd April, 2017 @package Component Builder - @subpackage language_placeholder.php + @subpackage language_translation.php @author Llewellyn van der Merwe @copyright Copyright (C) 2015. All Rights Reserved @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html @@ -32,9 +32,9 @@ use Joomla\Registry\Registry; jimport('joomla.database.table'); /** - * Language_placeholders Table class + * Language_translations Table class */ -class ComponentbuilderTableLanguage_placeholder extends JTable +class ComponentbuilderTableLanguage_translation extends JTable { /** * Ensure the params and metadata in json encoded in the bind method @@ -51,10 +51,10 @@ class ComponentbuilderTableLanguage_placeholder extends JTable */ function __construct(&$db) { - parent::__construct('#__componentbuilder_language_placeholder', 'id', $db); + parent::__construct('#__componentbuilder_language_translation', 'id', $db); // Adding History Options - JTableObserverContenthistory::createObserver($this, array('typeAlias' => 'com_componentbuilder.language_placeholder')); + JTableObserverContenthistory::createObserver($this, array('typeAlias' => 'com_componentbuilder.language_translation')); } public function bind($array, $ignore = '') @@ -84,7 +84,7 @@ class ComponentbuilderTableLanguage_placeholder extends JTable } /** - * Overload the store method for the Language_placeholder table. + * Overload the store method for the Language_translation table. * * @param boolean Toggle whether null values should be updated. * @return boolean True on success, false on failure. @@ -103,7 +103,7 @@ class ComponentbuilderTableLanguage_placeholder extends JTable } else { - // New language_placeholder. A language_placeholder created and created_by field can be set by the user, + // New language_translation. A language_translation created and created_by field can be set by the user, // so we don't touch either of these if they are set. if (!(int) $this->created) { @@ -118,11 +118,11 @@ class ComponentbuilderTableLanguage_placeholder extends JTable if (isset($this->alias)) { // Verify that the alias is unique - $table = JTable::getInstance('language_placeholder', 'ComponentbuilderTable'); + $table = JTable::getInstance('language_translation', 'ComponentbuilderTable'); if ($table->load(array('alias' => $this->alias)) && ($table->id != $this->id || $this->id == 0)) { - $this->setError(JText::_('COM_COMPONENTBUILDER_LANGUAGE_PLACEHOLDER_ERROR_UNIQUE_ALIAS')); + $this->setError(JText::_('COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_ERROR_UNIQUE_ALIAS')); return false; } } @@ -153,7 +153,7 @@ class ComponentbuilderTableLanguage_placeholder extends JTable // Generate a valid alias $this->generateAlias(); - $table = JTable::getInstance('language_placeholder', 'componentbuilderTable'); + $table = JTable::getInstance('language_translation', 'componentbuilderTable'); while ($table->load(array('alias' => $this->alias)) && ($table->id != $this->id || $this->id == 0)) { @@ -202,7 +202,7 @@ class ComponentbuilderTableLanguage_placeholder extends JTable // If we don't have any access rules set at this point just use an empty JAccessRules class if (!$this->getRules()) { - $rules = $this->getDefaultAssetValues('com_componentbuilder.language_placeholder.'.$this->id); + $rules = $this->getDefaultAssetValues('com_componentbuilder.language_translation.'.$this->id); $this->setRules($rules); } @@ -293,7 +293,7 @@ class ComponentbuilderTableLanguage_placeholder extends JTable protected function _getAssetName() { $k = $this->_tbl_key; - return 'com_componentbuilder.language_placeholder.'.(int) $this->$k; + return 'com_componentbuilder.language_translation.'.(int) $this->$k; } /** diff --git a/admin/views/componentbuilder/tmpl/default.php b/admin/views/componentbuilder/tmpl/default.php index d7c8b9dfd..15d0cd6b4 100644 --- a/admin/views/componentbuilder/tmpl/default.php +++ b/admin/views/componentbuilder/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/componentbuilder/tmpl/default_closed_issues_the_closed_issues_on_github.php b/admin/views/componentbuilder/tmpl/default_closed_issues_the_closed_issues_on_github.php index bb328c9b2..6e0c5ec2e 100644 --- a/admin/views/componentbuilder/tmpl/default_closed_issues_the_closed_issues_on_github.php +++ b/admin/views/componentbuilder/tmpl/default_closed_issues_the_closed_issues_on_github.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_closed_issues_the_closed_issues_on_github.php diff --git a/admin/views/componentbuilder/tmpl/default_main.php b/admin/views/componentbuilder/tmpl/default_main.php index a58ff88ac..99ba085e5 100644 --- a/admin/views/componentbuilder/tmpl/default_main.php +++ b/admin/views/componentbuilder/tmpl/default_main.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_main.php diff --git a/admin/views/componentbuilder/tmpl/default_open_issues_the_open_issues_on_github.php b/admin/views/componentbuilder/tmpl/default_open_issues_the_open_issues_on_github.php index 2960466ac..1df1884fd 100644 --- a/admin/views/componentbuilder/tmpl/default_open_issues_the_open_issues_on_github.php +++ b/admin/views/componentbuilder/tmpl/default_open_issues_the_open_issues_on_github.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_open_issues_the_open_issues_on_github.php diff --git a/admin/views/componentbuilder/tmpl/default_readme_information.php b/admin/views/componentbuilder/tmpl/default_readme_information.php index e0bea9c3f..73d40ec65 100644 --- a/admin/views/componentbuilder/tmpl/default_readme_information.php +++ b/admin/views/componentbuilder/tmpl/default_readme_information.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_readme_information.php diff --git a/admin/views/componentbuilder/tmpl/default_vast_development_method_notice_board.php b/admin/views/componentbuilder/tmpl/default_vast_development_method_notice_board.php index 6cf0d068b..ef287458f 100644 --- a/admin/views/componentbuilder/tmpl/default_vast_development_method_notice_board.php +++ b/admin/views/componentbuilder/tmpl/default_vast_development_method_notice_board.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_vast_development_method_notice_board.php diff --git a/admin/views/componentbuilder/tmpl/default_vdm.php b/admin/views/componentbuilder/tmpl/default_vdm.php index 1d7c793eb..8d8637053 100644 --- a/admin/views/componentbuilder/tmpl/default_vdm.php +++ b/admin/views/componentbuilder/tmpl/default_vdm.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_vdm.php diff --git a/admin/views/componentbuilder/view.html.php b/admin/views/componentbuilder/view.html.php index 44a925089..7b76fdb98 100644 --- a/admin/views/componentbuilder/view.html.php +++ b/admin/views/componentbuilder/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/custom_code/submitbutton.js b/admin/views/custom_code/submitbutton.js index 2a64e8a96..94b1ab5f5 100644 --- a/admin/views/custom_code/submitbutton.js +++ b/admin/views/custom_code/submitbutton.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 81 of this MVC - @build 1st March, 2017 + @version @update number 82 of this MVC + @build 3rd April, 2017 @created 11th October, 2016 @package Component Builder @subpackage submitbutton.js diff --git a/admin/views/custom_code/tmpl/edit.php b/admin/views/custom_code/tmpl/edit.php index 4f9c1b60a..1432dcf75 100644 --- a/admin/views/custom_code/tmpl/edit.php +++ b/admin/views/custom_code/tmpl/edit.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 81 of this MVC - @build 1st March, 2017 + @version @update number 82 of this MVC + @build 3rd April, 2017 @created 11th October, 2016 @package Component Builder @subpackage edit.php @@ -262,6 +262,7 @@ jQuery('#adminForm').on('change', '#jform_comment_type',function (e) jQuery('#phpjs-comment-info').show(); } }); + // nice little dot trick :) jQuery(document).ready( function($) { var x=0; @@ -273,5 +274,5 @@ jQuery(document).ready( function($) { } $(".loading-dots").text(dots); } , 500); -}); +}); diff --git a/admin/views/custom_code/view.html.php b/admin/views/custom_code/view.html.php index 990b0380a..295535513 100644 --- a/admin/views/custom_code/view.html.php +++ b/admin/views/custom_code/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 81 of this MVC - @build 1st March, 2017 + @version @update number 82 of this MVC + @build 3rd April, 2017 @created 11th October, 2016 @package Component Builder @subpackage view.html.php diff --git a/admin/views/custom_codes/tmpl/default.php b/admin/views/custom_codes/tmpl/default.php index c7774c40b..d41fe504a 100644 --- a/admin/views/custom_codes/tmpl/default.php +++ b/admin/views/custom_codes/tmpl/default.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 81 of this MVC - @build 1st March, 2017 + @version @update number 82 of this MVC + @build 3rd April, 2017 @created 11th October, 2016 @package Component Builder @subpackage default.php diff --git a/admin/views/custom_codes/tmpl/default_batch_body.php b/admin/views/custom_codes/tmpl/default_batch_body.php index b5503b91e..3350ce19b 100644 --- a/admin/views/custom_codes/tmpl/default_batch_body.php +++ b/admin/views/custom_codes/tmpl/default_batch_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 81 of this MVC - @build 1st March, 2017 + @version @update number 82 of this MVC + @build 3rd April, 2017 @created 11th October, 2016 @package Component Builder @subpackage default_batch_body.php diff --git a/admin/views/custom_codes/tmpl/default_batch_footer.php b/admin/views/custom_codes/tmpl/default_batch_footer.php index 8f8f0b1c6..3f6a68132 100644 --- a/admin/views/custom_codes/tmpl/default_batch_footer.php +++ b/admin/views/custom_codes/tmpl/default_batch_footer.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 81 of this MVC - @build 1st March, 2017 + @version @update number 82 of this MVC + @build 3rd April, 2017 @created 11th October, 2016 @package Component Builder @subpackage default_batch_footer.php diff --git a/admin/views/custom_codes/tmpl/default_body.php b/admin/views/custom_codes/tmpl/default_body.php index ebd8a5203..4812d89af 100644 --- a/admin/views/custom_codes/tmpl/default_body.php +++ b/admin/views/custom_codes/tmpl/default_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 81 of this MVC - @build 1st March, 2017 + @version @update number 82 of this MVC + @build 3rd April, 2017 @created 11th October, 2016 @package Component Builder @subpackage default_body.php diff --git a/admin/views/custom_codes/tmpl/default_foot.php b/admin/views/custom_codes/tmpl/default_foot.php index 12bea733e..2a0345024 100644 --- a/admin/views/custom_codes/tmpl/default_foot.php +++ b/admin/views/custom_codes/tmpl/default_foot.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 81 of this MVC - @build 1st March, 2017 + @version @update number 82 of this MVC + @build 3rd April, 2017 @created 11th October, 2016 @package Component Builder @subpackage default_foot.php diff --git a/admin/views/custom_codes/tmpl/default_head.php b/admin/views/custom_codes/tmpl/default_head.php index 227fcfbfb..0eaf27831 100644 --- a/admin/views/custom_codes/tmpl/default_head.php +++ b/admin/views/custom_codes/tmpl/default_head.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 81 of this MVC - @build 1st March, 2017 + @version @update number 82 of this MVC + @build 3rd April, 2017 @created 11th October, 2016 @package Component Builder @subpackage default_head.php diff --git a/admin/views/custom_codes/tmpl/default_toolbar.php b/admin/views/custom_codes/tmpl/default_toolbar.php index 9be2ca100..c01b438bc 100644 --- a/admin/views/custom_codes/tmpl/default_toolbar.php +++ b/admin/views/custom_codes/tmpl/default_toolbar.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 81 of this MVC - @build 1st March, 2017 + @version @update number 82 of this MVC + @build 3rd April, 2017 @created 11th October, 2016 @package Component Builder @subpackage default_toolbar.php diff --git a/admin/views/custom_codes/view.html.php b/admin/views/custom_codes/view.html.php index 2b6a3150c..572e2bbd6 100644 --- a/admin/views/custom_codes/view.html.php +++ b/admin/views/custom_codes/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 81 of this MVC - @build 1st March, 2017 + @version @update number 82 of this MVC + @build 3rd April, 2017 @created 11th October, 2016 @package Component Builder @subpackage view.html.php diff --git a/admin/views/import/tmpl/default.php b/admin/views/import/tmpl/default.php index 059076e23..79aa4647b 100644 --- a/admin/views/import/tmpl/default.php +++ b/admin/views/import/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/import/view.html.php b/admin/views/import/view.html.php index 1d633b2cb..01b6d15b0 100644 --- a/admin/views/import/view.html.php +++ b/admin/views/import/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/import_joomla_components/tmpl/default.php b/admin/views/import_joomla_components/tmpl/default.php index 1a4e1c410..8ec67d603 100644 --- a/admin/views/import_joomla_components/tmpl/default.php +++ b/admin/views/import_joomla_components/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/import_joomla_components/view.html.php b/admin/views/import_joomla_components/view.html.php index e21b2aa59..21a8b21dd 100644 --- a/admin/views/import_joomla_components/view.html.php +++ b/admin/views/import_joomla_components/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.4.2 - @build 3rd April, 2017 + @build 5th April, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/joomla_component/submitbutton.js b/admin/views/joomla_component/submitbutton.js index 6d9c70bae..b38aa9e40 100644 --- a/admin/views/joomla_component/submitbutton.js +++ b/admin/views/joomla_component/submitbutton.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 311 of this MVC - @build 1st April, 2017 + @version @update number 314 of this MVC + @build 5th April, 2017 @created 6th May, 2015 @package Component Builder @subpackage submitbutton.js diff --git a/admin/views/joomla_component/tmpl/edit.php b/admin/views/joomla_component/tmpl/edit.php index 373f860ec..df55593ac 100644 --- a/admin/views/joomla_component/tmpl/edit.php +++ b/admin/views/joomla_component/tmpl/edit.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 311 of this MVC - @build 1st April, 2017 + @version @update number 314 of this MVC + @build 5th April, 2017 @created 6th May, 2015 @package Component Builder @subpackage edit.php diff --git a/admin/views/joomla_component/view.html.php b/admin/views/joomla_component/view.html.php index e3506719d..f5d64a46e 100644 --- a/admin/views/joomla_component/view.html.php +++ b/admin/views/joomla_component/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 311 of this MVC - @build 1st April, 2017 + @version @update number 314 of this MVC + @build 5th April, 2017 @created 6th May, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/joomla_components/tmpl/default.php b/admin/views/joomla_components/tmpl/default.php index 17bc64b74..64c313e2a 100644 --- a/admin/views/joomla_components/tmpl/default.php +++ b/admin/views/joomla_components/tmpl/default.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 311 of this MVC - @build 1st April, 2017 + @version @update number 314 of this MVC + @build 5th April, 2017 @created 6th May, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/joomla_components/tmpl/default_batch_body.php b/admin/views/joomla_components/tmpl/default_batch_body.php index eeaa61320..5b7720d36 100644 --- a/admin/views/joomla_components/tmpl/default_batch_body.php +++ b/admin/views/joomla_components/tmpl/default_batch_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 311 of this MVC - @build 1st April, 2017 + @version @update number 314 of this MVC + @build 5th April, 2017 @created 6th May, 2015 @package Component Builder @subpackage default_batch_body.php diff --git a/admin/views/joomla_components/tmpl/default_batch_footer.php b/admin/views/joomla_components/tmpl/default_batch_footer.php index 5b8a1530b..102a2eee9 100644 --- a/admin/views/joomla_components/tmpl/default_batch_footer.php +++ b/admin/views/joomla_components/tmpl/default_batch_footer.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 311 of this MVC - @build 1st April, 2017 + @version @update number 314 of this MVC + @build 5th April, 2017 @created 6th May, 2015 @package Component Builder @subpackage default_batch_footer.php diff --git a/admin/views/joomla_components/tmpl/default_body.php b/admin/views/joomla_components/tmpl/default_body.php index 5ff9abc4b..d387ab674 100644 --- a/admin/views/joomla_components/tmpl/default_body.php +++ b/admin/views/joomla_components/tmpl/default_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 311 of this MVC - @build 1st April, 2017 + @version @update number 314 of this MVC + @build 5th April, 2017 @created 6th May, 2015 @package Component Builder @subpackage default_body.php diff --git a/admin/views/joomla_components/tmpl/default_foot.php b/admin/views/joomla_components/tmpl/default_foot.php index cc3a64c8c..d60877c3e 100644 --- a/admin/views/joomla_components/tmpl/default_foot.php +++ b/admin/views/joomla_components/tmpl/default_foot.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 311 of this MVC - @build 1st April, 2017 + @version @update number 314 of this MVC + @build 5th April, 2017 @created 6th May, 2015 @package Component Builder @subpackage default_foot.php diff --git a/admin/views/joomla_components/tmpl/default_head.php b/admin/views/joomla_components/tmpl/default_head.php index 09eea54d4..f3deed9f0 100644 --- a/admin/views/joomla_components/tmpl/default_head.php +++ b/admin/views/joomla_components/tmpl/default_head.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 311 of this MVC - @build 1st April, 2017 + @version @update number 314 of this MVC + @build 5th April, 2017 @created 6th May, 2015 @package Component Builder @subpackage default_head.php diff --git a/admin/views/joomla_components/tmpl/default_toolbar.php b/admin/views/joomla_components/tmpl/default_toolbar.php index 30d9ae631..dbaf67007 100644 --- a/admin/views/joomla_components/tmpl/default_toolbar.php +++ b/admin/views/joomla_components/tmpl/default_toolbar.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 311 of this MVC - @build 1st April, 2017 + @version @update number 314 of this MVC + @build 5th April, 2017 @created 6th May, 2015 @package Component Builder @subpackage default_toolbar.php diff --git a/admin/views/joomla_components/view.html.php b/admin/views/joomla_components/view.html.php index 9a4a912be..69fb56c58 100644 --- a/admin/views/joomla_components/view.html.php +++ b/admin/views/joomla_components/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 311 of this MVC - @build 1st April, 2017 + @version @update number 314 of this MVC + @build 5th April, 2017 @created 6th May, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/language_placeholder/submitbutton.js b/admin/views/language_translation/submitbutton.js similarity index 92% rename from admin/views/language_placeholder/submitbutton.js rename to admin/views/language_translation/submitbutton.js index f922155c3..ac063b22d 100644 --- a/admin/views/language_placeholder/submitbutton.js +++ b/admin/views/language_translation/submitbutton.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 8 of this MVC - @build 3rd April, 2017 + @version @update number 28 of this MVC + @build 5th April, 2017 @created 3rd April, 2017 @package Component Builder @subpackage submitbutton.js @@ -42,7 +42,7 @@ Joomla.submitbutton = function(task) Joomla.submitform(task); return true; } else { - alert(Joomla.JText._('language_placeholder, some values are not acceptable.','Some values are unacceptable')); + alert(Joomla.JText._('language_translation, some values are not acceptable.','Some values are unacceptable')); return false; } } diff --git a/admin/views/language_placeholder/tmpl/edit.php b/admin/views/language_translation/tmpl/edit.php similarity index 74% rename from admin/views/language_placeholder/tmpl/edit.php rename to admin/views/language_translation/tmpl/edit.php index 84235ef1a..963723837 100644 --- a/admin/views/language_placeholder/tmpl/edit.php +++ b/admin/views/language_translation/tmpl/edit.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 8 of this MVC - @build 3rd April, 2017 + @version @update number 28 of this MVC + @build 5th April, 2017 @created 3rd April, 2017 @package Component Builder @subpackage edit.php @@ -58,35 +58,35 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
+
+ +
+
+ + + ' . JText::_('COM_COMPONENTBUILDER_NEW') . ' + +
+