Submit local changes
This commit is contained in:
@@ -14,7 +14,8 @@ def set_language(LANG):
|
||||
"""
|
||||
Sets language for this applet
|
||||
"""
|
||||
translations = gettext.translation("welcome", './applets/welcome/locales',
|
||||
# TODO: unhardcode this path
|
||||
translations = gettext.translation("welcome", '/usr/share/yasi-daemon/yasi_applets/welcome/locales',
|
||||
fallback=True, languages=[LANG])
|
||||
translations.install()
|
||||
_ = translations.gettext
|
||||
@@ -40,6 +41,7 @@ def welcome_index():
|
||||
global lang
|
||||
lang = current_app.config['CONFIG']['settings']['language']
|
||||
set_language(lang)
|
||||
global string_dict
|
||||
string_dict = build_stringlist()
|
||||
blkid = lsblk.list_scsi_devices()
|
||||
build_menu()
|
||||
@@ -54,8 +56,8 @@ def welcome_index():
|
||||
else:
|
||||
previous_step_url = menu[menu.index("users")-1]
|
||||
|
||||
power_button = '<button id="powerbutton" hx-get="/welcome/battery/button" hx-trigger="load, every 1s" hx-target="#powerbutton" class="button is-dark"> <span style="color: #ffffff;"> <i class="fa fa-question" aria-hidden="true"></i></span> Power </button>'
|
||||
internet_button = ' <button id="internetbutton" class="button is-dark" hx-get="/welcome/internet/button" hx-trigger="load, every 1s" hx-target="#internetbutton"><span style="color: #ffffff;"> <i class="fa fa-question" aria-hidden="true"></i></span> Internet </button>'
|
||||
power_button = '<button id="powerbutton" hx-get="/welcome/battery/button" hx-trigger="load, every 1s" hx-target="#powerbutton" class="button is-dark"> <span style="color: #ffffff;"> <i class="fa fa-question" aria-hidden="true"></i></span> </button>'
|
||||
internet_button = ' <button id="internetbutton" class="button is-dark" hx-get="/welcome/internet/button" hx-trigger="load, every 1s" hx-target="#internetbutton"><span style="color: #ffffff;"> <i class="fa fa-question" aria-hidden="true"></i></span> </button>'
|
||||
bottom_menu = power_button + internet_button
|
||||
|
||||
|
||||
@@ -99,7 +101,7 @@ def welcome_battery_button():
|
||||
if on_battery:
|
||||
power_button = '<button id="powerbutton hx-get="/welcome/battery/button" hx-trigger="load, every 1s" hx-target="#powerbutton" class="button is-dark"> <span style="color: #ffa45c;"> <i class="fa fa-warning" aria-hidden="true"></i></span> Power: Battery: ' + percentage + '%</button>'
|
||||
else:
|
||||
power_button = '<button id="powerbutton hx-get="/welcome/battery/button" hx-trigger="load, every 1s" hx-target="#powerbutton" class="button is-dark"> <span style="color: #a0ff98;"> <i class="fa fa-check" aria-hidden="true"></i></span> Power </button>'
|
||||
power_button = """<button id="powerbutton hx-get="/welcome/battery/button" hx-trigger="load, every 1s" hx-target="#powerbutton" class="button is-dark"> <span style="color: #a0ff98;"> <i class="fa fa-check" aria-hidden="true"></i></span> """ + string_dict["power_text"] + "</button>"""
|
||||
return str(power_button)
|
||||
|
||||
|
||||
@@ -135,12 +137,21 @@ def build_stringlist():
|
||||
"""
|
||||
string_dict = {}
|
||||
string_dict['menu_item'] = _("Welcome")
|
||||
# In the future, these will be loaded from their own modules
|
||||
string_dict['menu_item_users'] = _("Users")
|
||||
string_dict['menu_item_disks'] = _("Disks")
|
||||
string_dict['menu_item_software'] = _("Software")
|
||||
string_dict['menu_item_summary'] = _("Summary")
|
||||
string_dict['welcome_text'] = _("Welcome! This setup program will install Debian on to your system.")
|
||||
string_dict['confirm_text'] = _("Please confirm the following details:")
|
||||
string_dict['language_text'] = _("Language:")
|
||||
string_dict['keylayout_text'] = _("Keyboard Layout:")
|
||||
string_dict['timezone_text'] = _("Time Zone:")
|
||||
string_dict['basicsettings_text'] = _("Basic Settings:")
|
||||
string_dict['power_text'] = _("Power")
|
||||
string_dict['internet_text'] = _("Internet")
|
||||
string_dict['next_text'] = _("Next")
|
||||
string_dict['back_text'] = _("Back")
|
||||
lang_dict = {}
|
||||
lang_dict['af'] = _("Afrikaans")
|
||||
lang_dict['en'] = _("English (International)")
|
||||
@@ -157,6 +168,12 @@ def build_menu():
|
||||
"""
|
||||
current_app.config['CONFIG']['settings']['menu']['welcome'] = (build_stringlist()['menu_item'], "/welcome", 10)
|
||||
|
||||
#TODO: temporary hack: We need an automated way to translate all menu items
|
||||
current_app.config['CONFIG']['settings']['menu']['users'] = (build_stringlist()['menu_item_users'], "/users", 20)
|
||||
current_app.config['CONFIG']['settings']['menu']['disks'] = (build_stringlist()['menu_item_disks'], "/disks", 30)
|
||||
current_app.config['CONFIG']['settings']['menu']['software'] = (build_stringlist()['menu_item_software'], "/software", 40)
|
||||
current_app.config['CONFIG']['settings']['menu']['summary'] = (build_stringlist()['menu_item_summary'], "/summary", 50)
|
||||
|
||||
|
||||
def build_summary():
|
||||
"""
|
||||
|
||||
Reference in New Issue
Block a user