Przeglądaj źródła

Create a string resource for all strings of Russian-ru, Chinese-zh-CN and Japanese-ja for multi lingual, working across app

Khubaib 8 miesięcy temu
rodzic
commit
8bdaca4e1c

BIN
app/release/app-release.apk


+ 3 - 1
app/src/main/java/com/vpn/fastestvpnservice/beans/Dark_Light_Theme.kt

@@ -15,7 +15,9 @@ val languages = listOf<Language>(
     Language("Italian", "it"),
     Language("Polish", "pl"),
     Language("Russian", "ru"),
-)
+    Language("Chinese", "zh-CN"),
+    Language("Japanese", "ja"),
+    )
 
 var isDarkTheme: MutableState<Boolean> = mutableStateOf(false)
 

+ 9 - 7
app/src/main/java/com/vpn/fastestvpnservice/screens/bottomNavBarScreens/SettingsScreen.kt

@@ -247,9 +247,9 @@ fun Settings(navHostController: NavHostController, activity: ComponentActivity)
                     }
                 )
 
-//                SelectLanguage(icon = Icons.Default.Language, text = context.getString(R.string.language)) {
-//                    settingsString = it
-//                }
+                SelectLanguage(icon = Icons.Default.Language, text = context.getString(R.string.language)) {
+                    settingsString = it
+                }
 
                 if (isLaunched) {
                     AlertDialog(
@@ -1079,7 +1079,7 @@ fun SelectLanguage(
     changeLanguage: (String) -> Unit
 ) {
     var isLanguageSheetOpen by remember { mutableStateOf(false) }
-    val sheetState = rememberModalBottomSheetState()
+    val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
     val context = LocalContext.current
     val basePreferenceHelper = BasePreferenceHelper(context)
     var selectedLanguage by remember { mutableStateOf(basePreferenceHelper.getLanguage()) }
@@ -1162,13 +1162,15 @@ fun SelectLanguage(
                 )
             },
             sheetState = sheetState,
-            containerColor = MaterialTheme.colorScheme.onBackground
+            containerColor = MaterialTheme.colorScheme.onBackground,
+            modifier = Modifier
+                .padding(top = 15.dp)
+                .fillMaxSize()
         ) {
             Box(
                 modifier = Modifier
                     .background(Color.Transparent)
-                    .fillMaxWidth()
-                    .fillMaxHeight()
+                    .fillMaxSize()
                     .padding(start = 0.dp, top = 10.dp),
             ) {
                 Column(

+ 105 - 0
app/src/main/res/values-ja/strings.xml

@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Multi Lingual - (English-en) -->
+
+    <!-- Started Screen -->
+    <string name="secure_fast">安全。速い。安定しています。</string>
+    <string name="started_text_1">一流のセキュリティ、驚異的なスピード</string>
+    <string name="started_text_2">揺るぎない安定性。あなたのデジタル世界</string>
+    <string name="started_text_3">保護されています。</string>
+
+    <!-- Sign In Screen -->
+    <string name="signin">サインイン</string>
+    <string name="welcome_back">おかえりなさい!</string>
+    <string name="please_login">アカウントにログインしてください。</string>
+    <string name="password">パスワード</string>
+    <string name="forgot_pass">パスワードを忘れた場合</string>
+    <string name="dont_have_acc">アカウントをお持ちでない場合は?</string>
+
+    <!-- Sign Up Screen -->
+    <string name="signup">サインアップ</string>
+    <string name="hello_there">こんにちは!</string>
+    <string name="please_register">アカウントを登録してください。</string>
+    <string name="by_creating_acc">アカウントを作成すると、次のことに同意したことになります</string>
+    <string name="termsndcond">利用規約と条件</string>
+    <string name="already_have_acc">すでにアカウントをお持ちですか? </string>
+
+    <!-- Home Screen -->
+    <string name="change">変更</string>
+    <string name="see_all_locations">すべての場所を表示</string>
+    <string name="connecting">接続中…</string>
+    <string name="connected">接続済み</string>
+    <string name="disconnected">切断されました</string>
+    <string name="recommended">推奨</string>
+    <string name="recently">最近</string>
+    <string name="any_specific">任意の特定</string>
+
+    <!-- Settings Screen -->
+    <string name="app_name">最速VPN</string>
+    <string name="settings">設定</string>
+    <string name="vpn_protocols">VPN プロトコル</string>
+    <string name="smart_connect">スマート コネクト</string>
+    <string name="adblock">広告ブロック</string>
+    <string name="kill_switch">キルスイッチ</string>
+    <string name="split_tunneling">スプリット トンネリング</string>
+    <string name="notifcation">通知</string>
+    <string name="appearance">外観</string>
+    <string name="launch_on_startup">起動時に起動</string>
+    <string name="language">言語</string>
+    <string name="system_default">システムデフォルト</string>
+    <string name="light_mode">ライトモード</string>
+    <string name="dark_mode">ダークモード</string>
+    <string name="while_vpn_connected">VPN 接続中</string>
+    <string name="all_apps_use_vpn">すべてのアプリは VPN を使用します</string>
+    <string name="only_selected_apps_use_vpn">選択したアプリにのみ VPN の使用を許可します</string>
+    <string name="only_selected_apps_not_use_vpn">選択したアプリに VPN の使用を許可しない</string>
+
+    <!-- Help Screen -->
+    <string name="help">ヘルプ</string>
+    <string name="faq">よくある質問</string>
+    <string name="privacy_policy">プライバシー ポリシー</string>
+    <string name="terms_conditions">利用規約</string>
+    <string name="about_fastest_vpn">FastestVPN について</string>
+    <string name="customer_support">カスタマーサポート</string>
+    <string name="email_us">メールでお問い合わせ</string>
+    <string name="your_message">あなたのメッセージ</string>
+    <string name="message_field_req">メッセージ フィールドは必須です。</string>
+
+    <!-- Account Screen -->
+    <string name="account">アカウント</string>
+    <string name="email">メール</string>
+    <string name="product">製品</string>
+    <string name="account_status">アカウントのステータス</string>
+    <string name="upgrade_subscription">サブスクリプションのアップグレード</string>
+    <string name="favorite_servers">お気に入りのサーバー</string>
+    <string name="change_password">パスワードを変更</string>
+    <string name="logout">ログアウト</string>
+    <string name="subscription">サブスクリプション</string>
+    <string name="upgrade_account">アカウントをアップグレードする</string>
+    <string name="subscribe">購読</string>
+    <string name="current_pass">現在のパスワード</string>
+    <string name="new_pass">新しいパスワード</string>
+    <string name="rewrite_new_pass">新しいパスワードを書き換えます</string>
+    <string name="save">保存</string>
+    <string name="delete_account">アカウントを削除</string>
+    <string name="sure_delete_account">アカウントを削除してもよろしいですか?</string>
+    <string name="logout_account">ログアウト アカウント</string>
+    <string name="sure_logout_account">アカウントからログアウトしてもよろしいですか?</string>
+    <string name="no">いいえ</string>
+    <string name="yes">はい</string>
+
+    <!-- Server List Screen -->
+    <string name="select_location">場所を選択</string>
+    <string name="search_location">場所の検索</string>
+    <string name="all_locations">すべての場所</string>
+    <string name="locations">場所</string>
+    <string name="favorite_location">お気に入りの場所</string>
+    <string name="smart_location">スマート ロケーション</string>
+    <string name="recent_location">最近の場所</string>
+    <string name="recommended_location">推奨される場所</string>
+    <string name="sort_by">並べ替え基準</string>
+    <string name="popularity">人気</string>
+    <string name="alphabetically">アルファベット順</string>
+
+</resources>

+ 95 - 0
app/src/main/res/values-ru/strings.xml

@@ -4,7 +4,102 @@
     <!-- Multi Lingual - (Russian-ru) -->
 
     <!-- Started Screen -->
+    <string name="secure_fast">Безопасно. Быстрый. Стабильно.</string>
+    <string name="started_text_1">Первоклассная безопасность, невероятная скорость</string>
+    <string name="started_text_2">Непоколебимая стабильность. Ваш цифровой мир,</string>
+    <string name="started_text_3">Защищено.</string>
 
+    <!-- Sign In Screen -->
+    <string name="signin">Войти</string>
+    <string name="welcome_back">С возвращением!</string>
+    <string name="please_login">Войдите в свою учетную запись.</string>
+    <string name="password">Пароль</string>
+    <string name="forgot_pass">Забыли пароль</string>
+    <string name="dont_have_acc">Нет учетной записи?</string>
 
+    <!-- Sign Up Screen -->
+    <string name="signup">Зарегистрироваться</string>
+    <string name="hello_there">Привет!</string>
+    <string name="please_register">Зарегистрируйте свою учетную запись.</string>
+    <string name="by_creating_acc">Создавая учетную запись, вы соглашаетесь</string>
+    <string name="termsndcond">Условия использования</string>
+    <string name="already_have_acc">У вас уже есть учетная запись? </string>
+
+    <!-- Home Screen -->
+    <string name="change">Изменить</string>
+    <string name="see_all_locations">Просмотреть все местоположения</string>
+    <string name="connecting">Подключение…</string>
+    <string name="connected">Подключено</string>
+    <string name="disconnected">Отключено</string>
+    <string name="recommended">Рекомендуется</string>
+    <string name="recently">Недавно</string>
+    <string name="any_specific">Любой конкретный</string>
+
+    <!-- Settings Screen -->
+    <string name="app_name">Самый быстрый VPN</string>
+    <string name="settings">Настройки</string>
+    <string name="vpn_protocols">Протоколы VPN</string>
+    <string name="smart_connect">Умное подключение</string>
+    <string name="adblock">Блокировка рекламы</string>
+    <string name="kill_switch">Аварийный выключатель</string>
+    <string name="split_tunneling">Раздельное туннелирование</string>
+    <string name="notifcation">Уведомления</string>
+    <string name="appearance">Внешний вид</string>
+    <string name="launch_on_startup">Запуск при запуске</string>
+    <string name="language">Язык</string>
+    <string name="system_default">Системные настройки по умолчанию</string>
+    <string name="light_mode">Светлый режим</string>
+    <string name="dark_mode">Темный режим</string>
+    <string name="while_vpn_connected">Пока VPN подключен</string>
+    <string name="all_apps_use_vpn">Все приложения используют VPN</string>
+    <string name="only_selected_apps_use_vpn">Разрешить только выбранным приложениям использовать VPN</string>
+    <string name="only_selected_apps_not_use_vpn">Запретить выбранным приложениям использовать VPN</string>
+
+    <!-- Help Screen -->
+    <string name="help">Справка</string>
+    <string name="faq">Часто задаваемые вопросы</string>
+    <string name="privacy_policy">Политика конфиденциальности</string>
+    <string name="terms_conditions">Правила и условия</string>
+    <string name="about_fastest_vpn">О FastestVPN</string>
+    <string name="customer_support">Поддержка клиентов</string>
+    <string name="email_us">Напишите нам</string>
+    <string name="your_message">Ваше сообщение</string>
+    <string name="message_field_req">Поле сообщения является обязательным.</string>
+
+    <!-- Account Screen -->
+    <string name="account">Учетная запись</string>
+    <string name="email">Электронная почта</string>
+    <string name="product">Продукт</string>
+    <string name="account_status">Состояние аккаунта</string>
+    <string name="upgrade_subscription">Обновить подписку</string>
+    <string name="favorite_servers">Любимые серверы</string>
+    <string name="change_password">Изменить пароль</string>
+    <string name="logout">Выход</string>
+    <string name="subscription">Подписка</string>
+    <string name="upgrade_account">Обновите свою учетную запись</string>
+    <string name="subscribe">Подписаться</string>
+    <string name="current_pass">Текущий пароль</string>
+    <string name="new_pass">Новый пароль</string>
+    <string name="rewrite_new_pass">Переписать новый пароль</string>
+    <string name="save">Сохранить</string>
+    <string name="delete_account">Удалить аккаунт</string>
+    <string name="sure_delete_account">Вы уверены, что хотите удалить учетную запись?</string>
+    <string name="logout_account">Выход из учетной записи</string>
+    <string name="sure_logout_account">Вы уверены, что выйдете из учетной записи?</string>
+    <string name="no">Нет</string>
+    <string name="yes">Да</string>
+
+    <!-- Server List Screen -->
+    <string name="select_location">Выбрать местоположение</string>
+    <string name="search_location">Местопоиск</string>
+    <string name="all_locations">Все местоположения</string>
+    <string name="locations">места</string>
+    <string name="favorite_location">Любимое местоположение</string>
+    <string name="smart_location">Умное местоположение</string>
+    <string name="recent_location">Недавнее местоположение</string>
+    <string name="recommended_location">Рекомендуемое местоположение</string>
+    <string name="sort_by">Сортировать по</string>
+    <string name="popularity">Популярность</string>
+    <string name="alphabetically">В алфавитном порядке</string>
 
 </resources>

+ 105 - 0
app/src/main/res/values-zh-rCN/strings.xml

@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Multi Lingual - (English-en) -->
+
+    <!-- Started Screen -->
+    <string name="secure_fast">安全。快速地。稳定。</string>
+    <string name="started_text_1">一流的安全性、极快的速度</string>
+    <string name="started_text_2">坚定不移的稳定性。您的数字世界,</string>
+    <string name="started_text_3">受保护。</string>
+
+    <!-- Sign In Screen -->
+    <string name="signin">登录</string>
+    <string name="welcome_back">欢迎回来!</string>
+    <string name="please_login">请登录您的帐户。</string>
+    <string name="password">密码</string>
+    <string name="forgot_pass">忘记密码</string>
+    <string name="dont_have_acc">没有帐户?</string>
+
+    <!-- Sign Up Screen -->
+    <string name="signup">注册</string>
+    <string name="hello_there">你好!</string>
+    <string name="please_register">请注册您的帐户。</string>
+    <string name="by_creating_acc">创建您的帐户即表示您同意</string>
+    <string name="termsndcond">条款和条件条件</string>
+    <string name="already_have_acc">已经有帐户? </string>
+
+    <!-- Home Screen -->
+    <string name="change">更改</string>
+    <string name="see_all_locations">查看所有位置</string>
+    <string name="connecting">正在连接…</string>
+    <string name="connected">已连接</string>
+    <string name="disconnected">已断开连接</string>
+    <string name="recommended">推荐</string>
+    <string name="recently">最近</string>
+    <string name="any_specific">任何特定</string>
+
+    <!-- Settings Screen -->
+    <string name="app_name">最快的VPN</string>
+    <string name="settings">设置</string>
+    <string name="vpn_protocols">VPN 协议</string>
+    <string name="smart_connect">智能连接</string>
+    <string name="adblock">广告拦截</string>
+    <string name="kill_switch">终止开关</string>
+    <string name="split_tunneling">分割隧道</string>
+    <string name="notifcation">通知</string>
+    <string name="appearance">外观</string>
+    <string name="launch_on_startup">启动时启动</string>
+    <string name="language">语言</string>
+    <string name="system_default">系统默认</string>
+    <string name="light_mode">灯光模式</string>
+    <string name="dark_mode">深色模式</string>
+    <string name="while_vpn_connected">VPN 连接时</string>
+    <string name="all_apps_use_vpn">所有应用都使用 VPN</string>
+    <string name="only_selected_apps_use_vpn">仅允许选定的应用使用 VPN</string>
+    <string name="only_selected_apps_not_use_vpn">不允许选定的应用使用 VPN</string>
+
+    <!-- Help Screen -->
+    <string name="help">帮助</string>
+    <string name="faq">常见问题解答</string>
+    <string name="privacy_policy">隐私政策</string>
+    <string name="terms_conditions">条款和条件</string>
+    <string name="about_fastest_vpn">关于 FastestVPN</string>
+    <string name="customer_support">客户支持</string>
+    <string name="email_us">给我们发电子邮件</string>
+    <string name="your_message">您的消息</string>
+    <string name="message_field_req">消息字段为必填项。</string>
+
+    <!-- Account Screen -->
+    <string name="account">帐户</string>
+    <string name="email">电子邮件</string>
+    <string name="product">产品</string>
+    <string name="account_status">帐户状态</string>
+    <string name="upgrade_subscription">升级订阅</string>
+    <string name="favorite_servers">最喜欢的服务器</string>
+    <string name="change_password">更改密码</string>
+    <string name="logout">注销</string>
+    <string name="subscription">订阅</string>
+    <string name="upgrade_account">升级您的帐户</string>
+    <string name="subscribe">订阅</string>
+    <string name="current_pass">当前密码</string>
+    <string name="new_pass">新密码</string>
+    <string name="rewrite_new_pass">重写新密码</string>
+    <string name="save">保存</string>
+    <string name="delete_account">删除帐户</string>
+    <string name="sure_delete_account">您确定要删除该帐户吗?</string>
+    <string name="logout_account">注销帐户</string>
+    <string name="sure_logout_account">您确定要注销该帐户吗?</string>
+    <string name="no">否</string>
+    <string name="yes">是</string>
+
+    <!-- Server List Screen -->
+    <string name="select_location">选择位置</string>
+    <string name="search_location">搜索位置</string>
+    <string name="all_locations">所有地点</string>
+    <string name="locations">地点</string>
+    <string name="favorite_location">最喜欢的位置</string>
+    <string name="smart_location">智能位置</string>
+    <string name="recent_location">最近位置</string>
+    <string name="recommended_location">推荐位置</string>
+    <string name="sort_by">排序依据</string>
+    <string name="popularity">流行度</string>
+    <string name="alphabetically">按字母顺序</string>
+
+</resources>

+ 3 - 0
app/src/main/res/xml/locales_config.xml

@@ -7,5 +7,8 @@
     <locale android:name = "it" />
     <locale android:name = "pl" />
     <locale android:name = "ru" />
+    <locale android:name = "zh-CN" />
+    <locale android:name = "ja" />
+
 
 </locale-config>