tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-12698-nuevos-mensajes-de-bienvenida-quedan-raros-si-el-usuario-no-tiene-full-name' into 'develop' 

Ent 12698 nuevos mensajes de bienvenida quedan raros si el usuario no tiene full name

See merge request artica/pandorafms!6875
This commit is contained in:
Rafael Ameijeiras 2024-01-29 15:20:27 +00:00
parent 8269f5fcc6 510c28bb09
commit 813deba7a5
1 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
pandora_console/include/lib/TacticalView/GeneralTacticalView.php
View File

@ -224,18 +224,33 @@ class GeneralTacticalView
$zone_location = $date_zone->getLocation(); $zone_location = $date_zone->getLocation();
$latitude = $zone_location['latitude']; $latitude = $zone_location['latitude'];
$emojiOptions = [ if ($name !== '') {
'have_good_day' => __('Have a good day %s ✌', $name), $emojiOptions = [
'welcome_back' => __('Welcome back! %s 👋', $name), 'have_good_day' => __('Have a good day %s ✌', $name),
'merry_christmas' => __('Welcome back! %s 🎅', $name), 'welcome_back' => __('Welcome back! %s 👋', $name),
'good_morning' => __('Good morning, %s! ☕', $name), 'merry_christmas' => __('Welcome back! %s 🎅', $name),
'good_evening' => __('Good evening, %s 🌇', $name), 'good_morning' => __('Good morning, %s! ☕', $name),
'good_night' => __('Good night, %s 🌕', $name), 'good_evening' => __('Good evening, %s 🌇', $name),
'happy_summer' => __('Happy summer, %s 🌞', $name), 'good_night' => __('Good night, %s 🌕', $name),
'happy_winter' => __('Happy winter, %s ⛄', $name), 'happy_summer' => __('Happy summer, %s 🌞', $name),
'happy_autumn' => __('Happy autumn, %s 🍂', $name), 'happy_winter' => __('Happy winter, %s ⛄', $name),
'happy_spring' => __('Happy spring, %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. // Welcome back.
$user_last_connect = $user['last_connect']; $user_last_connect = $user['last_connect'];