diff --git a/changelog.md b/changelog.md index da8c9024..ad902d08 100755 --- a/changelog.md +++ b/changelog.md @@ -1,4 +1,4 @@ -## 3.4.a +## 3.5 ### Important for the current release to avoid breaking changes - imports of widgets must be deleted from the visu pages or the namespace @widgets must be used. Visit https://knx-user-forum.de/forum/supportforen/smartvisu/1920060-handlungsbedarf-ma%C3%9Fnahmen-gegen-seitenladefehler-ab-v3-4-a-v3-5 diff --git a/lang/de.ini b/lang/de.ini index 2e9ef6c8..30dd31cc 100644 --- a/lang/de.ini +++ b/lang/de.ini @@ -589,6 +589,7 @@ backup = "Einstellungen sichern" docu = "Dokumentation" forum = "Unterstützung im knx-user-forum" github = "Quellen auf Github" +newstuff = "Neue Widgets und Erweiterungen" connected = "verbunden seit" location = "Ortsinformationen" moonphase = "Mondphase" diff --git a/lang/en.ini b/lang/en.ini index ec5c9288..62384735 100644 --- a/lang/en.ini +++ b/lang/en.ini @@ -571,6 +571,7 @@ backup = "Backup config" docu = "Documentation" forum = "Support on knx-user-forum" github = "Sources on Github" +newstuff = "New widgets and supplements" connected = "connected since" location = "location info" moonphase = "moonphase" diff --git a/lang/fr.ini b/lang/fr.ini index 63f4b7ac..ec34072c 100644 --- a/lang/fr.ini +++ b/lang/fr.ini @@ -364,6 +364,7 @@ backup = "Sauvegarde de configuration" docu = "Documentation" forum = "Support dans le knx-user-forum" github = "Sources sur Github" +newstuff = "Nouveaux widgets et additifs" connected = "connecté depuis" location = "Informations du lieu" moonphase = "phase de la lune" diff --git a/lang/it.ini b/lang/it.ini index f2408ca2..923d61e0 100644 --- a/lang/it.ini +++ b/lang/it.ini @@ -550,6 +550,7 @@ backup = "Backup configurazione" docu = "Documentazione" forum = "Assistenza nel knx-user-forum" github = "Codice sorgente su Github" +newstuff = "Nuovi widget e estensioni" connected = "interconnettato da" location = "Informazioni del luogo" moonphase = "fase lunare" diff --git a/lib/base/check_php_mbstring.php b/lib/base/check_php_mbstring.php index 02502cbb..71d8a019 100644 --- a/lib/base/check_php_mbstring.php +++ b/lib/base/check_php_mbstring.php @@ -3,7 +3,7 @@ * ----------------------------------------------------------------------------- * @package smartVISU * @author Martin Gleiß - * @copyright 2012 - 2015 + * @copyright 2012 - 2024 * @license GPL [http://www.gnu.de] * ----------------------------------------------------------------------------- */ @@ -17,12 +17,12 @@ if (extension_loaded("mbstring")) { - $ret = array('icon' => 'message_ok.svg', 'text' => "PHP extension 'mbstring' loaded"); + $ret = array('icon' => 'message_ok.svg', 'text' => translate("PHP extension 'mbstring' loaded", 'templatechecker')); } else { header("HTTP/1.0 600 smartVISU Config Error"); - $ret = array('icon' => 'message_attention.svg', 'text' => "PHP extension 'mbstring' not loaded!"); + $ret = array('icon' => 'message_attention.svg', 'text' => translate("PHP extension 'mbstring' not loaded!", 'templatechecker')); } echo json_encode($ret); diff --git a/pages/base/menu.html b/pages/base/menu.html index 15ed9634..b185ff3f 100644 --- a/pages/base/menu.html +++ b/pages/base/menu.html @@ -1,8 +1,8 @@ /** * ----------------------------------------------------------------------------- * @package smartVISU -* @author Martin Gleiss, Wolfram v. Hülsen -* @copyright 2012 - 2023 +* @author Martin Gleiß, Wolfram v. Hülsen +* @copyright 2012 - 2024 * @license GPL [http://www.gnu.de] * ----------------------------------------------------------------------------- */ diff --git a/pages/base/system_menu.html b/pages/base/system_menu.html index 5cdc6983..48b80b23 100644 --- a/pages/base/system_menu.html +++ b/pages/base/system_menu.html @@ -81,6 +81,13 @@

{{ lang('system', 'forum') }}

{{ lang('system', 'github') }}

+ +
  • + + {{ lib.svgimg ('', 'edit_favorites', 'icon0', '') }} +

    {{ lang('system', 'newstuff') }}

    +     +
  • Info
    • diff --git a/pages/docu/device/widget_device.codepad.html b/pages/docu/device/widget_device.codepad.html index 0e44c274..f8fded99 100644 --- a/pages/docu/device/widget_device.codepad.html +++ b/pages/docu/device/widget_device.codepad.html @@ -34,7 +34,7 @@
    Example

    - If you want to test ist, the correct number for that codepad is: {{ config_codepad_code }} + If you want to test it, the correct number for that codepad is: {{ config_codepad_code }}
    {{ basic.stateswitch('', 'bath.light.switch', 'icon') }} diff --git a/readme.md b/readme.md index 5045fc9c..cc7aa25f 100644 --- a/readme.md +++ b/readme.md @@ -2,10 +2,6 @@ [![Join the chat at https://gitter.im/sVISU/Lobby](https://badges.gitter.im/sVISU/Lobby.svg)](https://gitter.im/sVISU/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) -## Warning ! The current version in this develop branch is experimental and should not be used in productive environments! -Use version v3.4 from master branch instead. - - ## DESCRIPTION smartVISU is a framework to create a visualisation for smart home environments with simple html-pages. It can be used with several smart home automation backends or directly on KNX. diff --git a/version-info.php b/version-info.php index 03315170..42d988fe 100644 --- a/version-info.php +++ b/version-info.php @@ -1,6 +1,6 @@ diff --git a/widgets/plot.html b/widgets/plot.html index 3ef9da74..881067e0 100644 --- a/widgets/plot.html +++ b/widgets/plot.html @@ -90,7 +90,7 @@ * @param {text[?](line,linestack,stair,spline,area,areastair,areaspline,areastack,column,columnstack)=line} type of each serie: 'line', 'linestack', 'stair', 'spline', 'area', 'areastair', 'areaspline', 'areastack','column', 'columnstack'; multiples in array form (optional, default 'line') * @param {text[?]=} title for the x-axis and y-axes in array form: [title_x-axis, title_y-axis1, title_y-axis2, ...] (optional) * @param {duration(advanced,day)=} minimal time range while zooming or 'advanced' or 'day' (optional, duration-format) - By passing 'advanced' a seaparate range selector is shown and data grouping for large amount of data is enabled + By passing 'advanced' a separate range selector is shown and data grouping for large amount of data is enabled By passing 'day', the plot is shown from 0:00 until 24:00 on the day starting after tmin. Set tmin to '24h' or '1d' for today, '48h' or '2d' for yesterday and so on. tmax must be 'now' or at least 48 hours less than tmin. * @param {value[?]=} assignment of the series to the y-axes; multiples in array form (optional) * @param {value[?]=} y-axes setup for left '0' and right '1' hand in array form (optional)