Fixed Pokemon translation in alarm

Author: Ninjasoturi

logic/alarm.php

@@ -140,7 +140,7 @@ function alarm($raid_id_array, $user_id, $action, $info = '', $tg_json = [])
     } else if($action == 'new_boss') {
       $msg_text = '<b>' . getTranslation('alert_raid_boss', $recipient_language) . '</b>' . CR;
       $msg_text .= EMOJI_HERE . SP . $gymname . SP . '(' . $raidtimes . ')' . CR;
-      $msg_text .= EMOJI_EGG . SP . '<b>' . get_local_pokemon_name($raid['pokemon'], $raid['pokemon_form']) . '</b>' . CR;
+      $msg_text .= EMOJI_EGG . SP . '<b>' . get_local_pokemon_name($raid['pokemon'], $raid['pokemon_form'], $recipient_language) . '</b>' . CR;
 
     // New attendance
     } else if($action == 'new_att') {

logic/get_local_pokemon_name.php

@@ -1,31 +1,32 @@
 <?php
 /**
  * Get local name of pokemon.
- * @param $pokemon_id
- * @param $pokemon_form_id
- * @param $override_language
+ * @param int $pokemon_id
+ * @param int $pokemon_form_id
+ * @param string $language
  * @return string
  */
-function get_local_pokemon_name($pokemon_id, $pokemon_form_id, $override_language = false)
+function get_local_pokemon_name($pokemon_id, $pokemon_form_id, $language = null)
 {
+  global $config, $botUser;
   $q = my_query('SELECT pokemon_name, pokemon_form_name FROM pokemon WHERE pokedex_id = ? AND pokemon_form_id = ?', [$pokemon_id, $pokemon_form_id]);
   $res = $q->fetch();
   $pokemon_form_name = $res['pokemon_form_name'] ?? 'normal';
 
   debug_log('Pokemon_form: ' . $pokemon_form_name);
-
-  // Get translation type
-  $getTypeTranslation = ($override_language == true) ? 'getPublicTranslation' : 'getTranslation';
+  if($language === null) $language = $botUser->userLanguage;
 
   // Init pokemon name and define fake pokedex ids used for raid eggs
   $pokemon_name = '';
 
   // Get eggs from normal translation.
-  $pokemon_name = (in_array($pokemon_id, EGGS)) ? $getTypeTranslation('egg_' . str_replace('999', '', $pokemon_id)) : $getTypeTranslation('pokemon_id_' . $pokemon_id);
+  $pokemon_name = (in_array($pokemon_id, EGGS)) ?
+    getTranslation('egg_' . str_replace('999', '', $pokemon_id), $language) :
+    getTranslation('pokemon_id_' . $pokemon_id, $language);
 
   $skipFallback = false;
   if ($pokemon_form_name != 'normal') {
-    $pokemon_form_name = $getTypeTranslation('pokemon_form_' . $pokemon_form_id);
+    $pokemon_form_name = getTranslation('pokemon_form_' . $pokemon_form_id, $language);
     // Use only form name if form name contains Pokemon name
     // e.g. Black Kyurem, Frost Rotom
     if(strpos($pokemon_form_name, $pokemon_name, 0)) {

logic/get_overview.php

@@ -32,7 +32,7 @@ function get_overview( $active_raids, $chat_title, $chat_username )
     $resolved_boss = resolve_raid_boss($row['pokemon'], $row['pokemon_form'], $row['spawn'], $row['level']);
     $row['pokemon'] = $resolved_boss['pokedex_id'];
     $row['pokemon_form'] = $resolved_boss['pokemon_form_id'];
-    $pokemon = get_local_pokemon_name($row['pokemon'], $row['pokemon_form'], true);
+    $pokemon = get_local_pokemon_name($row['pokemon'], $row['pokemon_form'], $config->LANGUAGE_PUBLIC);
     $gym = $row['gym_name'];
     $ex_raid_gym_marker = (strtolower($config->RAID_EX_GYM_MARKER) == 'icon') ? EMOJI_STAR : '<b>' . $config->RAID_EX_GYM_MARKER . '</b>';
     $start_time = $row['start_time'];

logic/keys_vote.php

@@ -171,7 +171,7 @@ function keys_vote($raid)
       foreach($raid_bosses as $pokemon) {
         if(in_array($pokemon['pokedex_id'], EGGS)) continue;
         $buttons['pokemon'][] = button(
-          get_local_pokemon_name($pokemon['pokedex_id'], $pokemon['pokemon_form_id'], true),
+          get_local_pokemon_name($pokemon['pokedex_id'], $pokemon['pokemon_form_id'], $config->LANGUAGE_PUBLIC),
           ['vote_pokemon', 'r' => $raid['id'], 'p' => $pokemon['pokedex_id'] . '-' . $pokemon['pokemon_form_id']]
         );
       }

logic/raid_list.php

@@ -7,6 +7,7 @@
  */
 function raid_list($update)
 {
+  global $config;
   // Init raid id.
   $iqq = 0;
 
@@ -42,7 +43,7 @@ function raid_list($update)
     $contents[$i]['text'] = show_raid_poll($row, true)['full'];
 
     // Set the title.
-    $contents[$i]['title'] = get_local_pokemon_name($row['pokemon'],$row['pokemon_form'], true) . ' ' . getPublicTranslation('from') . ' ' . dt2time($row['start_time'])  . ' ' . getPublicTranslation('to') . ' ' . dt2time($row['end_time']);
+    $contents[$i]['title'] = get_local_pokemon_name($row['pokemon'],$row['pokemon_form'], $config->LANGUAGE_PUBLIC) . ' ' . getPublicTranslation('from') . ' ' . dt2time($row['start_time'])  . ' ' . getPublicTranslation('to') . ' ' . dt2time($row['end_time']);
 
     // Get inline keyboard.
     $contents[$i]['keyboard'] = keys_vote($row);

logic/raid_picture.php

@@ -540,7 +540,7 @@ function create_raid_picture($raid, $standalone_photo = false, $debug = false) {
 
 
   // Pokemon raid boss
-  $pokemon_name = get_local_pokemon_name($raid['pokemon'], $raid['pokemon_form'], true);
+  $pokemon_name = get_local_pokemon_name($raid['pokemon'], $raid['pokemon_form'], $config->LANGUAGE_PUBLIC);
   if(!in_array($raid['pokemon'], EGGS) && isset($raid['shadow']) && $raid['shadow']) $pokemon_name .= ' ' . getPublicTranslation('pokemon_form_shadow');
 
   // Pokemon name and form?

logic/show_raid_poll.php

@@ -89,7 +89,7 @@ function show_raid_poll($raid, $inline = false)
     if($raid['event_pokemon_title'] == 1) $title = getPublicTranslation('raid_boss');
     elseif($raid['event_pokemon_title'] == 2) $title = getPublicTranslation('featured_pokemon');
     else $title = getPublicTranslation('raid_boss');
-    $msg = raid_poll_message($msg, $title . ': <b>' . get_local_pokemon_name($raid_pokemon_id, $raid['pokemon_form'], true) . ' ' . (isset($raid['shadow']) && $raid['shadow'] && !in_array($raid['pokemon'], EGGS) ? ' ' . getPublicTranslation('pokemon_form_shadow') : '') . '</b>', true);
+    $msg = raid_poll_message($msg, $title . ': <b>' . get_local_pokemon_name($raid_pokemon_id, $raid['pokemon_form'], $config->LANGUAGE_PUBLIC) . ' ' . (isset($raid['shadow']) && $raid['shadow'] && !in_array($raid['pokemon'], EGGS) ? ' ' . getPublicTranslation('pokemon_form_shadow') : '') . '</b>', true);
 
     // Display raid boss weather.
     $msg = raid_poll_message($msg, ($raid_pokemon_info['weather'] != 0) ? (' ' . get_weather_icons($raid_pokemon_info['weather'])) : '', true);