KnarCraft/KnarLib
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Makes the fallback language configurable

Browse Source
This commit is contained in:
Kristian Knarvik
2023-01-25 16:03:50 +01:00
parent 4f7f33be27
commit 341fce44e5
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pom.xml
View File

@@ -84,5 +84,11 @@
<version>1.19.2-R0.1-SNAPSHOT</version> <version>1.19.2-R0.1-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>5.9.2</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
</project> </project>

5
src/main/java/net/knarcraft/knarlib/formatting/Translator.java
View File

@@ -48,10 +48,11 @@ public final class Translator {
* Loads the languages used by this translator * Loads the languages used by this translator
* *
* @param dataFolder <p>The data folder to load custom strings from</p> * @param dataFolder <p>The data folder to load custom strings from</p>
* @param fallbackLanguage <p>The default language to fall back on in the case of missing translations</p>
* @param selectedLanguage <p>The currently selected language</p> * @param selectedLanguage <p>The currently selected language</p>
*/ */
public void loadLanguages(File dataFolder, String selectedLanguage) { public void loadLanguages(File dataFolder, String fallbackLanguage, String selectedLanguage) {
backupTranslatedMessages = loadTranslatedMessages("en"); backupTranslatedMessages = loadTranslatedMessages(fallbackLanguage);
translatedMessages = loadCustomTranslatedMessages(dataFolder, selectedLanguage); translatedMessages = loadCustomTranslatedMessages(dataFolder, selectedLanguage);
if (translatedMessages == null) { if (translatedMessages == null) {
translatedMessages = loadTranslatedMessages(selectedLanguage); translatedMessages = loadTranslatedMessages(selectedLanguage);