From 145dac500c4002f64d191b7ce8e7ffc053ada627 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Mon, 4 Jun 2018 21:08:55 -0400 Subject: [PATCH] appresources for ios yubikey --- src/App/Pages/LoginTwoFactorPage.cs | 5 +++-- src/App/Resources/AppResources.Designer.cs | 18 ++++++++++++++++++ src/App/Resources/AppResources.resx | 6 ++++++ 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/src/App/Pages/LoginTwoFactorPage.cs b/src/App/Pages/LoginTwoFactorPage.cs index 436752c85..9ee15eefa 100644 --- a/src/App/Pages/LoginTwoFactorPage.cs +++ b/src/App/Pages/LoginTwoFactorPage.cs @@ -232,7 +232,8 @@ namespace Bit.App.Pages } else if(_providerType == TwoFactorProviderType.YubiKey) { - instruction.Text = AppResources.YubiKeyInstruction; + instruction.Text = Device.RuntimePlatform == Device.iOS ? AppResources.YubiKeyInstructionIos : + AppResources.YubiKeyInstruction; var image = new CachedImage { @@ -268,7 +269,7 @@ namespace Bit.App.Pages { var tryAgainButton = new ExtendedButton { - Text = "Try Again", + Text = AppResources.TryAgain, Style = (Style)Application.Current.Resources["btn-primaryAccent"], Margin = new Thickness(15, 0, 15, 0), Command = new Command(() => ListenYubiKey(true, true)), diff --git a/src/App/Resources/AppResources.Designer.cs b/src/App/Resources/AppResources.Designer.cs index 06224b3db..53c6458ed 100644 --- a/src/App/Resources/AppResources.Designer.cs +++ b/src/App/Resources/AppResources.Designer.cs @@ -2922,6 +2922,15 @@ namespace Bit.App.Resources { } } + /// + /// Looks up a localized string similar to Try Again. + /// + public static string TryAgain { + get { + return ResourceManager.GetString("TryAgain", resourceCulture); + } + } + /// /// Looks up a localized string similar to Two-step Login. /// @@ -3336,6 +3345,15 @@ namespace Bit.App.Resources { } } + /// + /// Looks up a localized string similar to To continue, hold your YubiKey NEO against the back of the device.. + /// + public static string YubiKeyInstructionIos { + get { + return ResourceManager.GetString("YubiKeyInstructionIos", resourceCulture); + } + } + /// /// Looks up a localized string similar to YubiKey Security Key. /// diff --git a/src/App/Resources/AppResources.resx b/src/App/Resources/AppResources.resx index d55543884..b01266121 100644 --- a/src/App/Resources/AppResources.resx +++ b/src/App/Resources/AppResources.resx @@ -1296,4 +1296,10 @@ Hold your Yubikey near the top of the device. + + Try Again + + + To continue, hold your YubiKey NEO against the back of the device. + \ No newline at end of file