From f168fb73634eae7eb8a0c29bd120e2e55b87a353 Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Wed, 28 Aug 2019 13:48:07 +0200 Subject: [PATCH] Fixed gh-468 to insure language strings are updated correctly. --- README.md | 8 ++++---- admin/README.txt | 8 ++++---- admin/helpers/compiler/a_Get.php | 5 +++-- componentbuilder.xml | 2 +- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 69e9d270f..91b813751 100644 --- a/README.md +++ b/README.md @@ -146,14 +146,14 @@ TODO + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com) + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 26th August, 2019 ++ *Last Build*: 28th August, 2019 + *Version*: 2.10.0 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved. + *License*: GNU General Public License version 2 or later; see LICENSE.txt -+ *Line count*: **247734** ++ *Line count*: **248009** + *Field count*: **1343** -+ *File count*: **1604** -+ *Folder count*: **250** ++ *File count*: **1608** ++ *Folder count*: **253** > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](http://joomlacomponentbuilder.com). > Developed by [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com) diff --git a/admin/README.txt b/admin/README.txt index 69e9d270f..91b813751 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -146,14 +146,14 @@ TODO + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com) + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 26th August, 2019 ++ *Last Build*: 28th August, 2019 + *Version*: 2.10.0 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved. + *License*: GNU General Public License version 2 or later; see LICENSE.txt -+ *Line count*: **247734** ++ *Line count*: **248009** + *Field count*: **1343** -+ *File count*: **1604** -+ *Folder count*: **250** ++ *File count*: **1608** ++ *Folder count*: **253** > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](http://joomlacomponentbuilder.com). > Developed by [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com) diff --git a/admin/helpers/compiler/a_Get.php b/admin/helpers/compiler/a_Get.php index 57e3ca85a..468a21140 100644 --- a/admin/helpers/compiler/a_Get.php +++ b/admin/helpers/compiler/a_Get.php @@ -4702,8 +4702,8 @@ class Get // check if we should continue if (ComponentbuilderHelper::checkArray($langStringTargets)) { - // insure string is not broken - $content = str_replace('COM_' . $this->hhh . 'COMPONENT' . $this->hhh, $this->langPrefix, $content); + // test add an placeholder updater here + $content = $this->setPlaceholders($content, $this->placeholders); // reset some buckets $langHolders = array(); $langCheck = array(); @@ -7362,6 +7362,7 @@ class Get // check if we should continue if (ComponentbuilderHelper::checkArray($langStringTargets)) { + // start lang holder $langHolders = array(); // set the lang for both since we don't know what area is being targeted $_tmp = $this->lang; diff --git a/componentbuilder.xml b/componentbuilder.xml index 5196535ee..2a6a6c6cd 100644 --- a/componentbuilder.xml +++ b/componentbuilder.xml @@ -1,7 +1,7 @@ COM_COMPONENTBUILDER - 26th August, 2019 + 28th August, 2019 Llewellyn van der Merwe llewellyn@joomlacomponentbuilder.com http://www.joomlacomponentbuilder.com