Skip to content

Fix missing translations in cmd.configure modal #3384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Mips2648 merged 2 commits into from
Jun 23, 2026
+75 −71
Merged

Fix missing translations in cmd.configure modal #3384

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2f7693
chore: code formatting
Salvialf Jun 22, 2026
a1e2a3d
fix(cmd.configure): add missing translations
Salvialf Jun 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
146 changes: 75 additions & 71 deletions desktop/modal/cmd.configure.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@
<sup><i class="fas fa-question-circle" title="{{Nombre de décimales}}"></i></sup>
</label>
<div class="col-sm-6">
<input class="cmdAttr form-control" data-l1key="configuration" data-l2key="historizeRound" type="number" min="0" max="9" step="1" maxlength="1" oninput="this.value = this.value.slice(0, 1)"/>
<input class="cmdAttr form-control" data-l1key="configuration" data-l2key="historizeRound" type="number" min="0" max="9" step="1" maxlength="1" oninput="this.value = this.value.slice(0, 1)" />
</div>
</div>
<?php }
Expand Down Expand Up @@ -507,31 +507,31 @@
</div>
</div>
<?php if ($JEEDOM_INTERNAL_CONFIG['cmd']['type']['info']['subtype'][$cmd->getSubType()]['isHistorized']['canBeSmooth']) { ?>
<div class="form-group">
<label class="col-md-3 col-sm-3 control-label">{{Mode de lissage}}</label>
<div class="col-sm-6">
<select class="form-control cmdAttr" data-l1key="configuration" data-l2key="historizeMode">
<option value="avg">{{Moyenne}}</option>
<option value="min">{{Minimum}}</option>
<option value="max">{{Maximum}}</option>
<option value="none">{{Aucun}}</option>
</select>
<div class="form-group">
<label class="col-md-3 col-sm-3 control-label">{{Mode de lissage}}</label>
<div class="col-sm-6">
<select class="form-control cmdAttr" data-l1key="configuration" data-l2key="historizeMode">
<option value="avg">{{Moyenne}}</option>
<option value="min">{{Minimum}}</option>
<option value="max">{{Maximum}}</option>
<option value="none">{{Aucun}}</option>
</select>
</div>
</div>
</div>
<div class="form-group">
<label class="col-md-3 col-sm-3 control-label">{{Limiter à une valeur toute les}}
<sup><i class="fas fa-question-circle" title="{{Limiter le nombre de valeurs historisées par la commande en temps réel (avant le lissage de la nuit). Attention un mode de lissage doit absolument être défini.}}"></i></sup>
</label>
<div class="col-sm-6">
<select class="form-control cmdAttr" data-l1key="configuration" data-l2key="history::smooth">
<option value="">{{Default}}</option>
<option value="-1">{{Aucun}}</option>
<option value="60">{{1 min}}</option>
<option value="300">{{5 min}}</option>
<option value="600">{{10 min}}</option>
</select>
<div class="form-group">
<label class="col-md-3 col-sm-3 control-label">{{Limiter à une valeur toute les}}
<sup><i class="fas fa-question-circle" title="{{Limiter le nombre de valeurs historisées par la commande en temps réel (avant le lissage de la nuit). Attention un mode de lissage doit absolument être défini.}}"></i></sup>
</label>
<div class="col-sm-6">
<select class="form-control cmdAttr" data-l1key="configuration" data-l2key="history::smooth">
<option value="">{{Default}}</option>
<option value="-1">{{Aucun}}</option>
<option value="60">{{1 min}}</option>
<option value="300">{{5 min}}</option>
<option value="600">{{10 min}}</option>
</select>
</div>
</div>
</div>
<?php }
?>
<div class="form-group">
Expand All @@ -554,47 +554,47 @@
</div>
</div>
<?php if ($cmd->getIsHistorized() == 1 && $JEEDOM_INTERNAL_CONFIG['cmd']['type']['info']['subtype'][$cmd->getSubType()]['isHistorized']['canBeSmooth']) { ?>
<div class="form-group">
<label class="col-md-3 col-sm-3 control-label">{{Paramètres d'affichage}}</label>
<div class="col-sm-2">
<select class="form-control cmdAttr" data-l1key="display" data-l2key="groupingType">
<option value="">{{Aucun groupement}}</option>
<option value="sum::hour">{{Somme par heure}}</option>
<option value="average::hour">{{Moyenne par heure}}</option>
<option value="low::hour">{{Minimum par heure}}</option>
<option value="high::hour">{{Maximum par heure}}</option>
<option value="sum::day">{{Somme par jour}}</option>
<option value="average::day">{{Moyenne par jour}}</option>
<option value="low::day">{{Minimum par jour}}</option>
<option value="high::day">{{Maximum par jour}}</option>
<option value="sum::week">{{Somme par semaine}}</option>
<option value="average::week">{{Moyenne par semaine}}</option>
<option value="low::week">{{Minimum par semaine}}</option>
<option value="high::week">{{Maximum par semaine}}</option>
<option value="sum::month">{{Somme par mois}}</option>
<option value="average::month">{{Moyenne par mois}}</option>
<option value="low::month">{{Minimum par mois}}</option>
<option value="high::month">{{Maximum par mois}}</option>
<option value="sum::year">{{Somme par année}}</option>
<option value="average::year">{{Moyenne par année}}</option>
<option value="low::year">{{Minimum par année}}</option>
<option value="high::year">{{Maximum par année}}</option>
</select>
</div>
<div class="col-sm-2">
<select class="form-control cmdAttr" data-l1key="display" data-l2key="graphType">
<option value="line">{{Ligne}}</option>
<option value="area">{{Aire}}</option>
<option value="column">{{Barre}}</option>
</select>
</div>
<div class="col-sm-2">
{{Variation}}&nbsp;<input type="checkbox" class="cmdAttr" data-l1key="display" data-l2key="graphDerive" />
<div class="form-group">
<label class="col-md-3 col-sm-3 control-label">{{Paramètres d'affichage}}</label>
<div class="col-sm-2">
<select class="form-control cmdAttr" data-l1key="display" data-l2key="groupingType">
<option value="">{{Aucun groupement}}</option>
<option value="sum::hour">{{Somme par heure}}</option>
<option value="average::hour">{{Moyenne par heure}}</option>
<option value="low::hour">{{Minimum par heure}}</option>
<option value="high::hour">{{Maximum par heure}}</option>
<option value="sum::day">{{Somme par jour}}</option>
<option value="average::day">{{Moyenne par jour}}</option>
<option value="low::day">{{Minimum par jour}}</option>
<option value="high::day">{{Maximum par jour}}</option>
<option value="sum::week">{{Somme par semaine}}</option>
<option value="average::week">{{Moyenne par semaine}}</option>
<option value="low::week">{{Minimum par semaine}}</option>
<option value="high::week">{{Maximum par semaine}}</option>
<option value="sum::month">{{Somme par mois}}</option>
<option value="average::month">{{Moyenne par mois}}</option>
<option value="low::month">{{Minimum par mois}}</option>
<option value="high::month">{{Maximum par mois}}</option>
<option value="sum::year">{{Somme par année}}</option>
<option value="average::year">{{Moyenne par année}}</option>
<option value="low::year">{{Minimum par année}}</option>
<option value="high::year">{{Maximum par année}}</option>
</select>
</div>
<div class="col-sm-2">
<select class="form-control cmdAttr" data-l1key="display" data-l2key="graphType">
<option value="line">{{Ligne}}</option>
<option value="area">{{Aire}}</option>
<option value="column">{{Barre}}</option>
</select>
</div>
<div class="col-sm-2">
{{Variation}}&nbsp;<input type="checkbox" class="cmdAttr" data-l1key="display" data-l2key="graphDerive" />
</div>
<div class="col-sm-2">
{{Escalier}}&nbsp;<input type="checkbox" class="cmdAttr" data-l1key="display" data-l2key="graphStep" />
</div>
<div class="col-sm-2">
{{Escalier}}&nbsp;<input type="checkbox" class="cmdAttr" data-l1key="display" data-l2key="graphStep" />
</div>
</div>
<?php } ?>
</fieldset>
</form>
Expand Down Expand Up @@ -845,9 +845,9 @@
<table class="table table-condensed" id="table_widgetParametersCmd">
<thead class="table">
<tr>
<th style="width: 20%">Nom</th>
<th style="width: 80%">Valeur</th>
<th style="width: 1px">Action</th>
<th style="width: 20%">{{Nom}}</th>
<th style="width: 80%">{{Valeur}}</th>
<th style="width: 1px">{{Action}}</th>
</tr>
</thead>
<tbody>
Expand All @@ -863,7 +863,7 @@
$tr .= '<input class="form-control value" value="' . htmlspecialchars($value, ENT_QUOTES) . '" />';
$tr .= '</td>';
$tr .= '<td>';
$tr .= '<a class="btn btn-danger btn-xs removeWidgetParameter pull-right"><i class="fas fa-times"></i> Supprimer</a>';
$tr .= '<a class="btn btn-danger btn-xs removeWidgetParameter pull-right"><i class="fas fa-times"></i> {{Supprimer}}</a>';
$tr .= '</td>';
$tr .= '</tr>';
}
Expand Down Expand Up @@ -1162,7 +1162,7 @@
if (!isset(cmd.display)) cmd.display = {}
if (!isset(cmd.display.parameters)) cmd.display.parameters = {}

if (document.querySelector('#cmd_display #table_widgetParametersCmd')) {
if (document.querySelector('#cmd_display #table_widgetParametersCmd')) {
document.querySelector('#cmd_display #table_widgetParametersCmd')?.tBodies[0].childNodes.forEach(_tr => {
if (_tr.nodeType != 3) {
cmd.display.parameters[_tr.querySelector('.key').jeeValue()] = _tr.querySelector('.value').jeeValue()
Expand Down Expand Up @@ -1213,7 +1213,7 @@

(function() { // Self Isolation!
var jeeM = jeeFrontEnd.md_displayCmdConfigure

//Manage events outside parents delegations:
document.getElementById('bt_cmdConfigureTest')?.addEventListener('click', function(event) {
jeedom.cmd.test({
Expand Down Expand Up @@ -1495,7 +1495,11 @@
var _target = null

if (_target = event.target.closest('#bt_searchInfoCmdCalculValue')) {
jeedom.cmd.getSelectModal({cmd: {type: 'info'}}, function(result) {
jeedom.cmd.getSelectModal({
cmd: {
type: 'info'
}
}, function(result) {
document.querySelectorAll('.cmdAttr[data-l1key=configuration][data-l2key=calculValueOffset]')[0].insertAtCursor(result.human)
})
}
Expand Down Expand Up @@ -1580,7 +1584,7 @@
tr += '<input class="form-control value" />'
tr += '</td>'
tr += '<td>'
tr += '<a class="btn btn-danger btn-xs removeWidgetParameter pull-right"><i class="fas fa-times"></i> Supprimer</a>'
tr += '<a class="btn btn-danger btn-xs removeWidgetParameter pull-right"><i class="fas fa-times"></i> {{Supprimer}}</a>'
tr += '</td>'
tr += '</tr>'
document.getElementById('table_widgetParametersCmd').tBodies[0].insertAdjacentHTML('beforeend', tr)
Expand Down
Loading