Pārlūkot izejas kodu

BETA: Updating Multilingual system properties.

Zoey76 12 gadi atpakaļ
vecāks
revīzija
2546ea1eba

+ 5 - 5
L2J_Server_BETA/dist/game/config/L2JMods.properties

@@ -8,7 +8,7 @@
 ChampionEnable = False
 
 # Force Champion mobs to be passive?
-# To leave champion mobs to default/Agressive, set to False.
+# To leave champion mobs to default/Aggressive, set to False.
 # To set all champion mobs to Passive, set True.
 ChampionPassive = False
 
@@ -383,14 +383,14 @@ HellboundStatus = False
 # Default: False
 MultiLangEnable = False
 
-# List of allowed languages, semicolon separated.
-# Default: en
-MultiLangAllowed = en;ru
-
 # Default language, if not defined.
 # Default: en
 MultiLangDefault = en
 
+# List of allowed languages, semicolon separated.
+# Default: en;ru
+MultiLangAllowed = en;ru
+
 # Enable or disable voice command .lang for changing languages on the fly.
 # Default: True
 MultiLangVoiceCommand = True

+ 6 - 4
L2J_Server_BETA/java/com/l2jserver/Config.java

@@ -2603,21 +2603,23 @@ public final class Config
 			
 			L2JMOD_CHAT_ADMIN = Boolean.parseBoolean(L2JModSettings.getProperty("ChatAdmin", "false"));
 			
+			L2JMOD_MULTILANG_DEFAULT = L2JModSettings.getProperty("MultiLangDefault", "en");
 			L2JMOD_MULTILANG_ENABLE = Boolean.parseBoolean(L2JModSettings.getProperty("MultiLangEnable", "false"));
-			String[] allowed = L2JModSettings.getProperty("MultiLangAllowed", "en").split(";");
+			String[] allowed = L2JModSettings.getProperty("MultiLangAllowed", L2JMOD_MULTILANG_DEFAULT).split(";");
 			L2JMOD_MULTILANG_ALLOWED = new ArrayList<>(allowed.length);
 			for (String lang : allowed)
 			{
 				L2JMOD_MULTILANG_ALLOWED.add(lang);
 			}
-			L2JMOD_MULTILANG_DEFAULT = L2JModSettings.getProperty("MultiLangDefault", "en");
+			
 			if (!L2JMOD_MULTILANG_ALLOWED.contains(L2JMOD_MULTILANG_DEFAULT))
 			{
 				_log.warning("MultiLang[Config.load()]: default language: " + L2JMOD_MULTILANG_DEFAULT + " is not in allowed list !");
 			}
+			
 			L2JMOD_HELLBOUND_STATUS = Boolean.parseBoolean(L2JModSettings.getProperty("HellboundStatus", "False"));
 			L2JMOD_MULTILANG_VOICED_ALLOW = Boolean.parseBoolean(L2JModSettings.getProperty("MultiLangVoiceCommand", "True"));
-			L2JMOD_MULTILANG_SM_ENABLE = Boolean.parseBoolean(L2JModSettings.getProperty("MultiLangSystemMessageEnable", "false"));
+			L2JMOD_MULTILANG_SM_ENABLE = Boolean.parseBoolean(L2JModSettings.getProperty("MultiLangSystemMessageEnable", "False"));
 			allowed = L2JModSettings.getProperty("MultiLangSystemMessageAllowed", "").split(";");
 			L2JMOD_MULTILANG_SM_ALLOWED = new ArrayList<>(allowed.length);
 			for (String lang : allowed)
@@ -2627,7 +2629,7 @@ public final class Config
 					L2JMOD_MULTILANG_SM_ALLOWED.add(lang);
 				}
 			}
-			L2JMOD_MULTILANG_NS_ENABLE = Boolean.parseBoolean(L2JModSettings.getProperty("MultiLangNpcStringEnable", "false"));
+			L2JMOD_MULTILANG_NS_ENABLE = Boolean.parseBoolean(L2JModSettings.getProperty("MultiLangNpcStringEnable", "False"));
 			allowed = L2JModSettings.getProperty("MultiLangNpcStringAllowed", "").split(";");
 			L2JMOD_MULTILANG_NS_ALLOWED = new ArrayList<>(allowed.length);
 			for (String lang : allowed)