diff --git a/Nebula.Launcher/Assets/lang/en-US.ftl b/Nebula.Launcher/Assets/lang/en-US.ftl index 5601214..2e6b9bb 100644 --- a/Nebula.Launcher/Assets/lang/en-US.ftl +++ b/Nebula.Launcher/Assets/lang/en-US.ftl @@ -32,6 +32,7 @@ auth-error-occured = An error occurred during the authentication process. auth-invalid-credentials = Invalid username or password. Please try again. auth-connection-error = Unable to connect to the authentication server. auth-name-resolution-error = Failed to resolve server address. Check your network or server configuration. +auth-secure-error = Failed to cinnect to the server using SSL auth-config-read = Reading authentication configuration... auth-try-auth-config = Attempting to authenticate using saved configuration. @@ -45,4 +46,12 @@ filter-language = Language favorite-add = Add to favorites servername-set = Set server name twofa-enabled = You have two-factor authentication enabled. Please enter the code. -twofa-set = Proceed \ No newline at end of file +twofa-set = Proceed + +server-search = Server search +serverentry-tag = Tag +serverentry-map = Map +serverentry-preset = Preset + +content-view-server = Server url +content-view-path = Path \ No newline at end of file diff --git a/Nebula.Launcher/Assets/lang/ru-RU.ftl b/Nebula.Launcher/Assets/lang/ru-RU.ftl index 34bf207..d79de2e 100644 --- a/Nebula.Launcher/Assets/lang/ru-RU.ftl +++ b/Nebula.Launcher/Assets/lang/ru-RU.ftl @@ -32,6 +32,7 @@ auth-error-occured = Во время аутентификации произош auth-invalid-credentials = Неверное имя пользователя или пароль. Попробуйте еще раз. auth-connection-error = Не удается подключиться к серверу аутентификации. auth-name-resolution-error = Не удалось разрешить адрес сервера. Проверьте сетевые настройки или конфигурацию сервера. +auth-secure-error = Не удалось подключиться к серверу по SSL. Проверьте сетевые настройки. auth-config-read = Чтение конфигурации аутентификации... auth-try-auth-config = Попытка аутентификации с использованием сохраненной конфигурации. @@ -45,4 +46,12 @@ filter-language = Язык favorite-add = Добавить в избранное servername-set = Установить имя сервера twofa-enabled = У вас включена двухфакторная аутентификация. Введите код. -twofa-set = Продолжить \ No newline at end of file +twofa-set = Продолжить + +server-search = Поиск сервера +serverentry-tag = Тэги +serverentry-map = Карта +serverentry-preset = Режим + +content-view-server = Сервер +content-view-path = Путь \ No newline at end of file diff --git a/Nebula.Launcher/ViewModels/Pages/AccountInfoViewModel.cs b/Nebula.Launcher/ViewModels/Pages/AccountInfoViewModel.cs index 404df69..0e51f21 100644 --- a/Nebula.Launcher/ViewModels/Pages/AccountInfoViewModel.cs +++ b/Nebula.Launcher/ViewModels/Pages/AccountInfoViewModel.cs @@ -11,7 +11,6 @@ using CommunityToolkit.Mvvm.Input; using Nebula.Launcher.Services; using Nebula.Launcher.ViewModels.Popup; using Nebula.Launcher.Views.Pages; -using Nebula.Shared; using Nebula.Shared.Services; using Nebula.Shared.Services.Logging; using Nebula.Shared.Utils; @@ -177,6 +176,11 @@ public partial class AccountInfoViewModel : ViewModelBase PopupError(LocalisationService.GetString("auth-name-resolution-error"), e); DoRetryAuth = true; break; + + case HttpRequestError.SecureConnectionError: + PopupError(LocalisationService.GetString("auth-secure-error"), e); + DoRetryAuth = true; + break; default: var authError = new Exception(LocalisationService.GetString("auth-error"), e); diff --git a/Nebula.Launcher/Views/Pages/ContentBrowserView.axaml b/Nebula.Launcher/Views/Pages/ContentBrowserView.axaml index 3d2565b..0bd7dc3 100644 --- a/Nebula.Launcher/Views/Pages/ContentBrowserView.axaml +++ b/Nebula.Launcher/Views/Pages/ContentBrowserView.axaml @@ -8,7 +8,8 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:pages="clr-namespace:Nebula.Launcher.ViewModels.Pages" - xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:services="clr-namespace:Nebula.Launcher.Services"> @@ -31,14 +32,14 @@ Margin="5" Text="{Binding ServerText}" VerticalAlignment="Center" - Watermark="Server Url..." /> + Watermark="{services:LocaledText content-view-server}" /> + Watermark="{services:LocaledText content-view-path}" />