Skip to content

Refactor locale resource loading logic #1364

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Stefterv wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Refactor locale resource loading logic #1364

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 11 additions & 15 deletions app/src/processing/app/ui/theme/Locale.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import processing.app.Messages
import processing.app.watchFile
import processing.utils.Settings
import java.io.File
import java.io.InputStream
import java.util.*

/**
Expand All @@ -26,21 +25,18 @@ import java.util.*
class Locale(language: String = "", val setLocale: ((java.util.Locale) -> Unit)? = null) : Properties() {
var locale: java.util.Locale = java.util.Locale.getDefault()

fun loadResource(resourcePath: String) {
val stream = ClassLoader.getSystemResourceAsStream(resourcePath) ?: return
load(stream.reader(Charsets.UTF_8))
}

init {
val locale = java.util.Locale.getDefault()
load(ClassLoader.getSystemResourceAsStream("languages/PDE.properties"))
load(
ClassLoader.getSystemResourceAsStream("languages/PDE_${locale.language}.properties")
?: InputStream.nullInputStream()
)
load(
ClassLoader.getSystemResourceAsStream("languages/PDE_${locale.toLanguageTag()}.properties")
?: InputStream.nullInputStream()
)
load(
ClassLoader.getSystemResourceAsStream("languages/PDE_${language}.properties")
?: InputStream.nullInputStream()
)
loadResource("languages/PDE.properties")
loadResource("languages/PDE_${locale.language}.properties")
loadResource("languages/PDE_${locale.toLanguageTag()}.properties")
if (language.isNotEmpty()) {
loadResource("languages/PDE_${language}.properties")
}
}

@Deprecated("Use get instead", ReplaceWith("get(key)"))
Expand Down