From fbde74a9d135b95cd33052f16fa3d6cfc2775b83 Mon Sep 17 00:00:00 2001
From: Llewellyn van der Merwe <llewellyn@vdm.io>
Date: Fri, 25 Dec 2020 20:12:20 +0200
Subject: [PATCH] Fixed gh-626 to ensure that language strings that are already
 uppercase do not get added, even if it has a number.

---
 README.md                        | 2 +-
 admin/README.txt                 | 2 +-
 admin/helpers/compiler/a_Get.php | 2 +-
 componentbuilder.xml             | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 8336ce489..9e6ef8d6d 100644
--- a/README.md
+++ b/README.md
@@ -143,7 +143,7 @@ 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*: 24th December, 2020
++ *Last Build*: 25th December, 2020
 + *Version*: 2.12.3
 + *Copyright*: Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/admin/README.txt b/admin/README.txt
index 8336ce489..9e6ef8d6d 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -143,7 +143,7 @@ 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*: 24th December, 2020
++ *Last Build*: 25th December, 2020
 + *Version*: 2.12.3
 + *Copyright*: Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/admin/helpers/compiler/a_Get.php b/admin/helpers/compiler/a_Get.php
index 30339c415..7e92c92b8 100644
--- a/admin/helpers/compiler/a_Get.php
+++ b/admin/helpers/compiler/a_Get.php
@@ -6496,7 +6496,7 @@ class Get
 	public function setLang($string)
 	{
 		// this is there to insure we dont break already added Language strings
-		if (ComponentbuilderHelper::safeString($string, 'U') === $string)
+		if (ComponentbuilderHelper::safeString($string, 'U', '_', false, false) === $string)
 		{
 			return false;
 		}
diff --git a/componentbuilder.xml b/componentbuilder.xml
index 7589a53b0..b64c62b56 100644
--- a/componentbuilder.xml
+++ b/componentbuilder.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.2" method="upgrade">
 	<name>COM_COMPONENTBUILDER</name>
-	<creationDate>24th December, 2020</creationDate>
+	<creationDate>25th December, 2020</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>llewellyn@joomlacomponentbuilder.com</authorEmail>
 	<authorUrl>http://www.joomlacomponentbuilder.com</authorUrl>