Skip to content

Commit eb39327

Browse files
sergejeysergejey
committed
Updates
* Motion sensor behavior update (homekit status sync) * Eng translation fixes
1 parent 205e863 commit eb39327

File tree

8 files changed

+400
-398
lines changed

8 files changed

+400
-398
lines changed

‎languages/default.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1115,7 +1115,7 @@
11151115

11161116
'MODULES_UPDATES_AVAILABLE' => 'Modules updates available',
11171117
'SYSTEM_UPDATES_AVAILABLE' => 'System updates available',
1118-
'ERRORS_SAVED' => 'Errors saved',
1118+
'ERRORS_SAVED' => 'Errors detected',
11191119

11201120
// DEVICES
11211121
'DEVICES_MODULE_TITLE' => 'Simple Devices',
@@ -1515,6 +1515,7 @@
15151515
'NEWDASH_DISCONNECTED' => 'No connection',
15161516
'NEWDASH_MJDM_RESOURCE' => 'MJDM Resources',
15171517
'NEWDASH_FORUM' => 'Forum',
1518+
'NEWDASH_FORUM_DISCUSSION' => 'Discuss on forum',
15181519
'NEWDASH_CHAT_TELEGRAM' => 'Telegram chats',
15191520
'NEWDASH_CHAT_TELEGRAM_MAIN' => 'General chat (RUS)',
15201521
'NEWDASH_CHAT_TELEGRAM_SMOKE' => 'Smoking room (RUS)',
@@ -1540,7 +1541,7 @@
15401541
'NEWDASH_CLASS' => 'Class',
15411542
'NEWDASH_NEWS' => 'MajorDomo News and Blogs',
15421543
'NEWDASH_NEWS_MORE' => 'more entries',
1543-
'NEWDASH_DONTSHOW_THIS_BLOCK' => 'Don\'t show this block again',
1544+
'NEWDASH_DONTSHOW_THIS_BLOCK' => 'Hide this block',
15441545
'NEWDASH_HIDE_MENU_HINT' => 'This menu can be moved to the top, shall we try? <br> To return back press',
15451546
'NEWDASH_PRELOAD_HEADER' => 'Loading content ...',
15461547
'NEWDASH_PRELOAD_TEXT' => 'If the download is too long, there may be an error in the code or the script is performing the requested operation.',
@@ -1574,8 +1575,8 @@
15741575
'NEWDASH_OBJ_ADD_NEW_PROP_NAME' => 'Name for new propertie',
15751576
'NEWDASH_OBJ_ADD_NEW_PROP_VALUE' => 'Property value',
15761577

1577-
'NEWSAVERESTORE_NONE_UPDATE_HEADER' => 'It\'s okay!',
1578-
'NEWSAVERESTORE_NONE_UPDATE_TEXT' => 'It\'s great that you update on time. You now have the latest available version of the system. But if necessary, you can download files from the GitHub repository. ',
1578+
'NEWSAVERESTORE_NONE_UPDATE_HEADER' => 'It\'s OK!',
1579+
'NEWSAVERESTORE_NONE_UPDATE_TEXT' => 'It\'s great that you update on time. Now you have the latest available version installed. You can download files from the GitHub repository in case you need it :) ',
15791580
'NEWSAVERESTORE_NONE_UPDATE_BTN' => 'Update anyway',
15801581
'NEWSAVERESTORE_UPDATE_HEADER' => 'Update time!',
15811582
'NEWSAVERESTORE_UPDATE_TEXT' => 'Try to keep your system up to date to avoid bugs and security issues. Every day, the developers make changes to ensure you get the most out of MajorDoMo. ',

‎languages/ru.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1514,6 +1514,7 @@
15141514
'NEWDASH_DISCONNECTED' => 'Нет подключения',
15151515
'NEWDASH_MJDM_RESOURCE' => 'Ресурсы MJDM',
15161516
'NEWDASH_FORUM' => 'Форум',
1517+
'NEWDASH_FORUM_DISCUSSION' => 'Обсуждение на форуме',
15171518
'NEWDASH_CHAT_TELEGRAM' => 'Чаты Telegram',
15181519
'NEWDASH_CHAT_TELEGRAM_MAIN' => 'Общий чат (RUS)',
15191520
'NEWDASH_CHAT_TELEGRAM_SMOKE' => 'Курилка (RUS)',

‎modules/devices/SDevices_statusUpdated.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,11 @@
3838
}
3939
}
4040

41+
/*
4142
if ($this->class_title == 'SMotions' && isset($params['NEW_VALUE']) && !$params['NEW_VALUE']) {
4243
return;
4344
}
45+
*/
4446

4547
$this->callMethod('logicAction');
4648
include_once(dirname(__FILE__) . '/devices.class.php');

‎modules/devices/devices_links_actions.inc.php

Lines changed: 384 additions & 382 deletions
Large diffs are not rendered by default.

‎modules/devices/devices_manage_schedule.inc.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
$type_methods=array();
2020

