Partydeck/Extension-Druid
3
0
Fork 0
mirror of https://github.com/Insality/druid.git synced 2025-09-27 18:12:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into 116-input-component-arg

Browse Source 
# Conflicts:
#	docs_md/changelog.md
This commit is contained in:
Insality
2021-04-01 20:35:16 +03:00
parent 87a5700587 7c79985be6
commit 4bf3363d8b
6 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
druid/extended/lang_text.lua
View File

@@ -21,7 +21,7 @@ local LangText = component.create("lang_text", { component.ON_LANGUAGE_CHANGE })
--- Component init function
-- @tparam LangText self
-- @tparam node node The text node
-- @tparam string locale_id Default locale id
-- @tparam string locale_id Default locale id, optional
-- @tparam bool no_adjust If true, will not correct text size
function LangText.init(self, node, locale_id, no_adjust)
self.druid = self:get_druid()
@@ -30,7 +30,9 @@ function LangText.init(self, node, locale_id, no_adjust)
self.on_change = Event()
self:translate(locale_id)
if locale_id then
self:translate(locale_id)
end
return self
end
@@ -59,7 +61,7 @@ end
function LangText.translate(self, locale_id, ...)
self.last_locale_args = {...}
self.last_locale = locale_id or self.last_locale
self.text:set_to(settings.get_text(self.last_locale, ...))
self.text:set_to(settings.get_text(self.last_locale, ...) or "")
end