Browse Source

Use IETF standard language tags for locale names

jp9000 11 years ago
parent
commit
4cc1a42908

+ 6 - 6
build/data/obs-studio/locale.ini

@@ -1,18 +1,18 @@
-[en]
+[en-US]
 Name=English
 
-[ru]
+[ru-RU]
 Name=Русский
 
-[fi]
+[fi-FI]
 Name=Finnish
 
-[it]
+[it-IT]
 Name=Italian
 
-[ja]
+[ja-JP]
 Name=日本語
 
-[de]
+[de-DE]
 Name=Deutsch
 

+ 0 - 0
build/data/obs-studio/locale/de.ini → build/data/obs-studio/locale/de-DE.ini


+ 0 - 0
build/data/obs-studio/locale/en.ini → build/data/obs-studio/locale/en-US.ini


+ 0 - 0
build/data/obs-studio/locale/fi.ini → build/data/obs-studio/locale/fi-FI.ini


+ 0 - 0
build/data/obs-studio/locale/it.ini → build/data/obs-studio/locale/it-IT.ini


+ 0 - 0
build/data/obs-studio/locale/ja.ini → build/data/obs-studio/locale/ja-JP.ini


+ 0 - 0
build/data/obs-studio/locale/nb-no.ini → build/data/obs-studio/locale/nb-NO.ini


+ 0 - 0
build/data/obs-studio/locale/pt.ini → build/data/obs-studio/locale/pt-PT.ini


+ 0 - 0
build/data/obs-studio/locale/ru.ini → build/data/obs-studio/locale/ru-RU.ini


+ 2 - 2
obs/obs-app.cpp

@@ -97,7 +97,7 @@ static void do_log(int log_level, const char *msg, va_list args, void *param)
 
 bool OBSApp::InitGlobalConfigDefaults()
 {
-	config_set_default_string(globalConfig, "General", "Language", "en");
+	config_set_default_string(globalConfig, "General", "Language", "en-US");
 	config_set_default_uint(globalConfig, "General", "MaxLogs", 10);
 
 #if _WIN32
@@ -156,7 +156,7 @@ bool OBSApp::InitGlobalConfig()
 	return InitGlobalConfigDefaults();
 }
 
-#define DEFAULT_LANG "en"
+#define DEFAULT_LANG "en-US"
 
 bool OBSApp::InitLocale()
 {

+ 1 - 1
test/win/test.cpp

@@ -71,7 +71,7 @@ static void CreateOBS(HWND hwnd)
 	RECT rc;
 	GetClientRect(hwnd, &rc);
 
-	if (!obs_startup("en"))
+	if (!obs_startup("en-US"))
 		throw "Couldn't create OBS";
 
 	struct obs_video_info ovi;