21-
if (is_array($tmp)) {
21+
if (is_array($tmp) && count($tmp)) {
2222
$devices = SQLSelect("SELECT * FROM devices WHERE ID IN (".implode(',',$tmp).") ORDER BY devices.TITLE");
2323
$total = count($devices);
2424
for($i=0;$i<$total;$i++) {

‎templates/locations/locations_search_admin.html

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,8 @@
2626
<div class="btn-group">
2727
<a class="btn btn-default btn-xs" href="?view_mode=priority_up&id=[#ID#]"><i class="glyphicon glyphicon-arrow-up"></i></a>
2828
<a class="btn btn-default btn-xs" href="?view_mode=priority_down&id=[#ID#]"><i class="glyphicon glyphicon-arrow-down"></i></a>
29-
30-
<!--#
31-
<a class="btn btn-warning btn-xs" href="javascript://" data-toggle="modal" data-target="#modalEditLocation[#ID#]"><i class="glyphicon glyphicon-pencil"></i> Изменить</a>
32-
#-->
33-
<a class="btn btn-default btn-xs" href="?view_mode=edit_locations&id=[#ID#]"><i class="glyphicon glyphicon-pencil"></i> Изменить</a>
34-
<a class="btn btn-danger btn-xs" href="?view_mode=delete_locations&id=[#ID#]" onClick="return confirm('Delete record?')"><i class="glyphicon glyphicon-remove"></i> Удалить</a>
29+
<a class="btn btn-default btn-xs" href="?view_mode=edit_locations&id=[#ID#]"><i class="glyphicon glyphicon-pencil"></i> <#LANG_EDIT#></a>
30+
<a class="btn btn-danger btn-xs" href="?view_mode=delete_locations&id=[#ID#]" onClick="return confirm('Delete record?')"><i class="glyphicon glyphicon-remove"></i> <#LANG_DELETE#></a>
3531
</div>
3632
[#endif ACTION#]
3733
</span>

‎templates/panel_default.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ <h4 class="modal-title" id="myModalLabel"><#LANG_NEWDASH_DMB_TITLE_MODAL#></h4>
109109
<span id="dashInfoDBReqH" onmouseover="$('#dbreqdiscus').show('slow');" class="badge" style="background:transparent;"><img src="<#ROOTHTML#>img/ajax-loader.gif"/></span>
110110
</li>
111111
<li class="list-group-item text-center" id="dbreqdiscus" style="display:none;background: radial-gradient(circle farthest-corner at 100px 50px, #daffe5, #d6ecff);">
112-
<a href="https://mjdm.ru/forum/viewtopic.php?f=6&t=7301" style="text-decoration:none;color: #333;" target="_blank"><i style="margin-right: 10px;vertical-align: top;" class="glyphicon glyphicon-send"></i>Обсуждение на форуме</a>
112+
<a href="https://mjdm.ru/forum/viewtopic.php?f=6&t=7301" style="text-decoration:none;color: #333;" target="_blank"><i style="margin-right: 10px;vertical-align: top;" class="glyphicon glyphicon-send"></i><#LANG_NEWDASH_FORUM_DISCUSSION#></a>
113113
</li>
114114

115115
<li class="list-group-item">
@@ -125,14 +125,14 @@ <h4 class="modal-title" id="myModalLabel"><#LANG_NEWDASH_DMB_TITLE_MODAL#></h4>
125125
<#LANG_NEWDASH_SYSTEM_INFO_LAST_UPDATE#> <a href="?pd=pz_&md=panel&inst=&action=saverestore"><i class="glyphicon glyphicon-cloud-download" style="color: darkgray;font-size: 10pt;vertical-align: text-top;"></i></a>
126126
</li>
127127
<li class="list-group-item">
128-
Тема оформления
128+
<#LANG_THEME#>
129129
<span class="badge" style="background:transparent;">
130130
<div class="btn-group" data-toggle="buttons">
131131
<label class="btn btn-sm btn-primary" style="padding: 0px 5px;font-size: 1.1rem;background: #474747;border: 0px;">
132-
<input type="radio" onChange="if($(this).is(':checked')) $('link#theme').attr('href', '<#ROOTHTML#>3rdparty/bootstrap/css/bootstrap_dark_admin.css');$.cookie('theme', 'dark', {expires: 180});"> Темно
132+
<input type="radio" onChange="if($(this).is(':checked')) $('link#theme').attr('href', '<#ROOTHTML#>3rdparty/bootstrap/css/bootstrap_dark_admin.css');$.cookie('theme', 'dark', {expires: 180});"> <#LANG_THEME_DARK#>
133133
</label>
134134
<label class="btn btn-sm btn-default" style="padding: 0px 5px;font-size: 1.1rem;background: #939191;border: 0px;">
135-
<input type="radio" onChange="if($(this).is(':checked')) $('link#theme').attr('href', '<#ROOTHTML#>3rdparty/bootstrap/css/bootstrap.min.css');$.cookie('theme', 'light', {expires: 180});"> Светло
135+
<input type="radio" onChange="if($(this).is(':checked')) $('link#theme').attr('href', '<#ROOTHTML#>3rdparty/bootstrap/css/bootstrap.min.css');$.cookie('theme', 'light', {expires: 180});"> <#LANG_THEME_LIGHT#>
136136
</label>
137137
</div>
138138
</span>

‎templates/saverestore/action_admin.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ <h3 class="panel-title"><#LANG_LATEST_UPDATES#></h3>
8080
<li class="list-group-item [#if MYVERSION == 1#]panel-success[#endif#]" [#if MYVERSION == 1#]style="background: #d6e9c6;"[#endif#]>
8181
<span class="badge">[#UPDATE_TEXT#]</span>
8282
<div>
83-
[#if MYVERSION == 1#]<span class="label label-success" id="mysystemversion">Моя версия</span> [#endif#]<a href="[#LINK#]" target="_blank">[#TITLE#]</a>
83+
[#if MYVERSION == 1#]<span class="label label-success" id="mysystemversion"><#LANG_MARKET_CATEGORY_INSTALLED#></span> [#endif#]<a href="[#LINK#]" target="_blank">[#TITLE#]</a>
8484
<div>↳ <span class="label label-default">[#DESC_UPDATE#]</span></div>
8585

8686
</div>

0 commit comments

Comments
 (0)