mirror of https://gitlab.com/bashrc2/epicyon
Snake case
parent
b52cc2d5be
commit
fa67322c4e
|
@ -266,7 +266,7 @@ from utils import is_account_dir
|
|||
from utils import get_occupation_skills
|
||||
from utils import get_occupation_name
|
||||
from utils import set_occupation_name
|
||||
from utils import loadTranslationsFromFile
|
||||
from utils import load_translations_from_file
|
||||
from utils import getLocalNetworkAddresses
|
||||
from utils import decoded_host
|
||||
from utils import isPublicPost
|
||||
|
@ -18641,7 +18641,7 @@ def runDaemon(content_license_url: str,
|
|||
httpd.system_language = 'en'
|
||||
if not unit_test:
|
||||
httpd.translate, httpd.system_language = \
|
||||
loadTranslationsFromFile(base_dir, language)
|
||||
load_translations_from_file(base_dir, language)
|
||||
if not httpd.system_language:
|
||||
print('ERROR: no system language loaded')
|
||||
sys.exit()
|
||||
|
|
|
@ -20,7 +20,7 @@ from utils import get_base_content_from_post
|
|||
from utils import has_object_dict
|
||||
from utils import get_full_domain
|
||||
from utils import isDM
|
||||
from utils import loadTranslationsFromFile
|
||||
from utils import load_translations_from_file
|
||||
from utils import removeHtml
|
||||
from utils import getNicknameFromActor
|
||||
from utils import getDomainFromActor
|
||||
|
@ -1398,7 +1398,7 @@ def runDesktopClient(base_dir: str, proxy_type: str, http_prefix: str,
|
|||
_sayCommand(sayStr, sayStr, screenreader,
|
||||
system_language, espeak)
|
||||
translate, system_language = \
|
||||
loadTranslationsFromFile(base_dir, language)
|
||||
load_translations_from_file(base_dir, language)
|
||||
|
||||
sayStr = indent + 'Connecting...'
|
||||
_sayCommand(sayStr, sayStr, screenreader,
|
||||
|
|
10
utils.py
10
utils.py
|
@ -2674,7 +2674,7 @@ def invalidCiphertext(content: str) -> bool:
|
|||
return False
|
||||
|
||||
|
||||
def loadTranslationsFromFile(base_dir: str, language: str) -> ({}, str):
|
||||
def load_translations_from_file(base_dir: str, language: str) -> ({}, str):
|
||||
"""Returns the translations dictionary
|
||||
"""
|
||||
if not os.path.isdir(base_dir + '/translations'):
|
||||
|
@ -2692,13 +2692,13 @@ def loadTranslationsFromFile(base_dir: str, language: str) -> ({}, str):
|
|||
system_language = system_language.split('/')[1]
|
||||
if '.' in system_language:
|
||||
system_language = system_language.split('.')[0]
|
||||
translationsFile = base_dir + '/translations/' + \
|
||||
translations_file = base_dir + '/translations/' + \
|
||||
system_language + '.json'
|
||||
if not os.path.isfile(translationsFile):
|
||||
if not os.path.isfile(translations_file):
|
||||
system_language = 'en'
|
||||
translationsFile = base_dir + '/translations/' + \
|
||||
translations_file = base_dir + '/translations/' + \
|
||||
system_language + '.json'
|
||||
return load_json(translationsFile), system_language
|
||||
return load_json(translations_file), system_language
|
||||
|
||||
|
||||
def dm_allowed_from_domain(base_dir: str,
|
||||
|
|
Loading…
Reference in New Issue