Skip to content

Commit ad03e6a

Browse files
committed
Fix compose Locale
1 parent 023bfd2 commit ad03e6a

File tree

1 file changed

+13
-5
lines changed

1 file changed

+13
-5
lines changed

app/src/processing/app/ui/theme/Locale.kt

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package processing.app.ui.theme
33
import androidx.compose.runtime.Composable
44
import androidx.compose.runtime.CompositionLocalProvider
55
import androidx.compose.runtime.compositionLocalOf
6-
import processing.app.LocalPreferences
76
import processing.app.Messages
87
import processing.app.Platform
98
import processing.app.PlatformStart
@@ -15,10 +14,19 @@ import java.util.*
1514
class Locale(language: String = "") : Properties() {
1615
init {
1716
val locale = java.util.Locale.getDefault()
18-
load(ClassLoader.getSystemResourceAsStream("PDE.properties"))
19-
load(ClassLoader.getSystemResourceAsStream("PDE_${locale.language}.properties") ?: InputStream.nullInputStream())
20-
load(ClassLoader.getSystemResourceAsStream("PDE_${locale.toLanguageTag()}.properties") ?: InputStream.nullInputStream())
21-
load(ClassLoader.getSystemResourceAsStream("PDE_${language}.properties") ?: InputStream.nullInputStream())
17+
load(ClassLoader.getSystemResourceAsStream("languages/PDE.properties"))
18+
load(
19+
ClassLoader.getSystemResourceAsStream("languages/PDE_${locale.language}.properties")
20+
?: InputStream.nullInputStream()
21+
)
22+
load(
23+
ClassLoader.getSystemResourceAsStream("languages/PDE_${locale.toLanguageTag()}.properties")
24+
?: InputStream.nullInputStream()
25+
)
26+
load(
27+
ClassLoader.getSystemResourceAsStream("languages/PDE_${language}.properties")
28+
?: InputStream.nullInputStream()
29+
)
2230
}
2331

2432
@Deprecated("Use get instead", ReplaceWith("get(key)"))

0 commit comments

Comments
 (0)