From 567d527a71e1d6e429d59e9b03b2d350e1a424d9 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Thu, 11 Apr 2019 15:43:13 -0400
Subject: [PATCH] fixes to i18n service

---
 src/App/Pages/GeneratorPage.xaml        |  5 +++++
 src/App/Services/MobileI18nService.cs   | 22 +++++++++++++++++-----
 src/App/Utilities/TranslateExtension.cs |  2 +-
 src/Core/Abstractions/II18nService.cs   |  4 ++--
 4 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/src/App/Pages/GeneratorPage.xaml b/src/App/Pages/GeneratorPage.xaml
index 4854abc63..2bb852369 100644
--- a/src/App/Pages/GeneratorPage.xaml
+++ b/src/App/Pages/GeneratorPage.xaml
@@ -4,6 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
     x:Class="Bit.App.Pages.GeneratorPage"
     xmlns:pages="clr-namespace:Bit.App.Pages"
+    xmlns:i18n="clr-namespace:Bit.App.Utilities"
     x:DataType="pages:GeneratorPageViewModel"
     Title="{Binding PageTitle}">
     <ContentPage.BindingContext>
@@ -16,6 +17,10 @@
             Text="Generator!"
             HorizontalOptions="Center"
             VerticalOptions="CenterAndExpand" />
+        <Label
+            Text="{i18n:Translate AttachmentLargeWarning, P1='10 MB'}"
+            HorizontalOptions="Center"
+            VerticalOptions="CenterAndExpand" />
         <Label
             Text="&#xf2b9;"
             HorizontalOptions="Center"
diff --git a/src/App/Services/MobileI18nService.cs b/src/App/Services/MobileI18nService.cs
index 5bb9990b1..cc109cf28 100644
--- a/src/App/Services/MobileI18nService.cs
+++ b/src/App/Services/MobileI18nService.cs
@@ -10,7 +10,7 @@ namespace Bit.App.Services
 {
     public class MobileI18nService : II18nService
     {
-        private const string ResourceId = "UsingResxLocalization.Resx.AppResources";
+        private const string ResourceId = "Bit.App.Resources.AppResources";
 
         private static readonly Lazy<ResourceManager> _resourceManager = new Lazy<ResourceManager>(() =>
             new ResourceManager(ResourceId, IntrospectionExtensions.GetTypeInfo(typeof(MobileI18nService)).Assembly));
@@ -41,12 +41,12 @@ namespace Bit.App.Services
             Thread.CurrentThread.CurrentUICulture = Culture;
         }
 
-        public string T(string id, params string[] p)
+        public string T(string id, string p1, string p2, string p3)
         {
-            return Translate(id, p);
+            return Translate(id, p1, p2, p3);
         }
 
-        public string Translate(string id, params string[] p)
+        public string Translate(string id, string p1, string p2, string p3)
         {
             if(string.IsNullOrWhiteSpace(id))
             {
@@ -61,7 +61,19 @@ namespace Bit.App.Services
                     result = $"{{{id}}}";
                 }
             }
-            return string.Format(result, p);
+            if(p1 == null && p2 == null && p3 == null)
+            {
+                return result;
+            }
+            else if(p2 == null && p3 == null)
+            {
+                return string.Format(result, p1);
+            }
+            else if(p3 == null)
+            {
+                return string.Format(result, p1, p2);
+            }
+            return string.Format(result, p1, p2, p3);
         }
     }
 }
diff --git a/src/App/Utilities/TranslateExtension.cs b/src/App/Utilities/TranslateExtension.cs
index a8d8a940a..2bfaff766 100644
--- a/src/App/Utilities/TranslateExtension.cs
+++ b/src/App/Utilities/TranslateExtension.cs
@@ -6,7 +6,7 @@ using Xamarin.Forms.Xaml;
 
 namespace Bit.App.Utilities
 {
-    [ContentProperty("Text")]
+    [ContentProperty("Id")]
     public class TranslateExtension : IMarkupExtension
     {
         private II18nService _i18nService;
diff --git a/src/Core/Abstractions/II18nService.cs b/src/Core/Abstractions/II18nService.cs
index 8eabf1f13..e9869d9fd 100644
--- a/src/Core/Abstractions/II18nService.cs
+++ b/src/Core/Abstractions/II18nService.cs
@@ -5,7 +5,7 @@ namespace Bit.Core.Abstractions
     public interface II18nService
     {
         CultureInfo Culture { get; set; }
-        string T(string id, params string[] p);
-        string Translate(string id, params string[] p);
+        string T(string id, string p1, string p2, string p3);
+        string Translate(string id, string p1, string p2, string p3);
     }
 }
\ No newline at end of file