aboutsummaryrefslogtreecommitdiff
path: root/core/translation.cpp
diff options
context:
space:
mode:
authorJuan Linietsky2017-07-19 17:00:46 -0300
committerJuan Linietsky2017-07-19 17:06:03 -0300
commit25678b1876816b9ccb14b2c92aef62f3b009f88f (patch)
tree189f082d788f78e16f620b056d21249118883fc5 /core/translation.cpp
parent89588d43349e496a9e05756d42ae87323d31269e (diff)
downloadgodot-25678b1876816b9ccb14b2c92aef62f3b009f88f.tar.gz
godot-25678b1876816b9ccb14b2c92aef62f3b009f88f.tar.zst
godot-25678b1876816b9ccb14b2c92aef62f3b009f88f.zip
Diffstat (limited to 'core/translation.cpp')
-rw-r--r--core/translation.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/core/translation.cpp b/core/translation.cpp
index 72231ef29..d782006dd 100644
--- a/core/translation.cpp
+++ b/core/translation.cpp
@@ -29,7 +29,7 @@
/*************************************************************************/
#include "translation.h"
-#include "global_config.h"
+#include "project_settings.h"
#include "io/resource_loader.h"
#include "os/os.h"
@@ -1053,8 +1053,8 @@ TranslationServer *TranslationServer::singleton = NULL;
bool TranslationServer::_load_translations(const String &p_from) {
- if (GlobalConfig::get_singleton()->has(p_from)) {
- PoolVector<String> translations = GlobalConfig::get_singleton()->get(p_from);
+ if (ProjectSettings::get_singleton()->has(p_from)) {
+ PoolVector<String> translations = ProjectSettings::get_singleton()->get(p_from);
int tcount = translations.size();
@@ -1095,7 +1095,7 @@ void TranslationServer::setup() {
options += locale_list[idx];
idx++;
}
- GlobalConfig::get_singleton()->set_custom_property_info("locale/fallback", PropertyInfo(Variant::STRING, "locale/fallback", PROPERTY_HINT_ENUM, options));
+ ProjectSettings::get_singleton()->set_custom_property_info("locale/fallback", PropertyInfo(Variant::STRING, "locale/fallback", PROPERTY_HINT_ENUM, options));
}
#endif
//load translations