Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2024-10-01 16:17:30 +02:00
Code Issues Projects Releases Wiki Activity

Fixed bug with locale files being saved from BentoBox into addon locales

Browse Source
This commit is contained in:
tastybento 2018-08-12 08:02:54 -07:00
parent 686b4398bc
commit ca4db42e8d
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/world/bentobox/bentobox/managers/AddonsManager.java
View File

@ -192,7 +192,6 @@ public class AddonsManager {
* @param jar - the jar file
* @param folderPath - the path within the jar
* @return a list of files
- if the file cannot be read
*/
public List<String> listJarYamlFiles(JarFile jar, String folderPath) {
List<String> result = new ArrayList<>();

24
src/main/java/world/bentobox/bentobox/managers/LocalesManager.java
View File

@ -30,6 +30,7 @@ public class LocalesManager {
public LocalesManager(BentoBox plugin) {
this.plugin = plugin;
loadLocalesFromJar("BentoBox");
loadLocales("BentoBox"); // Default
}
@ -55,15 +56,7 @@ public class LocalesManager {
return null;
}
/**
* Loads all the locales available. If the locale folder does not exist, one will be created and
* filled with locale files from the jar.
*/
public void loadLocales(String parent) {
// Describe the filter - we only want files that are correctly named
// Files must be 9 chars long
FilenameFilter ymlFilter = (dir, name) -> name.toLowerCase(java.util.Locale.ENGLISH).endsWith(".yml") && name.length() == 9;
public void loadLocalesFromJar(String parent) {
// Run through the files and store the locales
File localeDir = new File(plugin.getDataFolder(), LOCALE_FOLDER + File.separator + parent);
// If the folder does not exist, then make it and fill with the locale files from the jar
@ -83,6 +76,19 @@ public class LocalesManager {
plugin.logError("Could not copy locale files from jar " + e.getMessage());
}
}
}
/**
* Loads all the locales available. If the locale folder does not exist, one will be created and
* filled with locale files from the jar.
*/
public void loadLocales(String parent) {
// Describe the filter - we only want files that are correctly named
// Files must be 9 chars long
FilenameFilter ymlFilter = (dir, name) -> name.toLowerCase(java.util.Locale.ENGLISH).endsWith(".yml") && name.length() == 9;
// Run through the files and store the locales
File localeDir = new File(plugin.getDataFolder(), LOCALE_FOLDER + File.separator + parent);
// Store all the locales available
for (File language : Objects.requireNonNull(localeDir.listFiles(ymlFilter))) {