godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Use language command line argument to override editor locale.

Browse Source
This commit is contained in:
Pāvels Nadtočajevs
2025-09-08 10:22:29 +03:00
parent 9edc290328
commit d8cdc53ec0
4 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
editor/settings/editor_settings.cpp
View File

@@ -50,6 +50,7 @@
#include "editor/inspector/editor_property_name_processor.h" #include "editor/inspector/editor_property_name_processor.h"
#include "editor/project_manager/engine_update_label.h" #include "editor/project_manager/engine_update_label.h"
#include "editor/translations/editor_translation.h" #include "editor/translations/editor_translation.h"
#include "main/main.h"
#include "modules/regex/regex.h" #include "modules/regex/regex.h"
#include "scene/gui/color_picker.h" #include "scene/gui/color_picker.h"
#include "scene/main/node.h" #include "scene/main/node.h"
@@ -79,7 +80,7 @@ bool EditorSettings::_set(const StringName &p_name, const Variant &p_value) {
emit_signal(SNAME("settings_changed")); emit_signal(SNAME("settings_changed"));
if (p_name == SNAME("interface/editor/editor_language")) { if (p_name == SNAME("interface/editor/editor_language")) {
setup_language(); setup_language(false);
} }
} }
return true; return true;
@@ -1289,7 +1290,7 @@ void EditorSettings::create() {
print_verbose("EditorSettings: Load OK!"); print_verbose("EditorSettings: Load OK!");
singleton->setup_language(); singleton->setup_language(true);
singleton->setup_network(); singleton->setup_network();
singleton->load_favorites_and_recent_dirs(); singleton->load_favorites_and_recent_dirs();
singleton->update_text_editor_themes_list(); singleton->update_text_editor_themes_list();
@@ -1316,13 +1317,19 @@ fail:
singleton->set_path(config_file_path, true); singleton->set_path(config_file_path, true);
singleton->save_changed_setting = true; singleton->save_changed_setting = true;
singleton->_load_defaults(extra_config); singleton->_load_defaults(extra_config);
singleton->setup_language(); singleton->setup_language(true);
singleton->setup_network(); singleton->setup_network();
singleton->update_text_editor_themes_list(); singleton->update_text_editor_themes_list();
} }
void EditorSettings::setup_language() { void EditorSettings::setup_language(bool p_initial_setup) {
String lang = _EDITOR_GET("interface/editor/editor_language"); String lang = _EDITOR_GET("interface/editor/editor_language");
if (p_initial_setup) {
String lang_ov = Main::get_locale_override();
if (!lang_ov.is_empty()) {
lang = lang_ov;
}
}
if (lang == "en") { if (lang == "en") {
TranslationServer::get_singleton()->set_locale(lang); TranslationServer::get_singleton()->set_locale(lang);

2
editor/settings/editor_settings.h
View File

@@ -138,7 +138,7 @@ public:
static String get_newest_settings_path(); static String get_newest_settings_path();
static void create(); static void create();
void setup_language(); void setup_language(bool p_initial_setup);
void setup_network(); void setup_network();
static void save(); static void save();
static void destroy(); static void destroy();

8
main/main.cpp
View File

@@ -1094,7 +1094,9 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
arg == "--display-driver" || arg == "--display-driver" ||
arg == "--rendering-method" || arg == "--rendering-method" ||
arg == "--rendering-driver" || arg == "--rendering-driver" ||
arg == "--xr-mode") { arg == "--xr-mode" ||
arg == "-l" ||
arg == "--language") {
if (N) { if (N) {
forwardable_cli_arguments[CLI_SCOPE_TOOL].push_back(arg); forwardable_cli_arguments[CLI_SCOPE_TOOL].push_back(arg);
forwardable_cli_arguments[CLI_SCOPE_TOOL].push_back(N->get()); forwardable_cli_arguments[CLI_SCOPE_TOOL].push_back(N->get());
@@ -3842,6 +3844,10 @@ String Main::get_rendering_driver_name() {
return rendering_driver; return rendering_driver;
} }
String Main::get_locale_override() {
return locale;
}
// everything the main loop needs to know about frame timings // everything the main loop needs to know about frame timings
static MainTimerSync main_timer_sync; static MainTimerSync main_timer_sync;

1
main/main.h
View File

@@ -71,6 +71,7 @@ public:
static Error setup(const char *execpath, int argc, char *argv[], bool p_second_phase = true); static Error setup(const char *execpath, int argc, char *argv[], bool p_second_phase = true);
static Error setup2(bool p_show_boot_logo = true); // The thread calling setup2() will effectively become the main thread. static Error setup2(bool p_show_boot_logo = true); // The thread calling setup2() will effectively become the main thread.
static String get_rendering_driver_name(); static String get_rendering_driver_name();
static String get_locale_override();
static void setup_boot_logo(); static void setup_boot_logo();
#ifdef TESTS_ENABLED #ifdef TESTS_ENABLED
static Error test_setup(); static Error test_setup();