Skip to content

fix: localize user-facing and accessibility text (2/3) #6025

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

Merged
2dust merged 6 commits into from
Aug 7, 2026
Merged

fix: localize user-facing and accessibility text (2/3) #6025

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1119f46
fix: localize UI and accessibility text
eliotcougar Aug 5, 2026
1f83c07
fix: translate BQI core errors
eliotcougar Aug 5, 2026
fba58ad
fix: correct Bakhtiari orthography and wording
eliotcougar Aug 5, 2026
77bea8f
fix: keep protocol description technical
eliotcougar Aug 6, 2026
5f7c8dc
fix: keep Logcat diagnostics unlocalized
eliotcougar Aug 6, 2026
7621f05
getRemoteIPInfo
2dust Aug 7, 2026
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
36 changes: 31 additions & 5 deletions V2rayNG/app/src/main/java/com/v2ray/ang/core/CoreConfigManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import android.text.TextUtils
import com.google.gson.JsonArray
import com.google.gson.JsonObject
import com.v2ray.ang.AppConfig
import com.v2ray.ang.R
import com.v2ray.ang.dto.ConfigResult
import com.v2ray.ang.dto.CoreConfigContext
import com.v2ray.ang.dto.V2rayConfig
Expand Down Expand Up @@ -34,17 +35,27 @@ object CoreConfigManager {
fun getV2rayConfig(context: Context, guid: String): ConfigResult {
try {
val configContext = CoreConfigContextBuilder.build(context, guid)
?: return ConfigResult(status = false, guid = guid, errorMessage = "Failed to build config context")
?: return ConfigResult(
status = false,
guid = guid,
errorMessage = "Failed to build config context",
displayMessage = context.getString(R.string.core_error_build_config_context)
)
if (configContext.isCustom) {
return buildV2rayCustomConfig(configContext)
}
return toConfigResult(configContext, buildUnifiedConfig(configContext))
} catch (e: Exception) {
LogUtil.e(AppConfig.TAG, "Failed to get V2ray config", e)
val detail = e.message ?: e.javaClass.simpleName
return ConfigResult(
status = false,
guid = guid,
errorMessage = "Failed to get V2ray config: ${e.message ?: e.javaClass.simpleName}"
errorMessage = "Failed to get V2ray config: $detail",
displayMessage = context.getString(
R.string.core_error_get_config_detail,
detail
)
)
}
}
Expand All @@ -57,7 +68,12 @@ object CoreConfigManager {
fun getV2rayConfig4Speedtest(context: Context, guid: String): ConfigResult {
try {
val configContext = CoreConfigContextBuilder.build(context, guid)
?: return ConfigResult(status = false, guid = guid, errorMessage = "Failed to build config context")
?: return ConfigResult(
status = false,
guid = guid,
errorMessage = "Failed to build config context",
displayMessage = context.getString(R.string.core_error_build_config_context)
)
if (configContext.isCustom) {
return buildV2rayCustomConfig(configContext)
}
Expand All @@ -67,10 +83,15 @@ object CoreConfigManager {
return toConfigResult(configContext, v2rayConfig)
} catch (e: Exception) {
LogUtil.e(AppConfig.TAG, "Failed to get V2ray config for speedtest", e)
val detail = e.message ?: e.javaClass.simpleName
return ConfigResult(
status = false,
guid = guid,
errorMessage = "Failed to get V2ray config for speedtest: ${e.message ?: e.javaClass.simpleName}"
errorMessage = "Failed to get V2ray config for speedtest: $detail",
displayMessage = context.getString(
R.string.core_error_get_speedtest_config_detail,
detail
)
)
}
}
Expand All @@ -81,7 +102,12 @@ object CoreConfigManager {
private fun buildV2rayCustomConfig(configContext: CoreConfigContext): ConfigResult {
val context = configContext.context
val raw = MmkvManager.decodeServerRaw(configContext.guid)
?: return ConfigResult(status = false, guid = configContext.guid, errorMessage = "Custom config is empty")
?: return ConfigResult(
status = false,
guid = configContext.guid,
errorMessage = "Custom config is empty",
displayMessage = context.getString(R.string.core_error_custom_config_empty)
)
val result = ConfigResult(true, configContext.guid, raw)

val json = JsonUtil.parseString(raw)?.takeIf { it.isJsonObject }?.asJsonObject ?: return result
Expand Down
4 changes: 2 additions & 2 deletions V2rayNG/app/src/main/java/com/v2ray/ang/core/CoreNativeManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,12 @@ object CoreNativeManager {
*
* @return Version string of the V2Ray core
*/
fun getLibVersion(): String {
fun getLibVersion(): String? {
return try {
Libv2ray.checkVersionX()
} catch (e: Exception) {
LogUtil.e(AppConfig.TAG, "Failed to check V2Ray version", e)
"Unknown"
null
}
}

Expand Down
54 changes: 44 additions & 10 deletions V2rayNG/app/src/main/java/com/v2ray/ang/core/CoreServiceManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,11 @@ object CoreServiceManager {
/** Tun descriptor the core was started with, null in the proxy only and root run modes. */
private var currentVpnInterface: ParcelFileDescriptor? = null

private class CoreStartException(
logMessage: String,
val displayMessage: String,
) : IllegalStateException(logMessage)

var serviceControl: SoftReference<ServiceControl>? = null
set(value) {
field = value
Expand Down Expand Up @@ -96,15 +101,22 @@ object CoreServiceManager {
try {
doStartCoreLoop(service, vpnInterface)
return true
} catch (e: CoreStartException) {
reportCoreStartFailure(service, e.message.orEmpty(), e.displayMessage, e)
return false
} catch (e: Exception) {
val message = e.message?.takeUnless { it.isBlank() } ?: e.javaClass.simpleName
LogUtil.e(AppConfig.TAG, "StartCore-Manager: $message", e)
MessageHelper.sendMsg2UI(service, AppConfig.MSG_STATE_START_FAILURE, message)
NotificationManager.cancelNotification()
reportCoreStartFailure(service, message, message, e)
return false
}
}

private fun reportCoreStartFailure(service: Service, logMessage: String, displayMessage: String, error: Throwable) {
LogUtil.e(AppConfig.TAG, "StartCore-Manager: $logMessage", error)
MessageHelper.sendMsg2UI(service, AppConfig.MSG_STATE_START_FAILURE, displayMessage)
NotificationManager.cancelNotification()
}

@Throws(Exception::class)
private fun doStartCoreLoop(service: Service, vpnInterface: ParcelFileDescriptor?) {
val mFilter = IntentFilter(AppConfig.BROADCAST_ACTION_SERVICE)
Expand All @@ -120,14 +132,27 @@ object CoreServiceManager {

@Throws(Exception::class)
private fun launchCore(service: Service, vpnInterface: ParcelFileDescriptor?, isReload: Boolean = false) {
val guid = MmkvManager.getSelectServer() ?: error("No server selected")
val config = MmkvManager.decodeServerConfig(guid) ?: error("Failed to decode server config")
val guid = MmkvManager.getSelectServer()

@2dust 2dust Aug 6, 2026

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

我认为 core 里面这些字符串不应该处理。
因为这些有部分是会写入logcat ，这样会导致 log 中出现非英文内容； 且提示了给用户，用户也看不明白。

@eliotcougar eliotcougar Aug 6, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we can separate user-visible error text and Logcat error text? See the new commit.

@2dust 2dust Aug 7, 2026

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

看到了。
完全没有必要做的这样复杂，用户无需知道这么详细的错误信息；应该直接在最后提示启动失败，然后去查看日志，因为日志中才会有完整的内容。

@2dust 2dust Aug 7, 2026

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

另外，这种单例和服务代码中，尽量还是不引入 string ，原来已有的地方也要考虑移除掉。

@eliotcougar eliotcougar Aug 7, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

另外，这种单例和服务代码中，尽量还是不引入 string ，原来已有的地方也要考虑移除掉。

Got it. I'll see what is left in terms of localization tomorrow. Looks like part 3 won't add anything. I'll probably just clean up unused strings added in part 2, and compile it to see how everything fits. Then we can call localization audit complete.

?: throw CoreStartException(
logMessage = "No server selected",
displayMessage = service.getString(R.string.core_error_no_server_selected)
)
val config = MmkvManager.decodeServerConfig(guid)
?: throw CoreStartException(
logMessage = "Failed to decode server config",
displayMessage = service.getString(R.string.core_error_decode_server_config)
)

LogUtil.i(AppConfig.TAG, "StartCore-Manager: Starting core loop for ${config.remarks}")
val result = CoreConfigManager.getV2rayConfig(service, guid)
LogUtil.d(AppConfig.TAG, result.content)
if (!result.status) {
error(result.errorMessage.ifBlank { "Failed to get V2Ray config" })
throw CoreStartException(
logMessage = result.errorMessage.ifBlank { "Failed to get V2Ray config" },
displayMessage = result.displayMessage.ifBlank {
service.getString(R.string.core_error_get_config)
}
)
}

currentConfig = config
Expand All @@ -149,7 +174,10 @@ object CoreServiceManager {
coreController.startLoop(result.content, tunFd)

if (!isRunning()) {
error("Core failed to start")
throw CoreStartException(
logMessage = "Core failed to start",
displayMessage = service.getString(R.string.core_error_start)
)
}

if (browserDialer != null) {
Expand Down Expand Up @@ -260,6 +288,10 @@ object CoreServiceManager {

LogUtil.i(AppConfig.TAG, "StartCore-Manager: Core reload finished")
true
} catch (e: CoreStartException) {
LogUtil.e(AppConfig.TAG, "StartCore-Manager: Failed to reload core: ${e.message}", e)
MessageHelper.sendMsg2UI(service, AppConfig.MSG_STATE_START_FAILURE, e.displayMessage)
false
} catch (e: Exception) {
val message = e.message?.takeUnless { it.isBlank() } ?: e.javaClass.simpleName
LogUtil.e(AppConfig.TAG, "StartCore-Manager: Failed to reload core: $message", e)
Expand Down Expand Up @@ -321,14 +353,16 @@ object CoreServiceManager {
time = coreController.measureDelay(SettingsManager.getDelayTestUrl())
} catch (e: Exception) {
LogUtil.e(AppConfig.TAG, "StartCore-Manager: Failed to measure delay", e)
errorStr = e.message?.substringAfter("\":") ?: "empty message"
errorStr = e.message?.substringAfter("\":")
?: service.getString(R.string.connection_test_empty_message)
}
if (time == -1L) {
try {
time = coreController.measureDelay(SettingsManager.getDelayTestUrl(true))
} catch (e: Exception) {
LogUtil.e(AppConfig.TAG, "StartCore-Manager: Failed to measure delay", e)
errorStr = e.message?.substringAfter("\":") ?: "empty message"
errorStr = e.message?.substringAfter("\":")
?: service.getString(R.string.connection_test_empty_message)
}
}

Expand Down Expand Up @@ -492,4 +526,4 @@ object CoreServiceManager {
}
}
}
}
}
3 changes: 3 additions & 0 deletions V2rayNG/app/src/main/java/com/v2ray/ang/dto/ConfigResult.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ data class ConfigResult(
var status: Boolean,
var guid: String? = null,
var content: String = "",
/** Stable English diagnostic text suitable for Logcat. */
var errorMessage: String = "",
/** Localized message suitable for the UI. */
var displayMessage: String = "",
)

13 changes: 8 additions & 5 deletions V2rayNG/app/src/main/java/com/v2ray/ang/enums/PermissionType.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ package com.v2ray.ang.enums
import android.Manifest
import android.os.Build
import androidx.annotation.RequiresApi
import androidx.annotation.StringRes
import com.v2ray.ang.R

/**
* Permission types used in the app, handling API level differences.
Expand All @@ -28,12 +30,13 @@ enum class PermissionType {
/** Return the actual Android permission string */
abstract fun getPermission(): String

/** Return a human-readable label for the permission */
fun getLabel(): String {
/** Return the string resource for the human-readable permission label. */
@StringRes
fun getLabelRes(): Int {
return when (this) {
CAMERA -> "Camera"
POST_NOTIFICATIONS -> "Notification"
ACCESS_LOCAL_NETWORK -> "Local Network"
CAMERA -> R.string.permission_camera
POST_NOTIFICATIONS -> R.string.permission_notification
ACCESS_LOCAL_NETWORK -> R.string.permission_local_network
}
}
}
5 changes: 4 additions & 1 deletion V2rayNG/app/src/main/java/com/v2ray/ang/helper/PermissionHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,10 @@ class PermissionHelper(private val activity: ComponentActivity) {
if (isGranted) {
onGranted()
} else {
val message = "${activity.getString(R.string.toast_permission_denied)} ${permissionType.getLabel()}"
val message = activity.getString(
R.string.toast_permission_denied_for,
activity.getString(permissionType.getLabelRes())
)
activity.toast(message)
}
}
Expand Down
12 changes: 8 additions & 4 deletions V2rayNG/app/src/main/java/com/v2ray/ang/service/SubscriptionUpdateService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ class SubscriptionUpdateService : Service() {
showNotification(
context = this,
titleResId = R.string.title_pref_auto_update_subscription,
content = "Updating ${subItem.remarks}"
content = getString(R.string.subscription_update_updating, subItem.remarks)
)

if (forcedUpdate || MmkvManager.decodeSettingsBool(AppConfig.PREF_UPDATE_SUBSCRIPTION, false)) {
Expand Down Expand Up @@ -184,13 +184,17 @@ class SubscriptionUpdateService : Service() {
private fun handleWorkerEvent(event: RealPingEvent, remarks: String, onWorkerDone: () -> Unit) {
when (event) {
is RealPingEvent.Progress -> {
val text = "${event.text} in $remarks"
val notificationText = getString(
R.string.subscription_update_progress,
event.text,
remarks
)
showNotification(
context = this,
titleResId = R.string.title_real_ping_all_server,
content = text
content = notificationText
)
LogUtil.i(AppConfig.TAG, "SubscriptionUpdateService: $text")
LogUtil.i(AppConfig.TAG, "SubscriptionUpdateService: ${event.text} in $remarks")
}

is RealPingEvent.Result -> {
Expand Down
3 changes: 2 additions & 1 deletion V2rayNG/app/src/main/java/com/v2ray/ang/ui/AboutActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ fun AboutScreen(onBackClick: () -> Unit) {
val context = LocalContext.current
var showOssDialog by remember { mutableStateOf(false) }

val versionText = "v${BuildConfig.VERSION_NAME} (${CoreNativeManager.getLibVersion()})"
val libVersion = CoreNativeManager.getLibVersion() ?: stringResource(R.string.value_unknown)
val versionText = "v${BuildConfig.VERSION_NAME} ($libVersion)"
val appIdText = BuildConfig.APPLICATION_ID

Scaffold(
Expand Down
13 changes: 9 additions & 4 deletions V2rayNG/app/src/main/java/com/v2ray/ang/ui/ScannerActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,9 @@ fun ScannerScreen(
if (isScanning) R.drawable.ic_stop_24dp
else R.drawable.ic_scan_24dp
),
contentDescription = if (isScanning) "stop scan" else "start scan"
contentDescription = stringResource(
if (isScanning) R.string.acc_stop_scanner else R.string.acc_start_scanner
)
)
}
if (isScanning && hasTorch) {
Expand All @@ -194,14 +196,17 @@ fun ScannerScreen(
if (torchEnabled) R.drawable.ic_flash_on_24dp
else R.drawable.ic_flash_off_24dp
),
contentDescription = "Torch"
contentDescription = stringResource(
if (torchEnabled) R.string.acc_turn_torch_off
else R.string.acc_turn_torch_on
)
)
}
}
IconButton(onClick = onSelectPhoto) {
Icon(
painterResource(R.drawable.ic_image_24dp),
contentDescription = "select image"
contentDescription = stringResource(R.string.acc_select_image)
)
}
}
Expand Down Expand Up @@ -245,7 +250,7 @@ private fun ScannerIdlePlaceholder(onStartClick: () -> Unit) {
Column(horizontalAlignment = Alignment.CenterHorizontally) {
Icon(
painter = painterResource(R.drawable.ic_scan_24dp),
contentDescription = "Start Scanner",
contentDescription = stringResource(R.string.acc_start_scanner),
modifier = Modifier.size(80.dp),
tint = MaterialTheme.colorScheme.primary
)
Expand Down
2 changes: 1 addition & 1 deletion V2rayNG/app/src/main/java/com/v2ray/ang/ui/apppicker/AppPickerActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ fun AppPickerScreen(
IconButton(onClick = { showSearch = true }) {
Icon(
painterResource(R.drawable.ic_search_24dp),
contentDescription = stringResource(R.string.menu_item_search)
contentDescription = stringResource(R.string.acc_search)
)
}
}
Expand Down
3 changes: 2 additions & 1 deletion V2rayNG/app/src/main/java/com/v2ray/ang/ui/checkupdate/CheckUpdateActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,8 @@ fun CheckUpdateScreen(
val showUpdateDialog by viewModel.showUpdateDialog.collectAsStateWithLifecycle()
val updateResult by viewModel.updateResult.collectAsStateWithLifecycle()

val versionText = "v${BuildConfig.VERSION_NAME} (${CoreNativeManager.getLibVersion()})"
val libVersion = CoreNativeManager.getLibVersion() ?: stringResource(R.string.value_unknown)
val versionText = "v${BuildConfig.VERSION_NAME} ($libVersion)"

Scaffold(
contentWindowInsets = ScaffoldDefaults.contentWindowInsets,
Expand Down
3 changes: 2 additions & 1 deletion V2rayNG/app/src/main/java/com/v2ray/ang/ui/compose/Components.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ import androidx.compose.ui.hapticfeedback.HapticFeedbackType
import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.platform.LocalHapticFeedback
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.input.ImeAction
import androidx.compose.ui.text.style.TextOverflow
Expand Down Expand Up @@ -91,7 +92,7 @@ fun AppTopBar(
IconButton(onClick = if (isSearchActive) onSearchClose else onBackClick) {
Icon(
painter = painterResource(R.drawable.ic_arrow_back_24dp),
contentDescription = "Back"
contentDescription = stringResource(R.string.acc_back)
)
}
}
Expand Down
2 changes: 1 addition & 1 deletion V2rayNG/app/src/main/java/com/v2ray/ang/ui/compose/Dialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ fun QRCodeDialog(
text = {
Image(
bitmap = bitmap.asImageBitmap(),
contentDescription = stringResource(R.string.title_qr_code),
contentDescription = stringResource(R.string.acc_qr_code),
modifier = Modifier
.fillMaxWidth()
.aspectRatio(1f)
Expand Down
Loading