From 510c28bb0925943cb74eb4bcda1b86d3e7349898 Mon Sep 17 00:00:00 2001
From: Jonathan <jonathan.leon@pandorafms.com>
Date: Tue, 23 Jan 2024 10:56:31 +0100
Subject: [PATCH] #12698 fix welcome messages
---
.../lib/TacticalView/GeneralTacticalView.php | 39 +++++++++++++------
1 file changed, 27 insertions(+), 12 deletions(-)
diff --git a/pandora_console/include/lib/TacticalView/GeneralTacticalView.php b/pandora_console/include/lib/TacticalView/GeneralTacticalView.php
index e00bc8fcf8..06e27e4fd6 100644
--- a/pandora_console/include/lib/TacticalView/GeneralTacticalView.php
+++ b/pandora_console/include/lib/TacticalView/GeneralTacticalView.php
@@ -224,18 +224,33 @@ class GeneralTacticalView
$zone_location = $date_zone->getLocation();
$latitude = $zone_location['latitude'];
- $emojiOptions = [
- 'have_good_day' => __('Have a good day %s ✌', $name),
- 'welcome_back' => __('Welcome back! %s 👋', $name),
- 'merry_christmas' => __('Welcome back! %s 🎅', $name),
- 'good_morning' => __('Good morning, %s! ☕', $name),
- 'good_evening' => __('Good evening, %s 🌇', $name),
- 'good_night' => __('Good night, %s 🌕', $name),
- 'happy_summer' => __('Happy summer, %s 🌞', $name),
- 'happy_winter' => __('Happy winter, %s ⛄', $name),
- 'happy_autumn' => __('Happy autumn, %s 🍂', $name),
- 'happy_spring' => __('Happy spring, %s 🌻', $name),
- ];
+ if ($name !== '') {
+ $emojiOptions = [
+ 'have_good_day' => __('Have a good day %s ✌', $name),
+ 'welcome_back' => __('Welcome back! %s 👋', $name),
+ 'merry_christmas' => __('Welcome back! %s 🎅', $name),
+ 'good_morning' => __('Good morning, %s! ☕', $name),
+ 'good_evening' => __('Good evening, %s 🌇', $name),
+ 'good_night' => __('Good night, %s 🌕', $name),
+ 'happy_summer' => __('Happy summer, %s 🌞', $name),
+ 'happy_winter' => __('Happy winter, %s ⛄', $name),
+ 'happy_autumn' => __('Happy autumn, %s 🍂', $name),
+ 'happy_spring' => __('Happy spring, %s 🌻', $name),
+ ];
+ } else {
+ $emojiOptions = [
+ 'have_good_day' => __('Have a good day ✌'),
+ 'welcome_back' => __('Welcome back! 👋'),
+ 'merry_christmas' => __('Welcome back! 🎅'),
+ 'good_morning' => __('Good morning! ☕'),
+ 'good_evening' => __('Good evening 🌇'),
+ 'good_night' => __('Good night 🌕'),
+ 'happy_summer' => __('Happy summer 🌞'),
+ 'happy_winter' => __('Happy winter ⛄'),
+ 'happy_autumn' => __('Happy autumn 🍂'),
+ 'happy_spring' => __('Happy spring 🌻'),
+ ];
+ }
// Welcome back.
$user_last_connect = $user['last_connect'];