asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #61878 from bruvzg/backport_locale_select

Browse source 
[3.x] Backport locale selection improvements.
This commit is contained in:
Rémi Verschelde 2022-08-05 23:45:17 +02:00 committed by GitHub
commit 0dccbcd7ce
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 2430 additions and 1214 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/global_constants.cpp
View file

@ -608,6 +608,8 @@ void register_global_constants() {
BIND_GLOBAL_ENUM_CONSTANT(PROPERTY_HINT_IMAGE_COMPRESS_LOSSY);
BIND_GLOBAL_ENUM_CONSTANT(PROPERTY_HINT_IMAGE_COMPRESS_LOSSLESS);
BIND_GLOBAL_ENUM_CONSTANT(PROPERTY_HINT_LOCALE_ID);
BIND_GLOBAL_ENUM_CONSTANT(PROPERTY_USAGE_STORAGE);
BIND_GLOBAL_ENUM_CONSTANT(PROPERTY_USAGE_EDITOR);
BIND_GLOBAL_ENUM_CONSTANT(PROPERTY_USAGE_NETWORK);

26
core/io/resource_loader.cpp
View file

@ -734,38 +734,26 @@ String ResourceLoader::_path_remap(const String &p_path, bool *r_translation_rem
// To find the path of the remapped resource, we extract the locale name after
// the last ':' to match the project locale.
// We also fall back in case of regional locales as done in TranslationServer::translate
// (e.g. 'ru_RU' -> 'ru' if the former has no specific mapping).
String locale = TranslationServer::get_singleton()->get_locale();
ERR_FAIL_COND_V_MSG(locale.length() < 2, p_path, "Could not remap path '" + p_path + "' for translation as configured locale '" + locale + "' is invalid.");
String lang = TranslationServer::get_language_code(locale);
Vector<String> &res_remaps = *translation_remaps.getptr(new_path);
bool near_match = false;
int best_score = 0;
for (int i = 0; i < res_remaps.size(); i++) {
int split = res_remaps[i].rfind(":");
if (split == -1) {
continue;
}
String l = res_remaps[i].right(split + 1).strip_edges();
if (l == locale) { // Exact match.
int score = TranslationServer::get_singleton()->compare_locales(locale, l);
if (score > 0 && score >= best_score) {
new_path = res_remaps[i].left(split);
break;
} else if (near_match) {
continue; // Already found near match, keep going for potential exact match.
}
// No exact match (e.g. locale 'ru_RU' but remap is 'ru'), let's look further
// for a near match (same language code, i.e. first 2 or 3 letters before
// regional code, if included).
if (TranslationServer::get_language_code(l) == lang) {
// Language code matches, that's a near match. Keep looking for exact match.
near_match = true;
new_path = res_remaps[i].left(split);
continue;
best_score = score;
if (score == 10) {
break; // Exact match, skip the rest.
}
}
}

1197
core/locales.h Normal file
View file

File diff suppressed because it is too large Load diff

1
core/object.h
View file

@ -96,6 +96,7 @@ enum PropertyHint {
PROPERTY_HINT_NODE_PATH_VALID_TYPES,
PROPERTY_HINT_SAVE_FILE, ///< a file path must be passed, hint_text (optionally) is a filter "*.png,*.wav,*.doc,". This opens a save dialog
PROPERTY_HINT_ENUM_SUGGESTION, ///< hint_text= "val1,val2,val3,etc"
PROPERTY_HINT_LOCALE_ID,
PROPERTY_HINT_MAX,
// When updating PropertyHint, also sync the hardcoded list in VisualScriptEditorVariableEdit
};

1255
core/translation.cpp
View file

File diff suppressed because it is too large Load diff

37
core/translation.h
View file

@ -87,8 +87,6 @@ class TranslationServer : public Object {
Ref<Translation> tool_translation;
Ref<Translation> doc_translation;
Map<String, String> locale_name_map;
bool enabled;
static TranslationServer *singleton;
@ -96,6 +94,23 @@ class TranslationServer : public Object {
static void _bind_methods();
struct LocaleScriptInfo {
String name;
String script;
String default_country;
Set<String> supported_countries;
};
static Vector<LocaleScriptInfo> locale_script_info;
static Map<String, String> language_map;
static Map<String, String> script_map;
static Map<String, String> locale_rename_map;
static Map<String, String> country_name_map;
static Map<String, String> country_rename_map;
static Map<String, String> variant_map;
void init_locale_info();
public:
_FORCE_INLINE_ static TranslationServer *get_singleton() { return singleton; }
@ -105,6 +120,18 @@ public:
void set_locale(const String &p_locale);
String get_locale() const;
int compare_locales(const String &p_locale_a, const String &p_locale_b) const;
String standardize_locale(const String &p_locale) const;
Vector<String> get_all_languages() const;
String get_language_name(const String &p_language) const;
Vector<String> get_all_scripts() const;
String get_script_name(const String &p_script) const;
Vector<String> get_all_countries() const;
String get_country_name(const String &p_country) const;
String get_locale_name(const String &p_locale) const;
Array get_loaded_locales() const;
@ -114,12 +141,6 @@ public:
StringName translate(const StringName &p_message) const;
static Vector<String> get_all_locales();
static Vector<String> get_all_locale_names();
static bool is_locale_valid(const String &p_locale);
static String standardize_locale(const String &p_locale);
static String get_language_code(const String &p_locale);
void set_tool_translation(const Ref<Translation> &p_translation);
StringName tool_translate(const StringName &p_message, const StringName &p_context) const;
void set_doc_translation(const Ref<Translation> &p_translation);

3
doc/classes/@GlobalScope.xml
View file

@ -1485,6 +1485,9 @@
<constant name="PROPERTY_HINT_IMAGE_COMPRESS_LOSSLESS" value="24" enum="PropertyHint">
Hints that an image is compressed using lossless compression.
</constant>
<constant name="PROPERTY_HINT_LOCALE_ID" value="40" enum="PropertyHint">
Hints that a string property is a locale code. Editing it will show a locale dialog for picking language and country.
</constant>
<constant name="PROPERTY_USAGE_STORAGE" value="1" enum="PropertyUsageFlags">
The property is serialized and saved in the scene file (default).
</constant>

54
doc/classes/TranslationServer.xml
View file

@ -24,6 +24,46 @@
Clears the server from all translations.
</description>
</method>
<method name="compare_locales" qualifiers="const">
<return type="int" />
<argument index="0" name="locale_a" type="String" />
<argument index="1" name="locale_b" type="String" />
<description>
Compares two locales and return similarity score between [code]0[/code](no match) and [code]10[/code](full match).
</description>
</method>
<method name="get_all_countries" qualifiers="const">
<return type="PoolStringArray" />
<description>
Returns array of known country codes.
</description>
</method>
<method name="get_all_languages" qualifiers="const">
<return type="PoolStringArray" />
<description>
Returns array of known language codes.
</description>
</method>
<method name="get_all_scripts" qualifiers="const">
<return type="PoolStringArray" />
<description>
Returns array of known script codes.
</description>
</method>
<method name="get_country_name" qualifiers="const">
<return type="String" />
<argument index="0" name="country" type="String" />
<description>
Returns readable country name for the [code]country[/code] code.
</description>
</method>
<method name="get_language_name" qualifiers="const">
<return type="String" />
<argument index="0" name="language" type="String" />
<description>
Returns readable language name for the [code]language[/code] code.
</description>
</method>
<method name="get_loaded_locales" qualifiers="const">
<return type="Array" />
<description>
@ -44,6 +84,13 @@
Returns a locale's language and its variant (e.g. [code]"en_US"[/code] would return [code]"English (United States)"[/code]).
</description>
</method>
<method name="get_script_name" qualifiers="const">
<return type="String" />
<argument index="0" name="script" type="String" />
<description>
Returns readable script name for the [code]script[/code] code.
</description>
</method>
<method name="remove_translation">
<return type="void" />
<argument index="0" name="translation" type="Translation" />
@ -59,6 +106,13 @@
If translations have been loaded beforehand for the new locale, they will be applied.
</description>
</method>
<method name="standardize_locale" qualifiers="const">
<return type="String" />
<argument index="0" name="locale" type="String" />
<description>
Retunrs [code]locale[/code] string standardized to match known locales (e.g. [code]en-US[/code] would be matched to [code]en_US[/code]).
</description>
</method>
<method name="translate" qualifiers="const">
<return type="String" />
<argument index="0" name="message" type="String" />

572
editor/editor_locale_dialog.cpp Normal file
View file

@ -0,0 +1,572 @@
/*************************************************************************/
/* editor_locale_dialog.cpp */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* https://godotengine.org */
/*************************************************************************/
/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */
/* "Software"), to deal in the Software without restriction, including */
/* without limitation the rights to use, copy, modify, merge, publish, */
/* distribute, sublicense, and/or sell copies of the Software, and to */
/* permit persons to whom the Software is furnished to do so, subject to */
/* the following conditions: */
/* */
/* The above copyright notice and this permission notice shall be */
/* included in all copies or substantial portions of the Software. */
/* */
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "editor_locale_dialog.h"
#include "core/project_settings.h"
#include "editor/editor_node.h"
#include "editor/editor_scale.h"
#include "scene/gui/check_button.h"
#include "scene/gui/line_edit.h"
#include "scene/gui/option_button.h"
#include "scene/gui/tree.h"
static _FORCE_INLINE_ bool is_ascii_upper_case(char32_t c) {
return (c >= 'A' && c <= 'Z');
}
static _FORCE_INLINE_ bool is_ascii_lower_case(char32_t c) {
return (c >= 'a' && c <= 'z');
}
void EditorLocaleDialog::_bind_methods() {
ClassDB::bind_method(D_METHOD("_filter_mode_changed"), &EditorLocaleDialog::_filter_mode_changed);
ClassDB::bind_method(D_METHOD("_edit_filters"), &EditorLocaleDialog::_edit_filters);
ClassDB::bind_method(D_METHOD("_toggle_advanced"), &EditorLocaleDialog::_toggle_advanced);
ClassDB::bind_method(D_METHOD("_item_selected"), &EditorLocaleDialog::_item_selected);
ClassDB::bind_method(D_METHOD("_filter_lang_option_changed"), &EditorLocaleDialog::_filter_lang_option_changed);
ClassDB::bind_method(D_METHOD("_filter_script_option_changed"), &EditorLocaleDialog::_filter_script_option_changed);
ClassDB::bind_method(D_METHOD("_filter_cnt_option_changed"), &EditorLocaleDialog::_filter_cnt_option_changed);
ADD_SIGNAL(MethodInfo("locale_selected", PropertyInfo(Variant::STRING, "locale")));
}
void EditorLocaleDialog::ok_pressed() {
if (edit_filters->is_pressed()) {
return; // Do not update, if in filter edit mode.
}
String locale;
if (lang_code->get_text().empty()) {
return; // Language code is required.
}
locale = lang_code->get_text();
if (!script_code->get_text().empty()) {
locale += "_" + script_code->get_text();
}
if (!country_code->get_text().empty()) {
locale += "_" + country_code->get_text();
}
if (!variant_code->get_text().empty()) {
locale += "_" + variant_code->get_text();
}
emit_signal("locale_selected", TranslationServer::get_singleton()->standardize_locale(locale));
hide();
}
void EditorLocaleDialog::_item_selected() {
if (updating_lists) {
return;
}
if (edit_filters->is_pressed()) {
return; // Do not update, if in filter edit mode.
}
TreeItem *l = lang_list->get_selected();
if (l) {
lang_code->set_text(l->get_metadata(0).operator String());
}
TreeItem *s = script_list->get_selected();
if (s) {
script_code->set_text(s->get_metadata(0).operator String());
}
TreeItem *c = cnt_list->get_selected();
if (c) {
country_code->set_text(c->get_metadata(0).operator String());
}
}
void EditorLocaleDialog::_toggle_advanced(bool p_checked) {
if (!p_checked) {
script_code->set_text("");
variant_code->set_text("");
}
_update_tree();
}
void EditorLocaleDialog::_post_popup() {
ConfirmationDialog::_post_popup();
if (!locale_set) {
lang_code->set_text("");
script_code->set_text("");
country_code->set_text("");
variant_code->set_text("");
}
edit_filters->set_pressed(false);
_update_tree();
}
void EditorLocaleDialog::_filter_lang_option_changed() {
TreeItem *t = lang_list->get_edited();
String lang = t->get_metadata(0);
bool checked = t->is_checked(0);
Variant prev;
Array f_lang_all;
if (ProjectSettings::get_singleton()->has_setting("internationalization/locale/language_filter")) {
f_lang_all = ProjectSettings::get_singleton()->get("internationalization/locale/language_filter");
prev = f_lang_all;
}
int l_idx = f_lang_all.find(lang);
if (checked) {
if (l_idx == -1) {
f_lang_all.append(lang);
}
} else {
if (l_idx != -1) {
f_lang_all.remove(l_idx);
}
}
f_lang_all.sort();
undo_redo->create_action(TTR("Changed Locale Language Filter"));
undo_redo->add_do_property(ProjectSettings::get_singleton(), "internationalization/locale/language_filter", f_lang_all);
undo_redo->add_undo_property(ProjectSettings::get_singleton(), "internationalization/locale/language_filter", prev);
undo_redo->commit_action();
}
void EditorLocaleDialog::_filter_script_option_changed() {
TreeItem *t = script_list->get_edited();
String script = t->get_metadata(0);
bool checked = t->is_checked(0);
Variant prev;
Array f_script_all;
if (ProjectSettings::get_singleton()->has_setting("internationalization/locale/script_filter")) {
f_script_all = ProjectSettings::get_singleton()->get("internationalization/locale/script_filter");
prev = f_script_all;
}
int l_idx = f_script_all.find(script);
if (checked) {
if (l_idx == -1) {
f_script_all.append(script);
}
} else {
if (l_idx != -1) {
f_script_all.remove(l_idx);
}
}
f_script_all.sort();
undo_redo->create_action(TTR("Changed Locale Script Filter"));
undo_redo->add_do_property(ProjectSettings::get_singleton(), "internationalization/locale/script_filter", f_script_all);
undo_redo->add_undo_property(ProjectSettings::get_singleton(), "internationalization/locale/script_filter", prev);
undo_redo->commit_action();
}
void EditorLocaleDialog::_filter_cnt_option_changed() {
TreeItem *t = cnt_list->get_edited();
String cnt = t->get_metadata(0);
bool checked = t->is_checked(0);
Variant prev;
Array f_cnt_all;
if (ProjectSettings::get_singleton()->has_setting("internationalization/locale/country_filter")) {
f_cnt_all = ProjectSettings::get_singleton()->get("internationalization/locale/country_filter");
prev = f_cnt_all;
}
int l_idx = f_cnt_all.find(cnt);
if (checked) {
if (l_idx == -1) {
f_cnt_all.append(cnt);
}
} else {
if (l_idx != -1) {
f_cnt_all.remove(l_idx);
}
}
f_cnt_all.sort();
undo_redo->create_action(TTR("Changed Locale Country Filter"));
undo_redo->add_do_property(ProjectSettings::get_singleton(), "internationalization/locale/country_filter", f_cnt_all);
undo_redo->add_undo_property(ProjectSettings::get_singleton(), "internationalization/locale/country_filter", prev);
undo_redo->commit_action();
}
void EditorLocaleDialog::_filter_mode_changed(int p_mode) {
int f_mode = filter_mode->get_selected_id();
Variant prev;
if (ProjectSettings::get_singleton()->has_setting("internationalization/locale/locale_filter_mode")) {
prev = ProjectSettings::get_singleton()->get("internationalization/locale/locale_filter_mode");
}
undo_redo->create_action(TTR("Changed Locale Filter Mode"));
undo_redo->add_do_property(ProjectSettings::get_singleton(), "internationalization/locale/locale_filter_mode", f_mode);
undo_redo->add_undo_property(ProjectSettings::get_singleton(), "internationalization/locale/locale_filter_mode", prev);
undo_redo->commit_action();
_update_tree();
}
void EditorLocaleDialog::_edit_filters(bool p_checked) {
_update_tree();
}
void EditorLocaleDialog::_update_tree() {
updating_lists = true;
int filter = SHOW_ALL_LOCALES;
if (ProjectSettings::get_singleton()->has_setting("internationalization/locale/locale_filter_mode")) {
filter = ProjectSettings::get_singleton()->get("internationalization/locale/locale_filter_mode");
}
Array f_lang_all;
if (ProjectSettings::get_singleton()->has_setting("internationalization/locale/language_filter")) {
f_lang_all = ProjectSettings::get_singleton()->get("internationalization/locale/language_filter");
}
Array f_cnt_all;
if (ProjectSettings::get_singleton()->has_setting("internationalization/locale/country_filter")) {
f_cnt_all = ProjectSettings::get_singleton()->get("internationalization/locale/country_filter");
}
Array f_script_all;
if (ProjectSettings::get_singleton()->has_setting("internationalization/locale/script_filter")) {
f_script_all = ProjectSettings::get_singleton()->get("internationalization/locale/script_filter");
}
bool is_edit_mode = edit_filters->is_pressed();
filter_mode->select(filter);
// Hide text advanced edit and disable OK button if in filter edit mode.
advanced->set_visible(!is_edit_mode);
hb_locale->set_visible(!is_edit_mode && advanced->is_pressed());
vb_script_list->set_visible(advanced->is_pressed());
get_ok()->set_disabled(is_edit_mode);
// Update language list.
lang_list->clear();
TreeItem *l_root = lang_list->create_item(nullptr);
lang_list->set_hide_root(true);
Vector<String> languages = TranslationServer::get_singleton()->get_all_languages();
for (int i = 0; i < languages.size(); i++) {
if (is_edit_mode || (filter == SHOW_ALL_LOCALES) || f_lang_all.has(languages[i]) || f_lang_all.empty()) {
const String &lang = TranslationServer::get_singleton()->get_language_name(languages[i]);
TreeItem *t = lang_list->create_item(l_root);
if (is_edit_mode) {
t->set_cell_mode(0, TreeItem::CELL_MODE_CHECK);
t->set_editable(0, true);
t->set_checked(0, f_lang_all.has(languages[i]));
} else if (lang_code->get_text() == languages[i]) {
t->select(0);
}
t->set_text(0, vformat("%s [%s]", lang, languages[i]));
t->set_metadata(0, languages[i]);
}
}
// Update script list.
script_list->clear();
TreeItem *s_root = script_list->create_item(nullptr);
script_list->set_hide_root(true);
if (!is_edit_mode) {
TreeItem *t = script_list->create_item(s_root);
t->set_text(0, "[Default]");
t->set_metadata(0, "");
}
Vector<String> scripts = TranslationServer::get_singleton()->get_all_scripts();
for (int i = 0; i < scripts.size(); i++) {
if (is_edit_mode || (filter == SHOW_ALL_LOCALES) || f_script_all.has(scripts[i]) || f_script_all.empty()) {
const String &script = TranslationServer::get_singleton()->get_script_name(scripts[i]);
TreeItem *t = script_list->create_item(s_root);
if (is_edit_mode) {
t->set_cell_mode(0, TreeItem::CELL_MODE_CHECK);
t->set_editable(0, true);
t->set_checked(0, f_script_all.has(scripts[i]));
} else if (script_code->get_text() == scripts[i]) {
t->select(0);
}
t->set_text(0, vformat("%s [%s]", script, scripts[i]));
t->set_metadata(0, scripts[i]);
}
}
// Update country list.
cnt_list->clear();
TreeItem *c_root = cnt_list->create_item(nullptr);
cnt_list->set_hide_root(true);
if (!is_edit_mode) {
TreeItem *t = cnt_list->create_item(c_root);
t->set_text(0, "[Default]");
t->set_metadata(0, "");
}
Vector<String> countries = TranslationServer::get_singleton()->get_all_countries();
for (int i = 0; i < countries.size(); i++) {
if (is_edit_mode || (filter == SHOW_ALL_LOCALES) || f_cnt_all.has(countries[i]) || f_cnt_all.empty()) {
const String &cnt = TranslationServer::get_singleton()->get_country_name(countries[i]);
TreeItem *t = cnt_list->create_item(c_root);
if (is_edit_mode) {
t->set_cell_mode(0, TreeItem::CELL_MODE_CHECK);
t->set_editable(0, true);
t->set_checked(0, f_cnt_all.has(countries[i]));
} else if (country_code->get_text() == countries[i]) {
t->select(0);
}
t->set_text(0, vformat("%s [%s]", cnt, countries[i]));
t->set_metadata(0, countries[i]);
}
}
updating_lists = false;
}
void EditorLocaleDialog::set_locale(const String &p_locale) {
const String &locale = TranslationServer::get_singleton()->standardize_locale(p_locale);
if (locale.empty()) {
locale_set = false;
lang_code->set_text("");
script_code->set_text("");
country_code->set_text("");
variant_code->set_text("");
} else {
locale_set = true;
Vector<String> locale_elements = p_locale.split("_");
lang_code->set_text(locale_elements[0]);
if (locale_elements.size() >= 2) {
if (locale_elements[1].length() == 4 && is_ascii_upper_case(locale_elements[1][0]) && is_ascii_lower_case(locale_elements[1][1]) && is_ascii_lower_case(locale_elements[1][2]) && is_ascii_lower_case(locale_elements[1][3])) {
script_code->set_text(locale_elements[1]);
advanced->set_pressed(true);
}
if (locale_elements[1].length() == 2 && is_ascii_upper_case(locale_elements[1][0]) && is_ascii_upper_case(locale_elements[1][1])) {
country_code->set_text(locale_elements[1]);
}
}
if (locale_elements.size() >= 3) {
if (locale_elements[2].length() == 2 && is_ascii_upper_case(locale_elements[2][0]) && is_ascii_upper_case(locale_elements[2][1])) {
country_code->set_text(locale_elements[2]);
} else {
variant_code->set_text(locale_elements[2].to_lower());
advanced->set_pressed(true);
}
}
if (locale_elements.size() >= 4) {
variant_code->set_text(locale_elements[3].to_lower());
advanced->set_pressed(true);
}
}
}
void EditorLocaleDialog::popup_locale_dialog() {
popup_centered_clamped(Size2(1050, 700) * EDSCALE, 0.8);
}
EditorLocaleDialog::EditorLocaleDialog() {
undo_redo = EditorNode::get_undo_redo();
set_title(TTR("Select a Locale"));
VBoxContainer *vb = memnew(VBoxContainer);
{
HBoxContainer *hb_filter = memnew(HBoxContainer);
{
filter_mode = memnew(OptionButton);
filter_mode->add_item(TTR("Show All Locales"), SHOW_ALL_LOCALES);
filter_mode->set_h_size_flags(Control::SIZE_EXPAND_FILL);
filter_mode->add_item(TTR("Show Selected Locales Only"), SHOW_ONLY_SELECTED_LOCALES);
filter_mode->select(0);
filter_mode->connect("item_selected", this, "_filter_mode_changed");
hb_filter->add_child(filter_mode);
}
{
edit_filters = memnew(CheckButton);
edit_filters->set_text("Edit Filters");
edit_filters->set_toggle_mode(true);
edit_filters->set_pressed(false);
edit_filters->connect("toggled", this, "_edit_filters");
hb_filter->add_child(edit_filters);
}
{
advanced = memnew(CheckButton);
advanced->set_text("Advanced");
advanced->set_toggle_mode(true);
advanced->set_pressed(false);
advanced->connect("toggled", this, "_toggle_advanced");
hb_filter->add_child(advanced);
}
vb->add_child(hb_filter);
}
{
HBoxContainer *hb_lists = memnew(HBoxContainer);
hb_lists->set_v_size_flags(Control::SIZE_EXPAND_FILL);
{
VBoxContainer *vb_lang_list = memnew(VBoxContainer);
vb_lang_list->set_h_size_flags(Control::SIZE_EXPAND_FILL);
{
Label *lang_lbl = memnew(Label);
lang_lbl->set_text(TTR("Language:"));
vb_lang_list->add_child(lang_lbl);
}
{
lang_list = memnew(Tree);
lang_list->set_v_size_flags(Control::SIZE_EXPAND_FILL);
lang_list->connect("cell_selected", this, "_item_selected");
lang_list->set_columns(1);
lang_list->connect("item_edited", this, "_filter_lang_option_changed");
vb_lang_list->add_child(lang_list);
}
hb_lists->add_child(vb_lang_list);
}
{
vb_script_list = memnew(VBoxContainer);
vb_script_list->set_h_size_flags(Control::SIZE_EXPAND_FILL);
{
Label *script_lbl = memnew(Label);
script_lbl->set_text(TTR("Script:"));
vb_script_list->add_child(script_lbl);
}
{
script_list = memnew(Tree);
script_list->set_v_size_flags(Control::SIZE_EXPAND_FILL);
script_list->connect("cell_selected", this, "_item_selected");
script_list->set_columns(1);
script_list->connect("item_edited", this, "_filter_script_option_changed");
vb_script_list->add_child(script_list);
}
hb_lists->add_child(vb_script_list);
}
{
VBoxContainer *vb_cnt_list = memnew(VBoxContainer);
vb_cnt_list->set_h_size_flags(Control::SIZE_EXPAND_FILL);
{
Label *cnt_lbl = memnew(Label);
cnt_lbl->set_text(TTR("Country:"));
vb_cnt_list->add_child(cnt_lbl);
}
{
cnt_list = memnew(Tree);
cnt_list->set_v_size_flags(Control::SIZE_EXPAND_FILL);
cnt_list->connect("cell_selected", this, "_item_selected");
cnt_list->set_columns(1);
cnt_list->connect("item_edited", this, "_filter_cnt_option_changed");
vb_cnt_list->add_child(cnt_list);
}
hb_lists->add_child(vb_cnt_list);
}
vb->add_child(hb_lists);
}
{
hb_locale = memnew(HBoxContainer);
hb_locale->set_h_size_flags(Control::SIZE_EXPAND_FILL);
{
{
VBoxContainer *vb_language = memnew(VBoxContainer);
vb_language->set_h_size_flags(Control::SIZE_EXPAND_FILL);
{
Label *language_lbl = memnew(Label);
language_lbl->set_text(TTR("Language"));
vb_language->add_child(language_lbl);
}
{
lang_code = memnew(LineEdit);
lang_code->set_max_length(3);
lang_code->set_tooltip("Language");
vb_language->add_child(lang_code);
}
hb_locale->add_child(vb_language);
}
{
VBoxContainer *vb_script = memnew(VBoxContainer);
vb_script->set_h_size_flags(Control::SIZE_EXPAND_FILL);
{
Label *script_lbl = memnew(Label);
script_lbl->set_text(TTR("Script"));
vb_script->add_child(script_lbl);
}
{
script_code = memnew(LineEdit);
script_code->set_max_length(4);
script_code->set_tooltip("Script");
vb_script->add_child(script_code);
}
hb_locale->add_child(vb_script);
}
{
VBoxContainer *vb_country = memnew(VBoxContainer);
vb_country->set_h_size_flags(Control::SIZE_EXPAND_FILL);
{
Label *country_lbl = memnew(Label);
country_lbl->set_text(TTR("Country"));
vb_country->add_child(country_lbl);
}
{
country_code = memnew(LineEdit);
country_code->set_max_length(2);
country_code->set_tooltip("Country");
vb_country->add_child(country_code);
}
hb_locale->add_child(vb_country);
}
{
VBoxContainer *vb_variant = memnew(VBoxContainer);
vb_variant->set_h_size_flags(Control::SIZE_EXPAND_FILL);
{
Label *variant_lbl = memnew(Label);
variant_lbl->set_text(TTR("Variant"));
vb_variant->add_child(variant_lbl);
}
{
variant_code = memnew(LineEdit);
variant_code->set_h_size_flags(Control::SIZE_EXPAND_FILL);
variant_code->set_placeholder("Variant");
variant_code->set_tooltip("Variant");
vb_variant->add_child(variant_code);
}
hb_locale->add_child(vb_variant);
}
}
vb->add_child(hb_locale);
}
add_child(vb);
_update_tree();
get_ok()->set_text(TTR("Select"));
}

93
editor/editor_locale_dialog.h Normal file
View file

@ -0,0 +1,93 @@
/*************************************************************************/
/* editor_locale_dialog.h */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* https://godotengine.org */
/*************************************************************************/
/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */
/* "Software"), to deal in the Software without restriction, including */
/* without limitation the rights to use, copy, modify, merge, publish, */
/* distribute, sublicense, and/or sell copies of the Software, and to */
/* permit persons to whom the Software is furnished to do so, subject to */
/* the following conditions: */
/* */
/* The above copyright notice and this permission notice shall be */
/* included in all copies or substantial portions of the Software. */
/* */
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef EDITOR_LOCALE_DIALOG_H
#define EDITOR_LOCALE_DIALOG_H
#include "core/translation.h"
#include "scene/gui/dialogs.h"
class Button;
class HBoxContainer;
class VBoxContainer;
class LineEdit;
class Tree;
class OptionButton;
class UndoRedo;
class EditorLocaleDialog : public ConfirmationDialog {
GDCLASS(EditorLocaleDialog, ConfirmationDialog);
enum LocaleFilter {
SHOW_ALL_LOCALES,
SHOW_ONLY_SELECTED_LOCALES,
};
HBoxContainer *hb_locale = nullptr;
VBoxContainer *vb_script_list = nullptr;
OptionButton *filter_mode = nullptr;
Button *edit_filters = nullptr;
Button *advanced = nullptr;
LineEdit *lang_code = nullptr;
LineEdit *script_code = nullptr;
LineEdit *country_code = nullptr;
LineEdit *variant_code = nullptr;
Tree *lang_list = nullptr;
Tree *script_list = nullptr;
Tree *cnt_list = nullptr;
UndoRedo *undo_redo = nullptr;
bool locale_set = false;
bool updating_lists = false;
protected:
static void _bind_methods();
virtual void _post_popup();
virtual void ok_pressed();
void _item_selected();
void _filter_lang_option_changed();
void _filter_script_option_changed();
void _filter_cnt_option_changed();
void _filter_mode_changed(int p_mode);
void _edit_filters(bool p_checked);
void _toggle_advanced(bool p_checked);
void _update_tree();
public:
EditorLocaleDialog();
void set_locale(const String &p_locale);
void popup_locale_dialog();
};
#endif // EDITOR_LOCALE_DIALOG_H

65
editor/editor_properties.cpp
View file

@ -320,6 +320,67 @@ EditorPropertyTextEnum::EditorPropertyTextEnum() {
add_focusable(cancel_button);
}
//////////////////// LOCALE ////////////////////////
void EditorPropertyLocale::_locale_selected(const String &p_locale) {
emit_changed(get_edited_property(), p_locale);
update_property();
}
void EditorPropertyLocale::_locale_pressed() {
if (!dialog) {
dialog = memnew(EditorLocaleDialog);
dialog->connect("locale_selected", this, "_locale_selected");
add_child(dialog);
}
String locale_code = get_edited_object()->get(get_edited_property());
dialog->set_locale(locale_code);
dialog->popup_locale_dialog();
}
void EditorPropertyLocale::update_property() {
String locale_code = get_edited_object()->get(get_edited_property());
locale->set_text(locale_code);
locale->set_tooltip(locale_code);
}
void EditorPropertyLocale::setup(const String &p_hint_text) {
}
void EditorPropertyLocale::_notification(int p_what) {
if (p_what == NOTIFICATION_ENTER_TREE || p_what == NOTIFICATION_THEME_CHANGED) {
locale_edit->set_icon(get_icon("Translation", "EditorIcons"));
}
}
void EditorPropertyLocale::_locale_focus_exited() {
_locale_selected(locale->get_text());
}
void EditorPropertyLocale::_bind_methods() {
ClassDB::bind_method(D_METHOD("_locale_selected"), &EditorPropertyLocale::_locale_selected);
ClassDB::bind_method(D_METHOD("_locale_pressed"), &EditorPropertyLocale::_locale_pressed);
ClassDB::bind_method(D_METHOD("_locale_focus_exited"), &EditorPropertyLocale::_locale_focus_exited);
}
EditorPropertyLocale::EditorPropertyLocale() {
HBoxContainer *locale_hb = memnew(HBoxContainer);
add_child(locale_hb);
locale = memnew(LineEdit);
locale_hb->add_child(locale);
locale->connect("text_submitted", this, "_locale_selected");
locale->connect("focus_exited", this, "_locale_focus_exited");
locale->set_h_size_flags(SIZE_EXPAND_FILL);
locale_edit = memnew(Button);
locale_edit->set_clip_text(true);
locale_hb->add_child(locale_edit);
add_focusable(locale);
dialog = nullptr;
locale_edit->connect("pressed", this, "_locale_pressed");
}
///////////////////// PATH /////////////////////////
void EditorPropertyPath::_path_selected(const String &p_path) {
@ -2880,6 +2941,10 @@ bool EditorInspectorDefaultPlugin::parse_property(Object *p_object, Variant::Typ
EditorPropertyClassName *editor = memnew(EditorPropertyClassName);
editor->setup("Object", p_hint_text);
add_property_editor(p_path, editor);
} else if (p_hint == PROPERTY_HINT_LOCALE_ID) {
EditorPropertyLocale *editor = memnew(EditorPropertyLocale);
editor->setup(p_hint_text);
return editor;
} else if (p_hint == PROPERTY_HINT_DIR || p_hint == PROPERTY_HINT_FILE || p_hint == PROPERTY_HINT_SAVE_FILE || p_hint == PROPERTY_HINT_GLOBAL_DIR || p_hint == PROPERTY_HINT_GLOBAL_FILE) {
Vector<String> extensions = p_hint_text.split(",");
bool global = p_hint == PROPERTY_HINT_GLOBAL_DIR || p_hint == PROPERTY_HINT_GLOBAL_FILE;

21
editor/editor_properties.h
View file

@ -33,6 +33,7 @@
#include "editor/create_dialog.h"
#include "editor/editor_inspector.h"
#include "editor/editor_locale_dialog.h"
#include "editor/editor_resource_picker.h"
#include "editor/editor_spin_slider.h"
#include "editor/property_selector.h"
@ -558,6 +559,26 @@ public:
EditorPropertyNodePath();
};
class EditorPropertyLocale : public EditorProperty {
GDCLASS(EditorPropertyLocale, EditorProperty);
EditorLocaleDialog *dialog;
LineEdit *locale;
Button *locale_edit;
void _locale_selected(const String &p_locale);
void _locale_pressed();
void _locale_focus_exited();
protected:
static void _bind_methods();
void _notification(int p_what);
public:
void setup(const String &p_hit_string);
virtual void update_property();
EditorPropertyLocale();
};
class EditorPropertyRID : public EditorProperty {
GDCLASS(EditorPropertyRID, EditorProperty);
Label *label;

15
editor/editor_settings.cpp
View file

@ -256,7 +256,6 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
{
String lang_hint = "en";
String host_lang = OS::get_singleton()->get_locale();
host_lang = TranslationServer::standardize_locale(host_lang);
// Some locales are not properly supported currently in Godot due to lack of font shaping
// (e.g. Arabic or Hindi), so even though we have work in progress translations for them,
@ -264,6 +263,7 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
const Vector<String> locales_to_skip = String("ar,bn,fa,he,hi,ml,si,ta,te,ur").split(",");
String best;
int best_score = 0;
const Vector<String> &locales = get_editor_locales();
for (int i = 0; i < locales.size(); i++) {
const String &locale = locales[i];
@ -278,16 +278,17 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
lang_hint += ",";
lang_hint += locale;
if (host_lang == locale) {
best = locale;
}
if (best == String() && host_lang.begins_with(locale)) {
int score = TranslationServer::get_singleton()->compare_locales(host_lang, locale);
if (score > 0 && score >= best_score) {
best = locale;
best_score = score;
if (score == 10) {
break; // Exact match, skip the rest.
}
}
}
if (best == String()) {
if (best_score == 0) {
best = "en";
}

3
editor/import/resource_importer_csv_translation.cpp
View file

@ -97,8 +97,7 @@ Error ResourceImporterCSVTranslation::import(const String &p_source_file, const
Vector<Ref<Translation>> translations;
for (int i = 1; i < line.size(); i++) {
String locale = line[i];
ERR_FAIL_COND_V_MSG(!TranslationServer::is_locale_valid(locale), ERR_PARSE_ERROR, "Error importing CSV translation: '" + locale + "' is not a valid locale.");
String locale = TranslationServer::get_singleton()->standardize_locale(line[i]);
locales.push_back(locale);
Ref<Translation> translation;

249
editor/project_settings_editor.cpp
View file

@ -1331,6 +1331,24 @@ void ProjectSettingsEditor::_translation_res_select() {
call_deferred("_update_translations");
}
void ProjectSettingsEditor::_translation_res_option_popup(bool p_arrow_clicked) {
TreeItem *ed = translation_remap_options->get_edited();
ERR_FAIL_COND(!ed);
locale_select->set_locale(ed->get_tooltip(1));
locale_select->popup_locale_dialog();
}
void ProjectSettingsEditor::_translation_res_option_selected(const String &p_locale) {
TreeItem *ed = translation_remap_options->get_edited();
ERR_FAIL_COND(!ed);
ed->set_text(1, TranslationServer::get_singleton()->get_locale_name(p_locale));
ed->set_tooltip(1, p_locale);
ProjectSettingsEditor::_translation_res_option_changed();
}
void ProjectSettingsEditor::_translation_res_option_changed() {
if (updating_translations) {
return;
@ -1350,20 +1368,11 @@ void ProjectSettingsEditor::_translation_res_option_changed() {
String key = k->get_metadata(0);
int idx = ed->get_metadata(0);
String path = ed->get_metadata(1);
int which = ed->get_range(1);
Vector<String> langs = TranslationServer::get_all_locales();
ERR_FAIL_INDEX(which, langs.size());
String locale = ed->get_tooltip(1);
ERR_FAIL_COND(!remaps.has(key));
PoolStringArray r = remaps[key];
ERR_FAIL_INDEX(idx, r.size());
if (translation_locales_idxs_remap.size() > which) {
r.set(idx, path + ":" + langs[translation_locales_idxs_remap[which]]);
} else {
r.set(idx, path + ":" + langs[which]);
}
r.set(idx, path + ":" + locale);
remaps[key] = r;
updating_translations = true;
@ -1441,86 +1450,6 @@ void ProjectSettingsEditor::_translation_res_option_delete(Object *p_item, int p
undo_redo->commit_action();
}
void ProjectSettingsEditor::_translation_filter_option_changed() {
int sel_id = translation_locale_filter_mode->get_selected_id();
TreeItem *t = translation_filter->get_edited();
String locale = t->get_tooltip(0);
bool checked = t->is_checked(0);
Variant prev;
Array f_locales_all;
if (ProjectSettings::get_singleton()->has_setting("locale/locale_filter")) {
f_locales_all = ProjectSettings::get_singleton()->get("locale/locale_filter");
prev = f_locales_all;
if (f_locales_all.size() != 2) {
f_locales_all.clear();
f_locales_all.append(sel_id);
f_locales_all.append(Array());
}
} else {
f_locales_all.append(sel_id);
f_locales_all.append(Array());
}
Array f_locales = f_locales_all[1];
int l_idx = f_locales.find(locale);
if (checked) {
if (l_idx == -1) {
f_locales.append(locale);
}
} else {
if (l_idx != -1) {
f_locales.remove(l_idx);
}
}
f_locales = f_locales.sort();
undo_redo->create_action(TTR("Changed Locale Filter"));
undo_redo->add_do_property(ProjectSettings::get_singleton(), "locale/locale_filter", f_locales_all);
undo_redo->add_undo_property(ProjectSettings::get_singleton(), "locale/locale_filter", prev);
undo_redo->add_do_method(this, "_update_translations");
undo_redo->add_undo_method(this, "_update_translations");
undo_redo->add_do_method(this, "_settings_changed");
undo_redo->add_undo_method(this, "_settings_changed");
undo_redo->commit_action();
}
void ProjectSettingsEditor::_translation_filter_mode_changed(int p_mode) {
int sel_id = translation_locale_filter_mode->get_selected_id();
Variant prev;
Array f_locales_all;
if (ProjectSettings::get_singleton()->has_setting("locale/locale_filter")) {
f_locales_all = ProjectSettings::get_singleton()->get("locale/locale_filter");
prev = f_locales_all;
if (f_locales_all.size() != 2) {
f_locales_all.clear();
f_locales_all.append(sel_id);
f_locales_all.append(Array());
} else {
f_locales_all[0] = sel_id;
}
} else {
f_locales_all.append(sel_id);
f_locales_all.append(Array());
}
undo_redo->create_action(TTR("Changed Locale Filter Mode"));
undo_redo->add_do_property(ProjectSettings::get_singleton(), "locale/locale_filter", f_locales_all);
undo_redo->add_undo_property(ProjectSettings::get_singleton(), "locale/locale_filter", prev);
undo_redo->add_do_method(this, "_update_translations");
undo_redo->add_undo_method(this, "_update_translations");
undo_redo->add_do_method(this, "_settings_changed");
undo_redo->add_undo_method(this, "_settings_changed");
undo_redo->commit_action();
}
void ProjectSettingsEditor::_update_translations() {
//update translations
@ -1545,64 +1474,6 @@ void ProjectSettingsEditor::_update_translations() {
}
}
Vector<String> langs = TranslationServer::get_all_locales();
Vector<String> names = TranslationServer::get_all_locale_names();
//update filter tab
Array l_filter_all;
bool is_arr_empty = true;
if (ProjectSettings::get_singleton()->has_setting("locale/locale_filter")) {
l_filter_all = ProjectSettings::get_singleton()->get("locale/locale_filter");
if (l_filter_all.size() == 2) {
translation_locale_filter_mode->select(l_filter_all[0]);
is_arr_empty = false;
}
}
if (is_arr_empty) {
l_filter_all.append(0);
l_filter_all.append(Array());
translation_locale_filter_mode->select(0);
}
int filter_mode = l_filter_all[0];
Array l_filter = l_filter_all[1];
int s = names.size();
bool is_short_list_when_show_all_selected = filter_mode == SHOW_ALL_LOCALES && translation_filter_treeitems.size() < s;
bool is_full_list_when_show_only_selected = filter_mode == SHOW_ONLY_SELECTED_LOCALES && translation_filter_treeitems.size() == s;
bool should_recreate_locales_list = is_short_list_when_show_all_selected || is_full_list_when_show_only_selected;
if (!translation_locales_list_created || should_recreate_locales_list) {
translation_locales_list_created = true;
translation_filter->clear();
root = translation_filter->create_item(nullptr);
translation_filter->set_hide_root(true);
translation_filter_treeitems.clear();
for (int i = 0; i < s; i++) {
String n = names[i];
String l = langs[i];
bool is_checked = l_filter.has(l);
if (filter_mode == SHOW_ONLY_SELECTED_LOCALES && !is_checked) {
continue;
}
TreeItem *t = translation_filter->create_item(root);
t->set_cell_mode(0, TreeItem::CELL_MODE_CHECK);
t->set_text(0, vformat("[%s] %s", l, n));
t->set_editable(0, true);
t->set_tooltip(0, l);
t->set_checked(0, is_checked);
translation_filter_treeitems.push_back(t);
}
} else {
for (int i = 0; i < translation_filter_treeitems.size(); i++) {
TreeItem *t = translation_filter_treeitems[i];
t->set_checked(0, l_filter.has(t->get_tooltip(0)));
}
}
//update translation remaps
String remap_selected;
@ -1618,32 +1489,6 @@ void ProjectSettingsEditor::_update_translations() {
translation_remap_options->set_hide_root(true);
translation_res_option_add_button->set_disabled(true);
translation_locales_idxs_remap.clear();
translation_locales_idxs_remap.resize(l_filter.size());
int fl_idx_count = translation_locales_idxs_remap.size();
String langnames = "";
int l_idx = 0;
for (int i = 0; i < names.size(); i++) {
if (filter_mode == SHOW_ONLY_SELECTED_LOCALES && fl_idx_count != 0) {
if (l_filter.size() > 0) {
if (l_filter.find(langs[i]) != -1) {
if (langnames.length() > 0) {
langnames += ",";
}
langnames += vformat("[%s] %s", langs[i], names[i]);
translation_locales_idxs_remap.write[l_idx] = i;
l_idx++;
}
}
} else {
if (i > 0) {
langnames += ",";
}
langnames += vformat("[%s] %s", langs[i], names[i]);
}
}
if (ProjectSettings::get_singleton()->has_setting("locale/translation_remaps")) {
Dictionary remaps = ProjectSettings::get_singleton()->get("locale/translation_remaps");
List<Variant> rk;
@ -1678,21 +1523,11 @@ void ProjectSettingsEditor::_update_translations() {
t2->set_tooltip(0, path);
t2->set_metadata(0, j);
t2->add_button(0, get_icon("Remove", "EditorIcons"), 0, false, TTR("Remove"));
t2->set_cell_mode(1, TreeItem::CELL_MODE_RANGE);
t2->set_text(1, langnames);
t2->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM);
t2->set_text(1, TranslationServer::get_singleton()->get_locale_name(locale));
t2->set_editable(1, true);
t2->set_metadata(1, path);
int idx = langs.find(locale);
if (idx < 0) {
idx = 0;
}
int f_idx = translation_locales_idxs_remap.find(idx);
if (f_idx != -1 && fl_idx_count > 0 && filter_mode == SHOW_ONLY_SELECTED_LOCALES) {
t2->set_range(1, f_idx);
} else {
t2->set_range(1, idx);
}
t2->set_tooltip(1, locale);
}
}
}
@ -1777,6 +1612,7 @@ void ProjectSettingsEditor::_bind_methods() {
ClassDB::bind_method(D_METHOD("_settings_changed"), &ProjectSettingsEditor::_settings_changed);
ClassDB::bind_method(D_METHOD("_translation_add"), &ProjectSettingsEditor::_translation_add);
ClassDB::bind_method(D_METHOD("_translation_file_open"), &ProjectSettingsEditor::_translation_file_open);
ClassDB::bind_method(D_METHOD("_translation_res_option_selected"), &ProjectSettingsEditor::_translation_res_option_selected);
ClassDB::bind_method(D_METHOD("_translation_res_add"), &ProjectSettingsEditor::_translation_res_add);
ClassDB::bind_method(D_METHOD("_translation_res_file_open"), &ProjectSettingsEditor::_translation_res_file_open);
@ -1786,9 +1622,7 @@ void ProjectSettingsEditor::_bind_methods() {
ClassDB::bind_method(D_METHOD("_translation_res_option_changed"), &ProjectSettingsEditor::_translation_res_option_changed);
ClassDB::bind_method(D_METHOD("_translation_res_delete"), &ProjectSettingsEditor::_translation_res_delete);
ClassDB::bind_method(D_METHOD("_translation_res_option_delete"), &ProjectSettingsEditor::_translation_res_option_delete);
ClassDB::bind_method(D_METHOD("_translation_filter_option_changed"), &ProjectSettingsEditor::_translation_filter_option_changed);
ClassDB::bind_method(D_METHOD("_translation_filter_mode_changed"), &ProjectSettingsEditor::_translation_filter_mode_changed);
ClassDB::bind_method(D_METHOD("_translation_res_option_popup"), &ProjectSettingsEditor::_translation_res_option_popup);
ClassDB::bind_method(D_METHOD("_toggle_search_bar"), &ProjectSettingsEditor::_toggle_search_bar);
@ -2039,9 +1873,6 @@ ProjectSettingsEditor::ProjectSettingsEditor(EditorData *p_data) {
translations->set_tab_align(TabContainer::ALIGN_LEFT);
translations->set_name(TTR("Localization"));
tab_container->add_child(translations);
//remap for properly select language in popup
translation_locales_idxs_remap = Vector<int>();
translation_locales_list_created = false;
{
VBoxContainer *tvb = memnew(VBoxContainer);
@ -2061,6 +1892,10 @@ ProjectSettingsEditor::ProjectSettingsEditor(EditorData *p_data) {
translation_list->set_v_size_flags(SIZE_EXPAND_FILL);
tmc->add_child(translation_list);
locale_select = memnew(EditorLocaleDialog);
locale_select->connect("locale_selected", this, "_translation_res_option_selected");
add_child(locale_select);
translation_file_open = memnew(EditorFileDialog);
add_child(translation_file_open);
translation_file_open->set_mode(EditorFileDialog::MODE_OPEN_FILES);
@ -2113,9 +1948,10 @@ ProjectSettingsEditor::ProjectSettingsEditor(EditorData *p_data) {
translation_remap_options->set_column_titles_visible(true);
translation_remap_options->set_column_expand(0, true);
translation_remap_options->set_column_expand(1, false);
translation_remap_options->set_column_min_width(1, 200);
translation_remap_options->set_column_min_width(1, 250 * EDSCALE);
translation_remap_options->connect("item_edited", this, "_translation_res_option_changed");
translation_remap_options->connect("button_pressed", this, "_translation_res_option_delete");
translation_remap_options->connect("custom_popup_edited", this, "_translation_res_option_popup");
translation_res_option_file_open = memnew(EditorFileDialog);
add_child(translation_res_option_file_open);
@ -2123,29 +1959,6 @@ ProjectSettingsEditor::ProjectSettingsEditor(EditorData *p_data) {
translation_res_option_file_open->connect("files_selected", this, "_translation_res_option_add");
}
{
VBoxContainer *tvb = memnew(VBoxContainer);
translations->add_child(tvb);
tvb->set_name(TTR("Locales Filter"));
VBoxContainer *tmc = memnew(VBoxContainer);
tmc->set_v_size_flags(SIZE_EXPAND_FILL);
tvb->add_child(tmc);
translation_locale_filter_mode = memnew(OptionButton);
translation_locale_filter_mode->add_item(TTR("Show All Locales"), SHOW_ALL_LOCALES);
translation_locale_filter_mode->add_item(TTR("Show Selected Locales Only"), SHOW_ONLY_SELECTED_LOCALES);
translation_locale_filter_mode->select(0);
tmc->add_margin_child(TTR("Filter mode:"), translation_locale_filter_mode);
translation_locale_filter_mode->connect("item_selected", this, "_translation_filter_mode_changed");
translation_filter = memnew(Tree);
translation_filter->set_v_size_flags(SIZE_EXPAND_FILL);
translation_filter->set_columns(1);
tmc->add_child(memnew(Label(TTR("Locales:"))));
tmc->add_child(translation_filter);
translation_filter->connect("item_edited", this, "_translation_filter_option_changed");
}
autoload_settings = memnew(EditorAutoloadSettings);
autoload_settings->set_name(TTR("AutoLoad"));
tab_container->add_child(autoload_settings);

17
editor/project_settings_editor.h
View file

@ -34,6 +34,7 @@
#include "core/undo_redo.h"
#include "editor/editor_autoload_settings.h"
#include "editor/editor_data.h"
#include "editor/editor_locale_dialog.h"
#include "editor/editor_plugin_settings.h"
#include "editor/editor_sectioned_inspector.h"
#include "editor/import_defaults_editor.h"
@ -51,11 +52,6 @@ class ProjectSettingsEditor : public AcceptDialog {
INPUT_MOUSE_BUTTON
};
enum LocaleFilter {
SHOW_ALL_LOCALES,
SHOW_ONLY_SELECTED_LOCALES,
};
TabContainer *tab_container;
Timer *timer;
@ -94,6 +90,7 @@ class ProjectSettingsEditor : public AcceptDialog {
Ref<InputEventKey> last_wait_for_key;
EditorLocaleDialog *locale_select;
EditorFileDialog *translation_file_open;
Tree *translation_list;
@ -102,11 +99,6 @@ class ProjectSettingsEditor : public AcceptDialog {
EditorFileDialog *translation_res_option_file_open;
Tree *translation_remap;
Tree *translation_remap_options;
Tree *translation_filter;
bool translation_locales_list_created;
OptionButton *translation_locale_filter_mode;
Vector<TreeItem *> translation_filter_treeitems;
Vector<int> translation_locales_idxs_remap;
EditorAutoloadSettings *autoload_settings;
@ -153,9 +145,8 @@ class ProjectSettingsEditor : public AcceptDialog {
void _translation_res_option_add(const PoolStringArray &p_paths);
void _translation_res_option_changed();
void _translation_res_option_delete(Object *p_item, int p_column, int p_button);
void _translation_filter_option_changed();
void _translation_filter_mode_changed(int p_mode);
void _translation_res_option_popup(bool p_arrow_clicked);
void _translation_res_option_selected(const String &p_locale);
void _toggle_search_bar(bool p_pressed);

26
editor/property_editor.cpp
View file

@ -519,7 +519,13 @@ bool CustomPropertyEditor::edit(Object *p_owner, const String &p_name, Variant::
} break;
case Variant::STRING: {
if (hint == PROPERTY_HINT_FILE || hint == PROPERTY_HINT_GLOBAL_FILE) {
if (hint == PROPERTY_HINT_LOCALE_ID) {
List<String> names;
names.push_back(TTR("Locale..."));
names.push_back(TTR("Clear"));
config_action_buttons(names);
} else if (hint == PROPERTY_HINT_FILE || hint == PROPERTY_HINT_GLOBAL_FILE) {
List<String> names;
names.push_back(TTR("File..."));
names.push_back(TTR("Clear"));
@ -1055,6 +1061,14 @@ void CustomPropertyEditor::_file_selected(String p_file) {
}
}
void CustomPropertyEditor::_locale_selected(String p_locale) {
if (type == Variant::STRING && hint == PROPERTY_HINT_LOCALE_ID) {
v = p_locale;
emit_signal("variant_changed");
hide();
}
}
void CustomPropertyEditor::_type_create_selected(int p_idx) {
if (type == Variant::INT || type == Variant::REAL) {
float newval = 0;
@ -1193,7 +1207,8 @@ void CustomPropertyEditor::_action_pressed(int p_which) {
case Variant::STRING: {
if (hint == PROPERTY_HINT_MULTILINE_TEXT) {
hide();
} else if (hint == PROPERTY_HINT_LOCALE_ID) {
locale->popup_locale_dialog();
} else if (hint == PROPERTY_HINT_FILE || hint == PROPERTY_HINT_GLOBAL_FILE) {
if (p_which == 0) {
if (hint == PROPERTY_HINT_FILE) {
@ -1751,6 +1766,7 @@ void CustomPropertyEditor::_bind_methods() {
ClassDB::bind_method("_range_modified", &CustomPropertyEditor::_range_modified);
ClassDB::bind_method("_action_pressed", &CustomPropertyEditor::_action_pressed);
ClassDB::bind_method("_file_selected", &CustomPropertyEditor::_file_selected);
ClassDB::bind_method("_locale_selected", &CustomPropertyEditor::_locale_selected);
ClassDB::bind_method("_type_create_selected", &CustomPropertyEditor::_type_create_selected);
ClassDB::bind_method("_node_path_selected", &CustomPropertyEditor::_node_path_selected);
ClassDB::bind_method("_color_changed", &CustomPropertyEditor::_color_changed);
@ -1840,6 +1856,12 @@ CustomPropertyEditor::CustomPropertyEditor() {
file->connect("file_selected", this, "_file_selected");
file->connect("dir_selected", this, "_file_selected");
locale = memnew(EditorLocaleDialog);
add_child(locale);
locale->hide();
locale->connect("locale_selected", this, "_locale_selected");
error = memnew(ConfirmationDialog);
error->set_title(TTR("Error!"));
add_child(error);

3
editor/property_editor.h
View file

@ -32,6 +32,7 @@
#define PROPERTY_EDITOR_H
#include "editor/editor_file_dialog.h"
#include "editor/editor_locale_dialog.h"
#include "editor/scene_tree_editor.h"
#include "scene/gui/button.h"
#include "scene/gui/check_box.h"
@ -92,6 +93,7 @@ class CustomPropertyEditor : public Popup {
PopupMenu *menu;
SceneTreeDialog *scene_tree;
EditorLocaleDialog *locale;
EditorFileDialog *file;
ConfirmationDialog *error;
String name;
@ -128,6 +130,7 @@ class CustomPropertyEditor : public Popup {
PropertyValueEvaluator *evaluator;
void _text_edit_changed();
void _locale_selected(String p_locale);
void _file_selected(String p_file);
void _modified(String p_string);

5
modules/gdnative/include/nativescript/godot_nativescript.h
View file

@ -86,6 +86,11 @@ typedef enum {
GODOT_PROPERTY_HINT_PROPERTY_OF_BASE_TYPE, ///< a property of a base type
GODOT_PROPERTY_HINT_PROPERTY_OF_INSTANCE, ///< a property of an instance
GODOT_PROPERTY_HINT_PROPERTY_OF_SCRIPT, ///< a property of a script & base
GODOT_PROPERTY_HINT_OBJECT_TOO_BIG, ///< object is too big to send
GODOT_PROPERTY_HINT_NODE_PATH_VALID_TYPES,
GODOT_PROPERTY_HINT_SAVE_FILE, ///< a file path must be passed, hint_text (optionally) is a filter "*.png,*.wav,*.doc,". This opens a save dialog
GODOT_PROPERTY_HINT_ENUM_SUGGESTION, ///< hint_text= "val1,val2,val3,etc"
GODOT_PROPERTY_HINT_LOCALE_ID,
GODOT_PROPERTY_HINT_MAX,
} godot_property_hint;