Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2025-04-04 19:25:43 +02:00
Code Issues Projects Releases Wiki Activity

Store the locale files in their own "parent" folder, so it looks nicer, instead of having a prefix

Browse Source 
also renamed BSBLocale#add() to BSBLocale#merge()
and renamed the locale files as well
This commit is contained in:
Florian CUNY 2018-01-04 14:14:18 +01:00
parent 4aaab9f69f
commit b7f1d68bcf
7 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
locales/BSB-de-DE.yml → locales/de-DE.yml
View File

0
locales/BSB-en-GB.yml → locales/en-GB.yml
View File

0
locales/BSB-en-US.yml → locales/en-US.yml
View File

0
locales/BSB-fr-FR.yml → locales/fr-FR.yml
View File

0
locales/BSB-zh-CN.yml → locales/zh-CN.yml
View File

4
src/main/java/us/tastybento/bskyblock/api/localization/BSBLocale.java
View File

@ -62,10 +62,10 @@ public class BSBLocale {
} }
/** /**
* Adds language YAML file to this locale * Merges a language YAML file to this locale
* @param language * @param language
*/ */
public void add(File language) { public void merge(File language) {
YamlConfiguration toBeMerged = YamlConfiguration.loadConfiguration(language); YamlConfiguration toBeMerged = YamlConfiguration.loadConfiguration(language);
for (String key : toBeMerged.getKeys(true)) { for (String key : toBeMerged.getKeys(true)) {
if (!config.contains(key)) { if (!config.contains(key)) {

6
src/main/java/us/tastybento/bskyblock/managers/LocalesManager.java
View File

@ -65,8 +65,9 @@ public final class LocalesManager {
return false; return false;
} }
}; };
// Run through the files and store the locales // Run through the files and store the locales
File localeDir = new File(plugin.getDataFolder(), LOCALE_FOLDER); File localeDir = new File(plugin.getDataFolder(), LOCALE_FOLDER + "/" + parent);
// If the folder does not exist, then make it and fill with the locale files from the jar // If the folder does not exist, then make it and fill with the locale files from the jar
// If it does exist, then new files will NOT be written! // If it does exist, then new files will NOT be written!
if (!localeDir.exists()) { if (!localeDir.exists()) {
@ -80,6 +81,7 @@ public final class LocalesManager {
e.printStackTrace(); e.printStackTrace();
} }
} }
// Store all the locales available // Store all the locales available
for (File language : localeDir.listFiles(ymlFilter)) { for (File language : localeDir.listFiles(ymlFilter)) {
if (DEBUG) if (DEBUG)
@ -89,7 +91,7 @@ public final class LocalesManager {
plugin.getLogger().info("DEBUG: locale country found = " + localeObject.getCountry()); plugin.getLogger().info("DEBUG: locale country found = " + localeObject.getCountry());
if (languages.containsKey(localeObject)) { if (languages.containsKey(localeObject)) {
// Merge into current language // Merge into current language
languages.get(localeObject).add(language); languages.get(localeObject).merge(language);
} else { } else {
// New language // New language
languages.put(localeObject, new BSBLocale(localeObject, language)); languages.put(localeObject, new BSBLocale(localeObject, language));