huskee/Pixelorama
1
0
Fork 0
mirror of https://github.com/Orama-Interactive/Pixelorama.git synced 2025-01-31 07:29:49 +00:00
Code Issues Wiki Activity

Fixed bug where if Pixelorama started with Greek and went to English, the menu items would remain in Greek

Browse source
This commit is contained in:
OverloadedOrama 2019-12-10 14:28:19 +02:00
parent 92e841f20d
commit e157b33e1d
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
Scripts/Main.gd
View file

@ -31,17 +31,6 @@ func _ready() -> void:
# Load settings from the config file # Load settings from the config file
config_cache.load("user://cache.ini") config_cache.load("user://cache.ini")
# Load language
if config_cache.has_section_key("preferences", "locale"):
var saved_locale : String = config_cache.get_value("preferences", "locale")
TranslationServer.set_locale(saved_locale)
# Set the language option menu's default selected option to the loaded locale
var locale_index := loaded_locales.find(saved_locale)
$PreferencesDialog/VBoxContainer/OptionsContainer/LanguageOption.selected = locale_index + 1
else: # If the user doesn't have a language preference, set it to their OS' locale
TranslationServer.set_locale(OS.get_locale())
# Restore the window position/size if values are present in the configuration cache # Restore the window position/size if values are present in the configuration cache
if config_cache.has_section_key("window", "screen"): if config_cache.has_section_key("window", "screen"):
OS.current_screen = config_cache.get_value("window", "screen") OS.current_screen = config_cache.get_value("window", "screen")
@ -83,6 +72,18 @@ func _ready() -> void:
var help_menu_items := { var help_menu_items := {
tr("About Pixelorama") : 0 tr("About Pixelorama") : 0
} }
# Load language
if config_cache.has_section_key("preferences", "locale"):
var saved_locale : String = config_cache.get_value("preferences", "locale")
TranslationServer.set_locale(saved_locale)
# Set the language option menu's default selected option to the loaded locale
var locale_index := loaded_locales.find(saved_locale)
$PreferencesDialog/VBoxContainer/OptionsContainer/LanguageOption.selected = locale_index + 1
else: # If the user doesn't have a language preference, set it to their OS' locale
TranslationServer.set_locale(OS.get_locale())
var file_menu : PopupMenu = Global.file_menu.get_popup() var file_menu : PopupMenu = Global.file_menu.get_popup()
var edit_menu : PopupMenu = Global.edit_menu.get_popup() var edit_menu : PopupMenu = Global.edit_menu.get_popup()
view_menu = Global.view_menu.get_popup() view_menu = Global.view_menu.get_popup()