Skip to content

Fix Korean locale wiring and translation issues #113

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
sampple-korea wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix Korean locale wiring and translation issues #113

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions android/app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
android:icon="@mipmap/launcher_icon"
android:roundIcon="@mipmap/launcher_icon"
android:enableOnBackInvokedCallback="true"
android:localeConfig="@xml/locales_config"
>
<activity
android:name=".MainActivity"
Expand Down
10 changes: 5 additions & 5 deletions android/app/src/main/assets/liveupdate_dictionary_ko.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@
],
"status_labels": {
"food": {
"en": {
"ko": {
"0": "결제 완료",
"1": "조리 중",
"2": "배달 시작",
Expand All @@ -355,7 +355,7 @@
}
},
"taxi": {
"en": {
"ko": {
"0": "탐색 중",
"1": "탐색 완료",
"2": "접근 중",
Expand All @@ -364,21 +364,21 @@
}
},
"navigation": {
"en": {
"ko": {
"1": "길안내 시작",
"2": "이동 중",
"3": "곧 하차",
"4": "도착"
}
},
"external_device": {
"en": {
"ko": {
"1": "연결 중",
"2": "연결됨"
}
},
"vpn": {
"en": {
"ko": {
"1": "VPN"
}
}
Expand Down
10 changes: 8 additions & 2 deletions android/app/src/main/kotlin/com/appsfolder/livebridge/liveupdate/ConverterPrefs.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,6 +613,7 @@ class ConverterPrefs(context: Context) {
.remove(KEY_PARSER_DICTIONARY_EN_OVERRIDE)
.remove(KEY_PARSER_DICTIONARY_RU_OVERRIDE)
.remove(KEY_PARSER_DICTIONARY_ZH_OVERRIDE)
.remove(KEY_PARSER_DICTIONARY_KO_OVERRIDE)
.apply()
}

Expand Down Expand Up @@ -662,6 +663,7 @@ class ConverterPrefs(context: Context) {
.remove(KEY_PARSER_DICTIONARY_EN_OVERRIDE)
.remove(KEY_PARSER_DICTIONARY_RU_OVERRIDE)
.remove(KEY_PARSER_DICTIONARY_ZH_OVERRIDE)
.remove(KEY_PARSER_DICTIONARY_KO_OVERRIDE)
.apply()
}

Expand Down Expand Up @@ -1067,6 +1069,7 @@ class ConverterPrefs(context: Context) {
"en" -> KEY_PARSER_DICTIONARY_EN_OVERRIDE
"ru" -> KEY_PARSER_DICTIONARY_RU_OVERRIDE
"zh" -> KEY_PARSER_DICTIONARY_ZH_OVERRIDE
"ko" -> KEY_PARSER_DICTIONARY_KO_OVERRIDE
else -> null
}
}
Expand Down Expand Up @@ -1173,6 +1176,8 @@ class ConverterPrefs(context: Context) {
"parser_dictionary_ru_override"
private const val KEY_PARSER_DICTIONARY_ZH_OVERRIDE =
"parser_dictionary_zh_override"
private const val KEY_PARSER_DICTIONARY_KO_OVERRIDE =
"parser_dictionary_ko_override"

private const val KEY_PACKAGE_FILTER_LEGACY = "package_filter"
private const val MIN_AOSP_CUTTING_LENGTH = 7
Expand All @@ -1185,7 +1190,8 @@ class ConverterPrefs(context: Context) {
private const val MAX_CONVERSION_LOG_MAX_BYTES = 25 * 1024 * 1024
private const val DEFAULT_CONVERSION_LOG_MAX_BYTES = 5 * 1024 * 1024
private val SUPPORTED_PARSER_DICTIONARY_LANGUAGE_IDS =
setOf("en", "ru", "zh")
private val DEFAULT_PARSER_DICTIONARY_LANGUAGE_IDS = setOf("en", "ru", "zh")
setOf("en", "ru", "zh", "ko")
private val DEFAULT_PARSER_DICTIONARY_LANGUAGE_IDS =
setOf("en", "ru", "zh", "ko")
}
}
10 changes: 10 additions & 0 deletions android/app/src/main/res/xml/locales_config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<locale-config xmlns:android="http://schemas.android.com/apk/res/android">
<locale android:name="en" />
<locale android:name="ru" />
<locale android:name="tr" />
<locale android:name="pt-BR" />
<locale android:name="zh-Hans" />
<locale android:name="zh-Hant" />
<locale android:name="ko" />
</locale-config>
48 changes: 24 additions & 24 deletions lib/l10n/app_strings.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ class AppStrings {
ptBr: 'Backup e restauração',
zhHans: '备份与恢复',
zhHant: '備份與還原',
ko: '백업 & 복구',
ko: '백업 및 복구',
);

String get exportLiveBridgeSettingsTitle => tr(
Expand Down Expand Up @@ -394,7 +394,7 @@ class AppStrings {
ptBr: 'Falha ao exportar configurações do LiveBridge.',
zhHans: '导出 LiveBridge 设置失败。',
zhHant: '匯出 LiveBridge 設定失敗。',
ko: 'LiveBridge 설정을 내보낼 수 없습니다.',
ko: 'LiveBridge 설정을 내보내지 못했습니다.',
);

String get liveBridgeSettingsImported => tr(
Expand All @@ -414,7 +414,7 @@ class AppStrings {
ptBr: 'Falha ao importar configurações do LiveBridge.',
zhHans: '导入 LiveBridge 设置失败。',
zhHant: '匯入 LiveBridge 設定失敗。',
ko: 'LiveBridge 설정을 불러올 수 없습니다.',
ko: 'LiveBridge 설정을 불러오지 못했습니다.',
);

String get copyOldDebugJsonFirst => tr(
Expand All @@ -424,7 +424,7 @@ class AppStrings {
ptBr: 'copie seu debug JSON antigo primeiro',
zhHans: '请先复制旧的 debug JSON',
zhHant: '請先複製舊的 debug JSON',
ko: '구버전 debug JSON을 먼저 복사해주세요',
ko: '먼저 이전 debug JSON을 복사해 주세요',
);

String get appLanguageTitle => tr(
Expand Down Expand Up @@ -524,7 +524,7 @@ class AppStrings {
ptBr: 'tópicos do Telegram',
zhHans: 'telegram 话题',
zhHant: 'telegram 話題',
ko: '텔레그램 주제',
ko: 'Telegram 토픽',
);

String get rulesModeAllApps => tr(
Expand Down Expand Up @@ -554,7 +554,7 @@ class AppStrings {
ptBr: 'excluir selecionados',
zhHans: '排除已选择',
zhHant: '排除已選取',
ko: '선택합 앱만 제외',
ko: '선택한 앱만 제외',
);

String get permissionCheckRequired => tr(
Expand Down Expand Up @@ -734,7 +734,7 @@ class AppStrings {
ptBr: '(exp)',
zhHans: '（实验）',
zhHant: '（實驗）',
ko: '(불안정)',
ko: '(실험)',
);

String get allAppsTitle => tr(
Expand Down Expand Up @@ -944,7 +944,7 @@ class AppStrings {
ptBr: 'Configurações por app',
zhHans: '按应用设置',
zhHant: '各應用設定',
ko: '앱 별 설정',
ko: '앱별 설정',
);

String get defaultsTitle => tr(
Expand Down Expand Up @@ -1004,7 +1004,7 @@ class AppStrings {
ptBr: 'Origem do título',
zhHans: '标题来源',
zhHant: '標題來源',
ko: '제목',
ko: '제목 소스',
);

String get contentSourceTitle => tr(
Expand All @@ -1014,7 +1014,7 @@ class AppStrings {
ptBr: 'Origem do conteúdo',
zhHans: '内容来源',
zhHant: '內容來源',
ko: '내용',
ko: '내용 소스',
);

String get notificationTitleOption => tr(
Expand Down Expand Up @@ -1074,7 +1074,7 @@ class AppStrings {
ptBr: 'Tudo pronto',
zhHans: '已是最新',
zhHant: '已是最新',
ko: '준비 완료',
ko: '최신 상태',
);

String get appUpdateDownloadsSubtitle => tr(
Expand Down Expand Up @@ -1104,7 +1104,7 @@ class AppStrings {
ptBr: 'já está na versão mais recente',
zhHans: '已经是最新版本',
zhHant: '已是最新版本',
ko: '최신 버전이 준비됨',
ko: '이미 최신 버전입니다',
);

String get appUpdateLogTitle => tr(
Expand Down Expand Up @@ -1214,7 +1214,7 @@ class AppStrings {
ptBr: 'Tamanho do log',
zhHans: '日志大小',
zhHant: '記錄大小',
ko: '로그 크가',
ko: '로그 크기',
);

String get xiaomiHyperIslandTitle => tr(
Expand Down Expand Up @@ -1345,7 +1345,7 @@ class AppStrings {
ptBr: 'de $appLabel',
zhHans: '来自 $appLabel',
zhHant: '來自 $appLabel',
ko: '출처: ',
ko: '$appLabel 앱에서',
);

String conversionLogAt(String time) => tr(
Expand All @@ -1355,7 +1355,7 @@ class AppStrings {
ptBr: 'às $time',
zhHans: time,
zhHant: time,
ko: '시간: ',
ko: '$time',
);

String get conversionLogEntryTitleLabel => tr(
Expand Down Expand Up @@ -1395,7 +1395,7 @@ class AppStrings {
ptBr: 'Buscar apps...',
zhHans: '搜索应用...',
zhHant: '搜尋應用程式...',
ko: '앱을 검색하는 중...',
ko: '앱 검색...',
);

String get heroTitle => 'LiveBridge';
Expand All @@ -1407,7 +1407,7 @@ class AppStrings {
ptBr: 'Reportar um bug',
zhHans: '报告问题',
zhHant: '回報問題',
ko: '버그 제보',
ko: '버그 제보하기',
);

String get supportLiveBridgeTitle => tr(
Expand Down Expand Up @@ -1438,7 +1438,7 @@ class AppStrings {
'Doações são opcionais e não desbloqueiam recursos. Elas ajudam com aparelhos de teste e tempo de desenvolvimento.',
zhHans: '捐赠是自愿的，不会解锁功能。它们用于测试设备和开发时间。',
zhHant: '捐贈是自願的，不會解鎖功能。它們用於測試裝置和開發時間。',
ko: '기부는 선택이며 별도의 기능을 해금하지 않으며 개발자의 기기 테스트 및 개발에 사용됩니다.',
ko: '기부는 선택 사항이며 기능을 잠금 해제하지 않습니다. 테스트 기기와 개발 시간에 보탬이 됩니다.',
);

String get supportBoostyTitle => tr(
Expand Down Expand Up @@ -1498,7 +1498,7 @@ class AppStrings {
ptBr: 'tópicos no telegram',
zhHans: 'telegram 话题',
zhHant: 'telegram 話題',
ko: '탤레그램 주제',
ko: 'Telegram 토픽',
);

String get supportGithubTitle => tr(
Expand All @@ -1508,7 +1508,7 @@ class AppStrings {
ptBr: 'GitHub',
zhHans: 'GitHub',
zhHant: 'GitHub',
ko: 'GitHub',
ko: 'GitHub에서 Star 주기',
);

String get supportGithubSubtitle => tr(
Expand Down Expand Up @@ -1578,7 +1578,7 @@ class AppStrings {
ptBr: 'Permitir acesso do app as notificações',
zhHans: '通知监听访问',
zhHant: '通知監聽存取',
ko: '알림 읽기 접근 권힌',
ko: '알림 읽기 접근 권한',
);

String get postNotifications => tr(
Expand Down Expand Up @@ -1688,7 +1688,7 @@ class AppStrings {
ptBr: 'Verificação de atualizações',
zhHans: '检查更新',
zhHant: '檢查更新',
ko: '업데이트 확인 중',
ko: '업데이트 확인',
);

String get updateChecksDescription => tr(
Expand Down Expand Up @@ -2030,7 +2030,7 @@ class AppStrings {
ptBr: 'oculta notificações de ADB e dispositivos de depuração',
zhHans: '隐藏 ADB 和调试设备通知',
zhHant: '隱藏 ADB 與偵錯裝置通知',
ko: 'ADB 및 디버깅 기기를 알림에서 숨깁니다.',
ko: 'ADB 및 디버깅 기기 알림을 숨깁니다.',
);

String get mediaPlaybackDescription => tr(
Expand Down Expand Up @@ -2194,7 +2194,7 @@ class AppStrings {
'oculta a Notificação ao vivo de velocidade de rede abaixo deste nível',
zhHans: '当网速低于此阈值时隐藏网络速度 Live Update',
zhHant: '當網速低於此門檻時隱藏網路速度 Live Update',
ko: '네트워크 속도 제한이 기준치 미만이면 숨깁니다.',
ko: '네트워크 트래픽이 기준치 미만이면 네트워크 속도 Live Update를 숨깁니다.',
);

String get xiaomiHyperIslandDescription => tr(
Expand Down