Localization

Author: bleonheart

gamemode/core/derma/mainmenu/character.lua

@@ -513,7 +513,7 @@ function PANEL:createSelectedCharacterInfoPanel(character)
     self.selectBtn.DoClick = function()
         if character:isBanned() then
             local characterName = character:getName()
-            Derma_Query("Your character: " .. characterName .. ", has been permanently killed. An administrator has approved this PK.\nPKs are a regular part of RP; you can always make a new character. Have fun!", "Permanent Kill", "I aknowledge.", function() end)
+            Derma_Query(L("pkDialogMessage", characterName), L("permaKillTitle"), L("iAcknowledge"), function() end)
         else
             lia.module.list["mainmenu"]:chooseCharacter(character:getID()):catch(function(err) if err and err ~= "" then LocalPlayer():notifyLocalized(err) end end)
             self:Remove()

gamemode/core/derma/skins/skin.lua

@@ -302,5 +302,5 @@ function SKIN:PaintMenuBar(panel, w, h)
     drawAltBg(panel, w, h)
 end
 
-derma.DefineSkin("Lilia Skin", "The skin for the Lilia framework.", SKIN)
+derma.DefineSkin("Lilia Skin", L("liliaSkinDesc"), SKIN)
 derma.RefreshSkins()

gamemode/core/derma/skins/skin_alt.lua

@@ -350,5 +350,5 @@ function SKIN:PaintMenuBar(_, w, h)
     basePaint(w, h)
 end
 
-derma.DefineSkin("Lilia Alt Skin", "The alt skin for the Lilia framework.", SKIN)
+derma.DefineSkin("Lilia Alt Skin", L("liliaAltSkinDesc"), SKIN)
 derma.RefreshSkins()

gamemode/languages/english.lua

@@ -1621,4 +1621,11 @@ Reload: Drop]],
     viewEvidence = "View Evidence",
     banCharacterOffline = "Ban Character (Offline)",
     unbanCharacterOffline = "Unban Character (Offline)",
-}
+    evidenceInvalidURL = "Evidence must be a valid URL.",
+    pkDialogMessage = "Your character: %s, has been permanently killed. An administrator has approved this PK.\nPKs are a regular part of RP; you can always make a new character. Have fun!",
+    permaKillTitle = "Permanent Kill",
+    iAcknowledge = "I acknowledge",
+    liliaSkinDesc = "The skin for the Lilia framework.",
+    liliaAltSkinDesc = "The alt skin for the Lilia framework.",
+    needModel = "You need to choose a valid model.",
+}

gamemode/modules/administration/commands.lua

@@ -221,7 +221,7 @@ lia.command.add("charkill", {
             local reason = data[reasonKey]
             local evidence = data[evidenceKey]
             if not (isstring(evidence) and evidence:match("^https?://")) then
-                client:notify("Evidence must be a valid URL.")
+                client:notifyLocalized("evidenceInvalidURL")
                 return
             end
 

gamemode/modules/administration/libraries/client.lua

@@ -416,8 +416,13 @@ function MODULE:PopulateAdminTabs(pages)
             name = L("flagsManagement"),
             drawFunc = function(panel)
                 flagsPanel = panel
-                net.Start("liaRequestAllFlags")
-                net.SendToServer()
+                if flagsData then
+                    OpenFlagsPanel(panel, flagsData)
+                    flagsData = nil
+                else
+                    net.Start("liaRequestAllFlags")
+                    net.SendToServer()
+                end
             end
         })
     end

gamemode/modules/administration/netcalls/client.lua

@@ -475,14 +475,13 @@ local function OpenRoster(panel, data)
     end
 end
 
-lia.net.readBigTable("liaAllFlags", function(data)
-    if not IsValid(flagsPanel) then return end
-    flagsPanel:Clear()
-    local search = flagsPanel:Add("DTextEntry")
+function OpenFlagsPanel(panel, data)
+    panel:Clear()
+    local search = panel:Add("DTextEntry")
     search:Dock(TOP)
     search:SetPlaceholderText(L("search"))
     search:SetTextColor(Color(255, 255, 255))
-    local list = flagsPanel:Add("DListView")
+    local list = panel:Add("DListView")
     list:Dock(FILL)
     local function addSizedColumn(text)
         local col = list:AddColumn(text)
@@ -555,6 +554,14 @@ lia.net.readBigTable("liaAllFlags", function(data)
 
         menu:Open()
     end
+end
+
+lia.net.readBigTable("liaAllFlags", function(data)
+    flagsData = data or {}
+    if IsValid(flagsPanel) then
+        OpenFlagsPanel(flagsPanel, flagsData)
+        flagsData = nil
+    end
 end)
 
 lia.net.readBigTable("liaFactionRosterData", function(data) if IsValid(rosterPanel) then OpenRoster(rosterPanel, data or {}) end end)

gamemode/modules/administration/submodules/permissions/libraries/client.lua

@@ -22,16 +22,17 @@ function MODULE:HUDPaint()
                 baseColor = Color(255, 0, 0)
             else
                 label = subLabel
-                baseColor = lia.config.get("espPlayersColor") or Color(255, 255, 255)
+                baseColor = lia.option.get("espPlayersColor")
             end
         elseif ent.isItem and ent:isItem() and lia.option.get("espItems", false) then
             kind = L("items")
-            label = ent.getItemTable and ent:getItemTable().name or L("unknown")
-            baseColor = lia.config.get("espItemsColor") or Color(255, 255, 255)
+            local item = ent.getItemTable and ent:getItemTable()
+            label = item and item.getName and item:getName() or L("unknown")
+            baseColor = lia.option.get("espItemsColor")
         elseif lia.option.get("espEntities", false) and ent:GetClass():StartWith("lia_") then
             kind = L("entities")
             label = ent.PrintName or ent:GetClass()
-            baseColor = lia.config.get("espEntitiesColor") or Color(255, 255, 255)
+            baseColor = lia.option.get("espEntitiesColor")
         end
 
         if not kind then continue end
@@ -173,6 +174,7 @@ net.Receive("DisplayCharList", function()
                     local opt1 = dMenu:AddOption(L("banCharacter"), function() LocalPlayer():ConCommand('say "/charban ' .. ln.CharID .. '"') end)
                     opt1:SetIcon("icon16/cancel.png")
                 end
+
                 if lia.command.hasAccess(LocalPlayer(), "charunban") then
                     local opt2 = dMenu:AddOption(L("unbanCharacter"), function() LocalPlayer():ConCommand('say "/charunban ' .. ln.CharID .. '"') end)
                     opt2:SetIcon("icon16/accept.png")