Fix translate

SagerNet · Dec 15, 2024 · 9e6faba · 9e6faba
1 parent fe4aa57
commit 9e6faba
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/app/src/main/java/io/nekohasekai/sfa/Application.kt b/app/src/main/java/io/nekohasekai/sfa/Application.kt
@@ -31,7 +31,7 @@ class Application : Application() {
         super.onCreate()
 
         Seq.setContext(this)
-        Libbox.setLocale(Locale.getDefault().toLanguageTag())
+        Libbox.setLocale(Locale.getDefault().toLanguageTag().replace("-", "_"))
 
         @Suppress("OPT_IN_USAGE")
         GlobalScope.launch(Dispatchers.IO) {

diff --git a/app/src/main/java/io/nekohasekai/sfa/ui/profile/NewProfileActivity.kt b/app/src/main/java/io/nekohasekai/sfa/ui/profile/NewProfileActivity.kt
@@ -1,9 +1,11 @@
 package io.nekohasekai.sfa.ui.profile
 
+import android.content.Context
 import android.net.Uri
 import android.os.Bundle
 import android.view.View
 import androidx.activity.result.contract.ActivityResultContracts
+import androidx.annotation.StringRes
 import androidx.core.view.isVisible
 import androidx.lifecycle.lifecycleScope
 import io.nekohasekai.libbox.Libbox
@@ -29,9 +31,13 @@ import java.io.InputStream
 import java.util.Date
 
 class NewProfileActivity : AbstractActivity<ActivityAddProfileBinding>() {
-    enum class FileSource(val formatted: String) {
-        CreateNew("Create New"),
-        Import("Import");
+    enum class FileSource(@StringRes val formattedRes: Int) {
+        CreateNew(R.string.profile_source_create_new),
+        Import(R.string.profile_source_import);
+
+        fun formatted(context: Context): String {
+            return context.getString(formattedRes)
+        }
     }
 
     private val importFile =
@@ -76,12 +82,12 @@ class NewProfileActivity : AbstractActivity<ActivityAddProfileBinding>() {
         }
         binding.fileSourceMenu.addTextChangedListener {
             when (it) {
-                FileSource.CreateNew.formatted -> {
+                FileSource.CreateNew.formatted(this) -> {
                     binding.importFileButton.isVisible = false
                     binding.sourceURL.isVisible = false
                 }
 
-                FileSource.Import.formatted -> {
+                FileSource.Import.formatted(this) -> {
                     binding.importFileButton.isVisible = true
                     binding.sourceURL.isVisible = true
                 }
@@ -101,7 +107,7 @@ class NewProfileActivity : AbstractActivity<ActivityAddProfileBinding>() {
         when (binding.type.text) {
             TypedProfile.Type.Local.getString(this) -> {
                 when (binding.fileSourceMenu.text) {
-                    FileSource.Import.formatted -> {
+                    FileSource.Import.formatted(this) -> {
                         if (binding.sourceURL.showErrorIfEmpty()) {
                             return
                         }
@@ -142,11 +148,11 @@ class NewProfileActivity : AbstractActivity<ActivityAddProfileBinding>() {
                 typedProfile.type = TypedProfile.Type.Local
 
                 when (binding.fileSourceMenu.text) {
-                    FileSource.CreateNew.formatted -> {
+                    FileSource.CreateNew.formatted(this) -> {
                         configFile.writeText("{}")
                     }
 
-                    FileSource.Import.formatted -> {
+                    FileSource.Import.formatted(this) -> {
                         val sourceURL = binding.sourceURL.text
                         val content = if (sourceURL.startsWith("content://")) {
                             val inputStream =

diff --git a/app/src/main/java/io/nekohasekai/sfa/utils/HTTPClient.kt b/app/src/main/java/io/nekohasekai/sfa/utils/HTTPClient.kt
@@ -4,6 +4,7 @@ import io.nekohasekai.libbox.Libbox
 import io.nekohasekai.sfa.BuildConfig
 import io.nekohasekai.sfa.ktx.unwrap
 import java.io.Closeable
+import java.util.Locale
 
 class HTTPClient : Closeable {
 
@@ -15,6 +16,8 @@ class HTTPClient : Closeable {
             userAgent += BuildConfig.VERSION_CODE
             userAgent += "; sing-box "
             userAgent += Libbox.version()
+            userAgent += "; language "
+            userAgent += Locale.getDefault().toLanguageTag().replace("-", "_")
             userAgent += ")"
             userAgent
         }