From 344f7387a3343ff0e94ba49e65898ef5da4d82c4 Mon Sep 17 00:00:00 2001
From: Banana <mail@bananas-playground.net>
Date: Sun, 21 Mar 2021 11:08:57 +0100
Subject: [PATCH] ready 2.6 release

---
 ChangeLog                         | 3 ++-
 TODO                              | 1 -
 VERSION                           | 2 +-
 documentation/translation.txt     | 2 +-
 documentation/update.txt          | 2 +-
 webroot/lib/translation.class.php | 6 +++++-
 6 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 10c2281..79aaf00 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,8 +2,9 @@ version 2.6 - Hypostyle
 
 	+ Fixed sql problems with Maria DB. Any_value is not supported there
 	+ Fixed some query and data loading brain fucks..
-	+ Updated third party informations in readme
+	+ Updated third party information in readme
 	+ Fixed xml import xsd
+	+ Added translation support. More information in translation.txt
 
 version 2.5.2 - Darkmere (2020-09-12)
 
diff --git a/TODO b/TODO
index 76a3096..bcc5912 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,4 @@
 TODO / Feature list
-+ translation support
 + adapt new php 7
 ++ http://php.net/manual/en/migration70.new-features.php#migration70.new-features.null-coalesce-op
 
diff --git a/VERSION b/VERSION
index 234f83e..28f07d7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.6 - Darkmere
+2.6 - Hypostyle
diff --git a/documentation/translation.txt b/documentation/translation.txt
index bd55013..71ff7b0 100644
--- a/documentation/translation.txt
+++ b/documentation/translation.txt
@@ -3,4 +3,4 @@ convention. English is eng.lang.ini and german is ger.lang.ini
 
 The FRONTEND_LANGUAGE setting in config.php defines the used language.
 
-If no or wrong FRONTEND_LANGUAGE is set eng will be used.
+If no or wrong FRONTEND_LANGUAGE is set, eng will be used.
diff --git a/documentation/update.txt b/documentation/update.txt
index 8117ae9..30b5ec6 100644
--- a/documentation/update.txt
+++ b/documentation/update.txt
@@ -1,7 +1,7 @@
 If you are updating from a previous version make sure every update info from
 the version your are updating from is done.
 
-## version 2.6 - Darkmere
+## version 2.6 - Hypostyle
 
 + Update config file with the new language setting. See config.default and
   translation.txt for more information
diff --git a/webroot/lib/translation.class.php b/webroot/lib/translation.class.php
index c831dbf..7eec61d 100644
--- a/webroot/lib/translation.class.php
+++ b/webroot/lib/translation.class.php
@@ -26,7 +26,11 @@
  *
  */
 
-
+/**
+ * Class Translation
+ *
+ * A very simple way to load and provide the translation
+ */
 class Translation {
 
 	/**
-- 
2.39.5