Skip to content

stable #85

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
zoic21 merged 5 commits into from
Dec 31, 2025
Merged

stable #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
20212f7
[Jenkins] Updated translation
Nov 1, 2024
828e83b
Update weather.class.php
zoic21 Dec 10, 2024
a97addc
Update weather.class.php
zoic21 Dec 11, 2024
bad57de
Update weather.class.php
zoic21 Dec 31, 2025
505acd2
Update changelog.md
zoic21 Dec 31, 2025
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
17 changes: 15 additions & 2 deletions core/class/weather.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -746,6 +746,19 @@ public function postUpdate() {
$weatherCmd->setDisplay('generic_type', 'WEATHER_TEMPERATURE_MAX_' . $i);
$weatherCmd->save();

$weatherCmd = $this->getCmd(null, 'condition_' . $i);
if (!is_object($weatherCmd)) {
$weatherCmd = new weatherCmd();
}
$weatherCmd->setName(__('Condition', __FILE__) . ' +' . $i);
$weatherCmd->setLogicalId('condition_' . $i);
$weatherCmd->setEqLogic_id($this->getId());
$weatherCmd->setUnite('');
$weatherCmd->setType('info');
$weatherCmd->setSubType('string');
$weatherCmd->setDisplay('generic_type', 'WEATHER_CONDITION_' . $i);
$weatherCmd->save();

$weatherCmd = $this->getCmd(null, 'condition_id_' . $i);
if (!is_object($weatherCmd)) {
$weatherCmd = new weatherCmd();
Expand Down Expand Up @@ -1034,10 +1047,10 @@ public function updateWeatherData() {
$url .= '&lang=' . substr(config::byKey('language'), 0, 2);
$request_http = new com_http($url);
$request_http->setHeader(array('Autorization: ' . sha512(mb_strtolower(config::byKey('market::username')) . ':' . config::byKey('market::password'))));
$datas = json_decode($request_http->exec(60,6), true);
$datas = json_decode($request_http->exec(), true);
if ($datas['state'] != 'ok') {
sleep(15);
$datas = json_decode($request_http->exec(60,6), true);
$datas = json_decode($request_http->exec(), true);
}
if ($datas['state'] != 'ok') {
return;
Expand Down
4 changes: 4 additions & 0 deletions docs/de_DE/changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
>
>Wenn es keine Informationen über die Aktualisierung gibt, bedeutet dies, dass es sich nur um die Aktualisierung von Dokumentation, Übersetzung oder Text handelt.

# 31.10.2024

- Optimierung der Wetterabfrage

# 26.09.2024

- Eine Warnung wurde behoben
Expand Down
4 changes: 4 additions & 0 deletions docs/en_US/changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
>
>If there is no information on the update, it means that it concerns only the update of documentation, translation or text.

# 10/31/2024

- Optimizing weather retrieval

# 09/26/2024

- Fixed a warning
Expand Down
4 changes: 4 additions & 0 deletions docs/es_ES/changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
>
>Si no hay información sobre la actualización, significa que se trata solo de la actualización de la documentación, la traducción o el texto.

# 31/10/2024

- Optimización de la recuperación del tiempo

# 26/09/2024

- Se corrigió una advertencia
Expand Down
4 changes: 4 additions & 0 deletions docs/fr_FR/changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
>
>S'il n'y a pas d'information sur la mise à jour, c'est que celle-ci concerne uniquement de la mise à jour de documentation, de traduction ou de texte.

# 31/12/2025

- Reduction du nombre de requete pour reduire la charge sur les services cloud

# 31/10/2024

- Optimisation de la récupération de la météo
Expand Down
2 changes: 2 additions & 0 deletions docs/i18n/de_DE.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
"changelog.md": {
"Changelog Weather": "Changelog Wetter",
"S'il n'y a pas d'information sur la mise à jour, c'est que celle-ci concerne uniquement de la mise à jour de documentation, de traduction ou de texte": "Wenn es keine Informationen über die Aktualisierung gibt, bedeutet dies, dass es sich nur um die Aktualisierung von Dokumentation, Übersetzung oder Text handelt",
"31\/10\/2024": "31.10.2024",
"Optimisation de la récupération de la météo": "Optimierung der Wetterabfrage",
"26\/09\/2024": "26.09.2024",
"Correction d'un warning": "Eine Warnung wurde behoben",
"26\/08\/2024": "26.08.2024",
Expand Down
2 changes: 2 additions & 0 deletions docs/i18n/en_US.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
"changelog.md": {
"Changelog Weather": "Changelog Weather",
"S'il n'y a pas d'information sur la mise à jour, c'est que celle-ci concerne uniquement de la mise à jour de documentation, de traduction ou de texte": "If there is no information on the update, it means that it concerns only the update of documentation, translation or text",
"31\/10\/2024": "10\/31\/2024",
"Optimisation de la récupération de la météo": "Optimizing weather retrieval",
"26\/09\/2024": "09\/26\/2024",
"Correction d'un warning": "Fixed a warning",
"26\/08\/2024": "08\/26\/2024",
Expand Down
2 changes: 2 additions & 0 deletions docs/i18n/es_ES.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
"changelog.md": {
"Changelog Weather": "Changelog Weather",
"S'il n'y a pas d'information sur la mise à jour, c'est que celle-ci concerne uniquement de la mise à jour de documentation, de traduction ou de texte": "Si no hay información sobre la actualización, significa que se trata solo de la actualización de la documentación, la traducción o el texto",
"31\/10\/2024": "31\/10\/2024",
"Optimisation de la récupération de la météo": "Optimización de la recuperación del tiempo",
"26\/09\/2024": "26\/09\/2024",
"Correction d'un warning": "Se corrigió una advertencia",
"26\/08\/2024": "26\/08\/2024",
Expand Down
2 changes: 2 additions & 0 deletions docs/i18n/fr_FR.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
"Changelog Weather": "Changelog Weather",
"IMPORTANT": "IMPORTANT",
"S'il n'y a pas d'information sur la mise à jour, c'est que celle-ci concerne uniquement de la mise à jour de documentation, de traduction ou de texte": "S'il n'y a pas d'information sur la mise à jour, c'est que celle-ci concerne uniquement de la mise à jour de documentation, de traduction ou de texte",
"31\/10\/2024": "31\/10\/2024",
"Optimisation de la récupération de la météo": "Optimisation de la récupération de la météo",
"26\/09\/2024": "26\/09\/2024",
"Correction d'un warning": "Correction d'un warning",
"26\/08\/2024": "26\/08\/2024",
Expand Down
2 changes: 2 additions & 0 deletions docs/i18n/pt_PT.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
"changelog.md": {
"Changelog Weather": "Changelog Tempo",
"S'il n'y a pas d'information sur la mise à jour, c'est que celle-ci concerne uniquement de la mise à jour de documentation, de traduction ou de texte": "Se não houver informação sobre a atualização, significa que se trata apenas da atualização da documentação, tradução ou texto",
"31\/10\/2024": "31\/10\/2024",
"Optimisation de la récupération de la météo": "Otimização da recuperação meteorológica",
"26\/09\/2024": "26\/09\/2024",
"Correction d'un warning": "Corrigido um aviso",
"26\/08\/2024": "26\/08\/2024",
Expand Down
4 changes: 4 additions & 0 deletions docs/pt_PT/changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
>
>Se não houver informação sobre a atualização, significa que se trata apenas da atualização da documentação, tradução ou texto.

# 31/10/2024

- Otimização da recuperação meteorológica

# 26/09/2024

- Corrigido um aviso
Expand Down