many modules fixes

modules/client_locales/locales.lua

@@ -46,10 +46,10 @@ function Locales.init()
   Locales.installLocales('locales')
 
   local userLocaleName = Settings.get('locale')
-  if userLocaleName and Locales.setLocale(userLocaleName)then
-    info('Using configured locale: ' .. userLocaleName)
+  if userLocaleName and Locales.setLocale(userLocaleName) then
+    --info('Using configured locale: ' .. userLocaleName)
   else
-    info('Using default locale: ' .. defaultLocaleName)
+    --info('Using default locale: ' .. defaultLocaleName)
     Locales.setLocale(defaultLocaleName)
     Settings.set('locale', defaultLocaleName)
   end

modules/client_locales/locales/es.lua

@@ -118,7 +118,7 @@ locale = {
     ["Pass Leadership to %s"] = "Pasar el liderazgo a %s",
     ["Password"] = "Contrase<EFBFBD>a",
     ["Please enter a character name:"] = "Por favor, introduce el nombre de un personaje:",
-    ["Please, press the key you wish to add onto your hotkeys manager"] = "Por favor, presione la tecla que desee para a<EFBFBD>adir a tu administrador de atajos",
+    ["Please, press the key you wish to add onto your hotkeys manager"] = "Por favor, presione la tecla que desee para\na<EFBFBD>adir a tu administrador de atajos",
     ["Please wait"] = "Por favor, espere",
     ["Port"] = "Puerto",
     ["Price:"] = "Precio",
@@ -137,7 +137,7 @@ locale = {
     ["Select object"] = "Seleccionar objeto",
     ["Select Outfit"] = "Selecionar Traje",
     ["Sell"] = "Vender",
-    ["Send automatically"] = "Vender autom<6F>ticamente",
+    ["Send automatically"] = "Enviar autom<6F>ticamente",
     ["Server"] = "Servidor",
     ["Server Log"] = "Registro del servidor",
     ["Set Outfit"] = "Escoger Traje",

modules/client_locales/locales/pt.lua

@@ -150,7 +150,7 @@ locale = {
     ["Pass Leadership to %s"] = "Passar lideran<61>a para %s",
     ["Password"] = "Senha",
     ["Please enter a character name:"] = "Por favor, entre com o nome do personagem:",
-    ["Please, press the key you wish to add onto your hotkeys manager"] = "Por favor, pressione a tecla que voc<6F> deseja adicionar no gerenciador de atalhos",
+    ["Please, press the key you wish to add onto your hotkeys manager"] = "Por favor, pressione a tecla que voc<6F> deseja\nadicionar no gerenciador de atalhos",
     ["Please use this dialog to only report bugs. Do not report rule violations here!"] = "Por favor, use este campo apenas para reportar defeitos. N<>o reporte viola<6C><61>o de regras aqui!",
     ["Please wait"] = "Por favor, espere",
     ["Port"] = "Porta",
@@ -174,7 +174,7 @@ locale = {
     ["Select Outfit"] = "Selecionar Roupa",
     ["Sell"] = "Vender",
     ["Send"] = "Enviar",
-    ["Send automatically"] = "Vender automaticamente",
+    ["Send automatically"] = "Enviar automaticamente",
     ["Server"] = "Servidor",
     ["Server Log"] = "Registro do servidor",
     ["Set Outfit"] = "Escolher Roupa",

modules/client_topmenu/topmenu.otui

@@ -70,6 +70,7 @@ TopPanel
     anchors.right: parent.right
 
   UILabel
+    id: frameCounter
     text-align: right
     text-auto-resize: true
     color: white
@@ -81,7 +82,7 @@ TopPanel
     @onSetup: |
       local updateFunc
       updateFunc = function()
-        self:setText('FPS: ' .. g_app.getBackgroundPaneFps())
+        rootWidget:recursiveGetChildById('frameCounter'):setText('FPS: ' .. g_app.getBackgroundPaneFps())
         scheduleEvent(updateFunc, 250)
       end
       updateFunc()

modules/game_console/console.lua

@@ -386,7 +386,7 @@ function Console.popupMenu(mousePos, mouseButton, creatureName, text)
   if mouseButton == MouseRightButton then
     local menu = createWidget('PopupMenu')
     if creatureName then
-      if creatureName ~= g_game.getLocalPlayer():getName() then
+      if creatureName ~= g_game.getCharacterName() then
         menu:addOption(tr('Message to ' .. creatureName), function () g_game.openPrivateChannel(creatureName) end)
         menu:addOption(tr('Add to VIP list'), function () g_game.addVip(creatureName) end) --TODO not show if creature already in vip
         -- TODO ignore creatureName
@@ -492,7 +492,7 @@ function Console.sendCurrentMessage()
     g_game.talkPrivate(speaktype.speakType, name, message)
 
     message = applyMessagePrefixies(player:getName(), player:getLevel(), message)
-    Console.addPrivateText(message, speaktype, name, isPrivateCommand, g_game.getLocalPlayer():getName())
+    Console.addPrivateText(message, speaktype, name, isPrivateCommand, g_game.getCharacterName())
   end
 end
 

modules/game_hotkeys/hotkeys_manager.lua

@@ -77,7 +77,7 @@ end
 
 function HotkeysManager.save()
   local hotkeySettings = {}
-  for i = 1, currentHotkeysList:getChildCount() do
+  for i=1, currentHotkeysList:getChildCount() do
     local child = currentHotkeysList:getChildByIndex(i)
     table.insert(hotkeySettings, {keyCombo = child.keyCombo,
                                   autoSend = child.autoSend,
@@ -85,6 +85,7 @@ function HotkeysManager.save()
                                   useType = child.useType,
                                   value = child.value})
   end
+
   Settings.setNode('HotkeysManager', hotkeySettings)
 end
 
@@ -311,6 +312,7 @@ function HotkeysManager.call(keyCombo)
 end
 
 function HotkeysManager.checkSelectedHotkey(focused)
+  if not focused then return end
   if hotkeysManagerLoaded then
     hotkeyLabelSelectedOnList = focused