EpicKnarvik97/Jail
EpicKnarvik97/Jail
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge branch 'colajunkie13-master'

Browse Source
This commit is contained in:
Bradley Hilton 2017-06-15 11:29:34 -05:00
commit a37907ece9
No known key found for this signature in database
GPG Key ID: 0666B2C24C43C358
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/graywolf336/jail/JailIO.java
View File

@ -1,6 +1,7 @@
package com.graywolf336.jail; package com.graywolf336.jail;
import java.io.File; import java.io.File;
import java.io.InputStreamReader;
import java.io.IOException; import java.io.IOException;
import java.sql.Connection; import java.sql.Connection;
import java.sql.DriverManager; import java.sql.DriverManager;
@ -46,7 +47,6 @@ public class JailIO {
} }
/** Loads the language file from disk, if there is none then we save the default one. */ /** Loads the language file from disk, if there is none then we save the default one. */
@SuppressWarnings("deprecation")
protected void loadLanguage() { protected void loadLanguage() {
String language = pl.getConfig().getString(Settings.LANGUAGE.getPath()); String language = pl.getConfig().getString(Settings.LANGUAGE.getPath());
boolean save = false; boolean save = false;
@ -60,18 +60,18 @@ public class JailIO {
}else { }else {
pl.getLogger().severe("The language file can not be a folder."); pl.getLogger().severe("The language file can not be a folder.");
pl.getLogger().severe("As a result, we are reverting back to English as the language."); pl.getLogger().severe("As a result, we are reverting back to English as the language.");
Lang.setFile(YamlConfiguration.loadConfiguration(pl.getResource("locales/en.yml"))); Lang.setFile(YamlConfiguration.loadConfiguration(new InputStreamReader(pl.getResource("locales/en.yml"))));
save = true; save = true;
} }
}else { }else {
pl.getLogger().warning("Loading the default language of: en"); pl.getLogger().warning("Loading the default language of: en");
pl.getLogger().warning("If you wish to change this, please rename 'en.yml' to whatever you wish and set the config value to the name of the file."); pl.getLogger().warning("If you wish to change this, please rename 'en.yml' to whatever you wish and set the config value to the name of the file.");
Lang.setFile(YamlConfiguration.loadConfiguration(pl.getResource("locales/en.yml"))); Lang.setFile(YamlConfiguration.loadConfiguration(new InputStreamReader(pl.getResource("locales/en.yml"))));
save = true; save = true;
} }
//Make sure we have all the new language settings loaded //Make sure we have all the new language settings loaded
if(!save) save = Lang.writeNewLanguage(YamlConfiguration.loadConfiguration(pl.getResource("locales/en.yml"))); if(!save) save = Lang.writeNewLanguage(YamlConfiguration.loadConfiguration(new InputStreamReader(pl.getResource("locales/en.yml"))));
//If we have flagged to save the language file, let's save it as en.yml as this flag usually means they didn't have it loaded. //If we have flagged to save the language file, let's save it as en.yml as this flag usually means they didn't have it loaded.
if(save) { if(save) {