ready 2.6 release

diff --git a/ChangeLog b/ChangeLog
index 10c2281fd7fd5a34075b5c6a36f0484252003d84..79aaf00179772446d1f46b4ee8d9cc1146208c51 100644 (file)
--- 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 76a3096c9704d1ebbde620f972cd78db4518a499..bcc5912542138c6c4203a4d0d76773ab2c8820d1 100644 (file)
--- 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 234f83ec4c4a918bfa9f41f0c9125e36080376b9..28f07d7630cfc825e69e9fe7fc8cbb7dfd19378a 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.6 - Darkmere
+2.6 - Hypostyle

diff --git a/documentation/translation.txt b/documentation/translation.txt
index bd550139bc2d294cc24b3601dc84919c97fe20a7..71ff7b048c463f847644a136b51432e019dc3848 100644 (file)
--- 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 8117ae9acadba09cafe3d0ee643082bd4527e02d..30b5ec6d46ef2271989dafb8fa7052f29bdacd61 100644 (file)
--- 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 c831dbfb0c372f08b6db5086f5117583ac819d83..7eec61df57a10a59c7026e2728d19f8f3405631a 100644 (file)
--- 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 {
 
        /**