diff --git a/README.md b/README.md index f83377068..97da41a7d 100644 --- a/README.md +++ b/README.md @@ -109,7 +109,7 @@ Component Builder is mapped as a component in itself on my local development env + *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*: **105345** ++ *Line count*: **105327** + *File count*: **638** + *Folder count*: **115** diff --git a/admin/README.txt b/admin/README.txt index f83377068..97da41a7d 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -109,7 +109,7 @@ Component Builder is mapped as a component in itself on my local development env + *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*: **105345** ++ *Line count*: **105327** + *File count*: **638** + *Folder count*: **115** diff --git a/admin/access.xml b/admin/access.xml index 9ff76fa7e..cf8ae56ff 100644 --- a/admin/access.xml +++ b/admin/access.xml @@ -113,7 +113,6 @@ - diff --git a/admin/assets/css/language_translation.css b/admin/assets/css/language_translation.css index 616479971..87081ef1f 100644 --- a/admin/assets/css/language_translation.css +++ b/admin/assets/css/language_translation.css @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 28 of this MVC + @version @update number 29 of this MVC @build 5th April, 2017 @created 3rd April, 2017 @package Component Builder diff --git a/admin/assets/css/language_translations.css b/admin/assets/css/language_translations.css index fc9012f38..719d28c16 100644 --- a/admin/assets/css/language_translations.css +++ b/admin/assets/css/language_translations.css @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 28 of this MVC + @version @update number 29 of this MVC @build 5th April, 2017 @created 3rd April, 2017 @package Component Builder diff --git a/admin/controllers/language_translation.php b/admin/controllers/language_translation.php index 021740473..b107c2849 100644 --- a/admin/controllers/language_translation.php +++ b/admin/controllers/language_translation.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 28 of this MVC + @version @update number 29 of this MVC @build 5th April, 2017 @created 3rd April, 2017 @package Component Builder diff --git a/admin/controllers/language_translations.php b/admin/controllers/language_translations.php index 795a39648..25a04cc34 100644 --- a/admin/controllers/language_translations.php +++ b/admin/controllers/language_translations.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 28 of this MVC + @version @update number 29 of this MVC @build 5th April, 2017 @created 3rd April, 2017 @package Component Builder @@ -107,14 +107,5 @@ class ComponentbuilderControllerLanguage_translations extends JControllerAdmin $message = JText::_('COM_COMPONENTBUILDER_IMPORT_FAILED'); $this->setRedirect(JRoute::_('index.php?option=com_componentbuilder&view=language_translations', false), $message, 'error'); return; - } - - public function updatePlaceholders() - { - // Check for request forgeries - JSession::checkToken() or die(JText::_('JINVALID_TOKEN')); - // check if import is allowed for this user. - $user = JFactory::getUser(); - return true; - } + } } diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.ini b/admin/language/en-GB/en-GB.com_componentbuilder.ini index 85db72709..7b6376910 100644 --- a/admin/language/en-GB/en-GB.com_componentbuilder.ini +++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini @@ -3148,8 +3148,6 @@ COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_TRANSLATION_DESCRIPTION="The translati 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." @@ -3950,7 +3948,6 @@ 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." COM_COMPONENTBUILDER_USE_KEY="Use Key" diff --git a/admin/models/forms/language_translation.js b/admin/models/forms/language_translation.js index 160fe7208..c4d782c77 100644 --- a/admin/models/forms/language_translation.js +++ b/admin/models/forms/language_translation.js @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 28 of this MVC + @version @update number 29 of this MVC @build 5th April, 2017 @created 3rd April, 2017 @package Component Builder diff --git a/admin/models/language_translation.php b/admin/models/language_translation.php index f1cee6b35..03307551c 100644 --- a/admin/models/language_translation.php +++ b/admin/models/language_translation.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 28 of this MVC + @version @update number 29 of this MVC @build 5th April, 2017 @created 3rd April, 2017 @package Component Builder diff --git a/admin/models/language_translations.php b/admin/models/language_translations.php index 2f85084e6..d73758db5 100644 --- a/admin/models/language_translations.php +++ b/admin/models/language_translations.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 28 of this MVC + @version @update number 29 of this MVC @build 5th April, 2017 @created 3rd April, 2017 @package Component Builder diff --git a/admin/tables/language_translation.php b/admin/tables/language_translation.php index 3ad379a5d..8ef007204 100644 --- a/admin/tables/language_translation.php +++ b/admin/tables/language_translation.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 28 of this MVC + @version @update number 29 of this MVC @build 5th April, 2017 @created 3rd April, 2017 @package Component Builder diff --git a/admin/views/language_translation/submitbutton.js b/admin/views/language_translation/submitbutton.js index ac063b22d..68b1f2be3 100644 --- a/admin/views/language_translation/submitbutton.js +++ b/admin/views/language_translation/submitbutton.js @@ -9,7 +9,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 28 of this MVC + @version @update number 29 of this MVC @build 5th April, 2017 @created 3rd April, 2017 @package Component Builder diff --git a/admin/views/language_translation/tmpl/edit.php b/admin/views/language_translation/tmpl/edit.php index 963723837..d8d9eb7c8 100644 --- a/admin/views/language_translation/tmpl/edit.php +++ b/admin/views/language_translation/tmpl/edit.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 28 of this MVC + @version @update number 29 of this MVC @build 5th April, 2017 @created 3rd April, 2017 @package Component Builder diff --git a/admin/views/language_translation/view.html.php b/admin/views/language_translation/view.html.php index 457c711f2..282502619 100644 --- a/admin/views/language_translation/view.html.php +++ b/admin/views/language_translation/view.html.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 28 of this MVC + @version @update number 29 of this MVC @build 5th April, 2017 @created 3rd April, 2017 @package Component Builder diff --git a/admin/views/language_translations/tmpl/default.php b/admin/views/language_translations/tmpl/default.php index e57e6e574..4325b6c30 100644 --- a/admin/views/language_translations/tmpl/default.php +++ b/admin/views/language_translations/tmpl/default.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 28 of this MVC + @version @update number 29 of this MVC @build 5th April, 2017 @created 3rd April, 2017 @package Component Builder diff --git a/admin/views/language_translations/tmpl/default_batch_body.php b/admin/views/language_translations/tmpl/default_batch_body.php index 772da1642..926292db9 100644 --- a/admin/views/language_translations/tmpl/default_batch_body.php +++ b/admin/views/language_translations/tmpl/default_batch_body.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 28 of this MVC + @version @update number 29 of this MVC @build 5th April, 2017 @created 3rd April, 2017 @package Component Builder diff --git a/admin/views/language_translations/tmpl/default_batch_footer.php b/admin/views/language_translations/tmpl/default_batch_footer.php index 0eac35565..a97479b38 100644 --- a/admin/views/language_translations/tmpl/default_batch_footer.php +++ b/admin/views/language_translations/tmpl/default_batch_footer.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 28 of this MVC + @version @update number 29 of this MVC @build 5th April, 2017 @created 3rd April, 2017 @package Component Builder diff --git a/admin/views/language_translations/tmpl/default_body.php b/admin/views/language_translations/tmpl/default_body.php index 4727b7676..2146fdc77 100644 --- a/admin/views/language_translations/tmpl/default_body.php +++ b/admin/views/language_translations/tmpl/default_body.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 28 of this MVC + @version @update number 29 of this MVC @build 5th April, 2017 @created 3rd April, 2017 @package Component Builder diff --git a/admin/views/language_translations/tmpl/default_foot.php b/admin/views/language_translations/tmpl/default_foot.php index 8575dcf9a..9bd6b6b33 100644 --- a/admin/views/language_translations/tmpl/default_foot.php +++ b/admin/views/language_translations/tmpl/default_foot.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 28 of this MVC + @version @update number 29 of this MVC @build 5th April, 2017 @created 3rd April, 2017 @package Component Builder diff --git a/admin/views/language_translations/tmpl/default_head.php b/admin/views/language_translations/tmpl/default_head.php index f36eee6c0..6e1c0e804 100644 --- a/admin/views/language_translations/tmpl/default_head.php +++ b/admin/views/language_translations/tmpl/default_head.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 28 of this MVC + @version @update number 29 of this MVC @build 5th April, 2017 @created 3rd April, 2017 @package Component Builder diff --git a/admin/views/language_translations/tmpl/default_toolbar.php b/admin/views/language_translations/tmpl/default_toolbar.php index 21a185e2e..869ddbc7d 100644 --- a/admin/views/language_translations/tmpl/default_toolbar.php +++ b/admin/views/language_translations/tmpl/default_toolbar.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 28 of this MVC + @version @update number 29 of this MVC @build 5th April, 2017 @created 3rd April, 2017 @package Component Builder diff --git a/admin/views/language_translations/view.html.php b/admin/views/language_translations/view.html.php index 9510afefa..85fc2b001 100644 --- a/admin/views/language_translations/view.html.php +++ b/admin/views/language_translations/view.html.php @@ -10,7 +10,7 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 28 of this MVC + @version @update number 29 of this MVC @build 5th April, 2017 @created 3rd April, 2017 @package Component Builder @@ -134,12 +134,7 @@ class ComponentbuilderViewLanguage_translations extends JViewLegacy // add the button to the page $dhtml = $layout->render(array('title' => $title)); $bar->appendButton('Custom', $dhtml, 'batch'); - } - if ($this->user->authorise('language_translation.update_placeholders')) - { - // add Update Placeholders button. - JToolBarHelper::custom('language_translations.updatePlaceholders', 'flash', '', 'COM_COMPONENTBUILDER_UPDATE_PLACEHOLDERS', false); - } + } if ($this->state->get('filter.published') == -2 && ($this->canState && $this->canDelete)) {