Skip to content

Update librarian.lua for DFHack 52.03-r1.1 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Nekkowe wants to merge 1 commit into
base: own_scripts
Choose a base branch
from
Open

Update librarian.lua for DFHack 52.03-r1.1 #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions librarian.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -916,7 +916,7 @@ function Librarian ()
if unit and
unit.civ_id == civ_id and
not unit.flags2.visitor then
local author = dfhack.TranslateName (hf.name, true) .. "/" .. dfhack.TranslateName (hf.name, false)
local author = dfhack.translation.translateName (hf.name, true) .. "/" .. dfhack.translation.translateName (hf.name, false)
local found = false

for k, res in ipairs (Result) do
Expand Down Expand Up @@ -1084,7 +1084,7 @@ function Librarian ()
local hf = df.historical_figure.find (Id)

if hf then
return dfhack.TranslateName (hf.name, true) .. "/" .. dfhack.TranslateName (hf.name, false)
return dfhack.translation.translateName (hf.name, true) .. "/" .. dfhack.translation.translateName (hf.name, false)

else
return "<Unknown histfig>"
Expand All @@ -1097,8 +1097,8 @@ function Librarian ()
local entity = df.historical_entity.find (Id)

if entity then
return dfhack.TranslateName (entity.name, true)-- .. "/" ..
--dfhack.TranslateName (entity.name, false)
return dfhack.translation.translateName (entity.name, true)-- .. "/" ..
--dfhack.translation.translateName (entity.name, false)

else
return "<Unknown entity>"
Expand All @@ -1111,8 +1111,8 @@ function Librarian ()
local site = df.world_site.find (Id)

if site then
return dfhack.TranslateName (site.name, true) .. "/" ..
dfhack.TranslateName (site.name, false)
return dfhack.translation.translateName (site.name, true) .. "/" ..
dfhack.translation.translateName (site.name, false)

else
return "<Unknown site>"
Expand All @@ -1126,8 +1126,8 @@ function Librarian ()

if site then
return df.world_site_type [site.type] .. " " ..
dfhack.TranslateName (site.name, true) .. "/" ..
dfhack.TranslateName (site.name, false)
dfhack.translation.translateName (site.name, true) .. "/" ..
dfhack.translation.translateName (site.name, false)

else
return "<Unknown site>"
Expand All @@ -1140,8 +1140,8 @@ function Librarian ()
local region = df.world_region.find (Id)

if region then
return dfhack.TranslateName (region.name, true) .. "/" ..
dfhack.TranslateName (region.name, false)
return dfhack.translation.translateName (region.name, true) .. "/" ..
dfhack.translation.translateName (region.name, false)

else
return "<Unknown region>"
Expand All @@ -1154,8 +1154,8 @@ function Librarian ()
local region = df.world_underground_region.find (Id)

if region then
return dfhack.TranslateName (region.name, true) .. "/" ..
dfhack.TranslateName (region.name, false)
return dfhack.translation.translateName (region.name, true) .. "/" ..
dfhack.translation.translateName (region.name, false)

else
return "<Unknown underground region>"
Expand Down Expand Up @@ -1286,7 +1286,7 @@ function Librarian ()
end

if entity.name then
name = dfhack.TranslateName (entity.name, true) .. "/" .. dfhack.TranslateName (entity.name, false)
name = dfhack.translation.translateName (entity.name, true) .. "/" .. dfhack.translation.translateName (entity.name, false)

else
name "<unknown name>"
Expand Down Expand Up @@ -1525,23 +1525,23 @@ function Librarian ()

if schedule.type == df.occasion_schedule_type.DANCE_COMPETITION then
if schedule.reference ~= -1 then
competition_text = "Dance Competition using the " .. dfhack.TranslateName (df.global.world.dance_forms.all [schedule.reference].name, true) .. " dance form"
competition_text = "Dance Competition using the " .. dfhack.translation.translateName (df.global.world.dance_forms.all [schedule.reference].name, true) .. " dance form"

else
competition_text = "Dance Competition"
end

elseif schedule.type == df.occasion_schedule_type.MUSICAL_COMPETITION then
if schedule.reference ~= -1 then
competition_text = "Musical Competition using the " .. dfhack.TranslateName (df.global.world.musical_forms.all [schedule.reference].name, true) .. " musical form"
competition_text = "Musical Competition using the " .. dfhack.translation.translateName (df.global.world.musical_forms.all [schedule.reference].name, true) .. " musical form"

else
competition_text = "Musical Competition"
end

elseif schedule.type == df.occasion_schedule_type.POETRY_COMPETITION then
if schedule.reference ~= -1 then
competition_text = "Poetry Competition using the " .. dfhack.TranslateName (df.global.world.poetical_forms.all [schedule.reference].name, true) .. " poetical form"
competition_text = "Poetry Competition using the " .. dfhack.translation.translateName (df.global.world.poetical_forms.all [schedule.reference].name, true) .. " poetical form"

else
competition_text = "Poetry Competition"
Expand Down Expand Up @@ -1629,13 +1629,13 @@ function Librarian ()
table.insert (text, wrap ("Reference: Written Contents Titled " .. df.global.world.written_contents.all [ref.written_content_id].title .. "\n"))

elseif ref._type == df.general_ref_poetic_formst then
table.insert (text, wrap ("Reference: Poetic Form " .. dfhack.TranslateName (df.global.world.poetic_forms.all [ref.poetic_form_id].name, true) .. "\n"))
table.insert (text, wrap ("Reference: Poetic Form " .. dfhack.translation.translateName (df.global.world.poetic_forms.all [ref.poetic_form_id].name, true) .. "\n"))

elseif ref._type == df.general_ref_musical_formst then
table.insert (text, wrap ("Reference: Musical Form " .. dfhack.TranslateName (df.global.world.musical_forms.all [ref.musical_form_id].name, true) .. "\n"))
table.insert (text, wrap ("Reference: Musical Form " .. dfhack.translation.translateName (df.global.world.musical_forms.all [ref.musical_form_id].name, true) .. "\n"))

elseif ref._type == df.general_ref_dance_formst then
table.insert (text, wrap ("Reference: Dance Form " .. dfhack.TranslateName (df.global.world.dance_forms.all [ref.dance_form_id].name, true) .. "\n"))
table.insert (text, wrap ("Reference: Dance Form " .. dfhack.translation.translateName (df.global.world.dance_forms.all [ref.dance_form_id].name, true) .. "\n"))

else
table.insert (text, wrap ("Reference: *UNKNOWN* " .. tostring (ref._type) .. " information\n"))
Expand All @@ -1661,7 +1661,7 @@ function Librarian ()
local Local = false

if hf then
-- author = dfhack.TranslateName (hf.name, true) .. "/" .. dfhack.TranslateName (hf.name, false)
-- author = dfhack.translation.translateName (hf.name, true) .. "/" .. dfhack.translation.translateName (hf.name, false)
local unit = df.unit.find (hf.unit_id)

if unit and
Expand Down Expand Up @@ -3806,4 +3806,4 @@ function Librarian ()
Show_Viewer ()
end

Librarian ()
Librarian ()