h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2025-12-23 16:04:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix path

Browse Source
This commit is contained in:
joBr99
2022-06-05 09:23:01 +02:00
parent ba15f72f78
commit 7ff02f5dc7
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
apps/nspanel-lovelace-ui/luibackend/localization.py
View File

@@ -14,13 +14,14 @@ def build_locale_filestring(locale):
locale = locale.split("_")[0] locale = locale.split("_")[0]
filename = f"{locale}.json" filename = f"{locale}.json"
path_frontend_file = os.path.join(os.getcwd(), "translations", "frontend", filename) dir_path = os.path.dirname(os.path.realpath(__file__))
path_backend_file = os.path.join(os.getcwd(), "translations", "backend" , filename) path_frontend_file = os.path.join(dir_path, "translations", "frontend", filename)
path_backend_file = os.path.join(dir_path, "translations", "backend" , filename)
return path_frontend_file, path_backend_file return path_frontend_file, path_backend_file
def lookup(path_frontend_file, path_backend_file, lookupstr): def lookup(path_frontend_file, path_backend_file, lookupstr):
if not (os.path.exists(path_frontend_file) and os.path.exists(path_backend_file)): if not (os.path.exists(path_frontend_file) and os.path.exists(path_backend_file)):
return "error" return "error_fnf"
with open(path_frontend_file, 'r') as f, open(path_backend_file, 'r') as b: with open(path_frontend_file, 'r') as f, open(path_backend_file, 'r') as b:
translations = { "frontend": json.load(f), "backend": json.load(b)} translations = { "frontend": json.load(f), "backend": json.load(b)}
res = translations res = translations
@@ -28,15 +29,15 @@ def lookup(path_frontend_file, path_backend_file, lookupstr):
if k in res: if k in res:
res = res[k] res = res[k]
if type(res) is not str: if type(res) is not str:
res = "error" res = "error_tnf"
return res return res
def get_translation(locale, lookupstr): def get_translation(locale, lookupstr):
path_frontend_file, path_backend_file = build_locale_filestring(locale) path_frontend_file, path_backend_file = build_locale_filestring(locale)
res = lookup(path_frontend_file, path_backend_file, lookupstr) res = lookup(path_frontend_file, path_backend_file, lookupstr)
if res == "error": if res.startswith("error"):
path_frontend_file, path_backend_file = build_locale_filestring("en_US") path_frontend_file, path_backend_file = build_locale_filestring("en_US")
res = lookup(path_frontend_file, path_backend_file, lookupstr) res = lookup(path_frontend_file, path_backend_file, lookupstr)
return res return res
#print(get_translation("en_US", "frontend.state_attributes.climate.hvac_action.idle")) #print(get_translation("en_US", "frontend.state_attributes.climate.hvac_action.idle"))

2
apps/nspanel-lovelace-ui/luibackend/pages.py
View File

@@ -287,7 +287,7 @@ class LuiPagesGen(object):
current_temp = get_attr_safe(entity, "current_temperature", "") current_temp = get_attr_safe(entity, "current_temperature", "")
dest_temp = int(get_attr_safe(entity, "temperature", 0)*10) dest_temp = int(get_attr_safe(entity, "temperature", 0)*10)
hvac_action = get_attr_safe(entity, "hvac_action", "") hvac_action = get_attr_safe(entity, "hvac_action", "")
state_value = "" state_value = ""
if hvac_action != "": if hvac_action != "":
state_value = get_translation(self._locale, f"frontend.state_attributes.climate.hvac_action.{hvac_action}") state_value = get_translation(self._locale, f"frontend.state_attributes.climate.hvac_action.{hvac_action}")