Zbiór zmian 927

Data:

2009-12-07 10:53:44 (16 years ago)

Autor:

alina

Opis:

re #215 zmiana nazwy plikow

Lokalizacja:

trunk/eCard/eCardMVC

Pliki:

• Platnosci.Core/Interface/ITranslateManager.cs (dodane)
• Platnosci.Core/Linq/Translation.cs (dodane)
• Platnosci.Core/Platnosci.Core.csproj (zmodyfikowane) (2 diffs)
• Platnosci.Tests/Platnosci.Tests.csproj (zmodyfikowane) (1 diff)
• Platnosci.Tests/Web/FakeTranslation.cs (dodane)
• Platnosci.Tests/Web/MerchantControllerTests.cs (zmodyfikowane) (1 diff)
• Platnosci.Tests/Web/PlatnosciControllerTests.cs (zmodyfikowane) (1 diff)
• Platnosci/App_GlobalResources/tlumaczenia.designer.cs (zmodyfikowane) (5 diffs)
• Platnosci/App_GlobalResources/tlumaczenia.pl.designer.cs (dodane)
• Platnosci/App_GlobalResources/tlumaczenia.pl.resx (dodane)
• Platnosci/App_GlobalResources/tlumaczenia.resx (zmodyfikowane) (4 diffs)
• Platnosci/Controllers/MerchantController.cs (zmodyfikowane) (5 diffs)
• Platnosci/Controllers/PlatnoscController.cs (zmodyfikowane) (7 diffs)

trunk/eCard/eCardMVC/Platnosci.Core/Platnosci.Core.csproj

@@ -70 +70 @@
     <Compile Include="Interface\IIdentifiable.cs" />
     <Compile Include="Interface\IRepository.cs" />
-    <Compile Include="Interface\ITranslate.cs" />
+    <Compile Include="Interface\ITranslateManager.cs" />
     <Compile Include="Linq\DataContext1.cs" />
     <Compile Include="Linq\Payer.cs" />
@@ -85 +85 @@
     <Compile Include="Linq\PotwierdzeniaEcard.cs" />
     <Compile Include="Linq\Repository.cs" />
-    <Compile Include="Linq\Translate.cs" />
+    <Compile Include="Linq\Translation.cs" />
     <Compile Include="Linq\vPlatnosciEcard.cs" />
     <Compile Include="Linq\Waluta.cs" />

trunk/eCard/eCardMVC/Platnosci.Tests/Platnosci.Tests.csproj

@@ -81 +81 @@
     <Compile Include="Web\MerchantControllerTests.cs" />
     <Compile Include="Web\FakeDataContext.cs" />
-    <Compile Include="Web\FakeTranslate.cs" />
+    <Compile Include="Web\FakeTranslation.cs" />
     <Compile Include="Web\Function.cs" />
     <Compile Include="Web\PlatnosciControllerTests.cs" />

trunk/eCard/eCardMVC/Platnosci.Tests/Web/MerchantControllerTests.cs

@@ -17 +17 @@
     {
         private Function _f = new Function();
-        private ITranslate _t = new FakeTranslate();
+        private ITranslateManager _t = new FakeTranslation();
 
         [Test]

trunk/eCard/eCardMVC/Platnosci.Tests/Web/PlatnosciControllerTests.cs

@@ -21 +21 @@
     class PlatnosciControllerTests
     {
-        private ITranslate _t = new FakeTranslate();
+        private ITranslateManager _t = new FakeTranslation();
         private string merchantNumber = "123";
         private int orderNumber = 9999;

trunk/eCard/eCardMVC/Platnosci/App_GlobalResources/tlumaczenia.designer.cs

@@ -207 +207 @@
         
         /// <summary>
-        ///   Looks up a localized string similar to Proszę podać NIP. .
+        ///   Looks up a localized string similar to Proszę podać poprawny NIP. .
         /// </summary>
         internal static string err_nip {
@@ -389 +389 @@
         
         /// <summary>
-        ///   Looks up a localized string similar to Any problems?.
-        /// </summary>
-        internal static string Pomoc {
-            get {
-                return ResourceManager.GetString("Pomoc", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Payment confirmation.
         /// </summary>
@@ -425 +416 @@
         
         /// <summary>
-        ///   Looks up a localized string similar to Verify all details. If all details are correct click the button Pay. You will be move on the eCard web site to finish transaction..
+        ///   Looks up a localized string similar to Verify all details. If all details are correct click the Pay button. You will be move on the eCard web site to finish transaction..
         /// </summary>
         internal static string SprawdzDane {
@@ -507 +498 @@
         /// <summary>
         ///   Looks up a localized string similar to BłÄ
-d weryfikacji danych.en.
+d weryfikacji danych..
         /// </summary>
         internal static string weryfikacja {
@@ -557 +548 @@
             get {
                 return ResourceManager.GetString("Zamknij", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Remeber me?.
-        /// </summary>
-        internal static string Zapamietaj {
-            get {
-                return ResourceManager.GetString("Zapamietaj", resourceCulture);
             }
         }

trunk/eCard/eCardMVC/Platnosci/App_GlobalResources/tlumaczenia.resx

@@ -143 +143 @@
     <value>Log in</value>
   </data>
-  <data name="Zapamietaj" xml:space="preserve">
-    <value>Remeber me?</value>
-  </data>
   <data name="tytul" xml:space="preserve">
     <value>Payment by credit card for advert.</value>
@@ -186 +183 @@
     <value>Pay</value>
   </data>
-  <data name="Pomoc" xml:space="preserve">
-    <value>Any problems?</value>
-  </data>
   <data name="SprawdzDane" xml:space="preserve">
-    <value>Verify all details. If all details are correct click the button Pay. You will be move on the eCard web site to finish transaction.</value>
+    <value>Verify all details. If all details are correct click the Pay button. You will be move on the eCard web site to finish transaction.</value>
   </data>
   <data name="Szczegoly" xml:space="preserve">
@@ -233 +227 @@
   <data name="weryfikacja" xml:space="preserve">
     <value>BłÄ
-d weryfikacji danych.en</value>
+d weryfikacji danych.</value>
   </data>
   <data name="Faktura_error" xml:space="preserve">
@@ -249 +243 @@
   </data>
   <data name="err_nip" xml:space="preserve">
-    <value>Proszę podać NIP. </value>
+    <value>Proszę podać poprawny NIP. </value>
   </data>
   <data name="validateInfo" xml:space="preserve">

trunk/eCard/eCardMVC/Platnosci/Controllers/MerchantController.cs

@@ -35 +35 @@
         private readonly IRepository<PlatnosciEcard> _repPayment; 
         private FunkcjePlatnosci _func;
-        private ITranslate _t;
+        private ITranslateManager _t;
 
         public MerchantController()
@@ -42 +42 @@
             _repPayment = new Repository<PlatnosciEcard>(new DataContext1());
             _func = new FunkcjePlatnosci();
-            _t = new Translate();
+            _t = new Translation();
         }
         public ActionResult Merchant(Payer payer, string language)
@@ -54 +54 @@
             if (platnosc == null)
             {
-                ErrorViewData errorViewData = _func.InitErrorViewData(_t.TranslateStr("tlumaczenia", "brakdanych"));
+                ErrorViewData errorViewData = _func.InitErrorViewData(_t.Translate("tlumaczenia", "brakdanych"));
                 return View("Error1", errorViewData);
             }
             else if (!_func.UserIdentity(platnosc, ControllerContext.HttpContext.User.Identity.Name))
             {
-                ErrorViewData errorViewData = _func.InitErrorViewData(_t.TranslateStr("tlumaczenia", "weryfikacja"));
+                ErrorViewData errorViewData = _func.InitErrorViewData(_t.Translate("tlumaczenia", "weryfikacja"));
                 return View("Error1", errorViewData);
             }
@@ -71 +71 @@
             if (createPayment == false)
             {
-                ErrorViewData errorViewData = _func.InitErrorViewData(_t.TranslateStr("tlumaczenia", "error_hash"));
+                ErrorViewData errorViewData = _func.InitErrorViewData(_t.Translate("tlumaczenia", "error_hash"));
                 errorViewData.idfaktury = payer.Id_faktury;
                 return View("Error1", errorViewData);
@@ -80 +80 @@
             if (hash == BAD_HASH || hash == "" || hash == HASH_ERROR_INFO)
             {
-                ErrorViewData errorViewData = _func.InitErrorViewData(_t.TranslateStr("tlumaczenia", "error_hash"));
+                ErrorViewData errorViewData = _func.InitErrorViewData(_t.Translate("tlumaczenia", "error_hash"));
                 errorViewData.idfaktury = payer.Id_faktury;
                 return View("Error1", errorViewData);

trunk/eCard/eCardMVC/Platnosci/Controllers/PlatnoscController.cs

@@ -26 +26 @@
         private IRepository<PlatnosciEcard> _repPayment;
         private readonly IRepository<PotwierdzeniaEcard> _repConfirm;
-        private ITranslate _t;
+        private ITranslateManager translation;
         private FunkcjePlatnosci _func;
               
@@ -35 +35 @@
             _repConfirm = new Repository<PotwierdzeniaEcard>(new DataContext1());
             _func = new FunkcjePlatnosci();
-            _t = new Translate();         
-        }
-        public PlatnoscController(IRepository<vPlatnosciEcard> repVPayment, IRepository<PlatnosciEcard> repPayment, IRepository<PotwierdzeniaEcard> repConfirm, ITranslate translate)
+            translation = new Translation();         
+        }
+        public PlatnoscController(IRepository<vPlatnosciEcard> repVPayment, IRepository<PlatnosciEcard> repPayment, IRepository<PotwierdzeniaEcard> repConfirm, ITranslateManager translate)
         {
             _repVPayment = repVPayment;
@@ -43 +43 @@
             _repConfirm = repConfirm;
             _func = new FunkcjePlatnosci();
-            _t = translate;
+            translation = translate;
         }
         public ActionResult Show(string id, string language)
@@ -62 +62 @@
             {
                 string data_zaplaty = String.Format("{0:dd-MM-yyyy}", tablica_potwierdzenia[0].AUTHTIME);
-                invoiceDeatailsViewData.info = String.Format(_t.TranslateStr("tlumaczenia","zaplacono"), platnosc.Faktura_Numer, data_zaplaty);
+                invoiceDeatailsViewData.info = String.Format(translation.Translate("tlumaczenia","zaplacono"), platnosc.Faktura_Numer, data_zaplaty);
                 invoiceDeatailsViewData.termin = data_zaplaty;
                 return View("Paid", invoiceDeatailsViewData);
@@ -78 +78 @@
             if (String.IsNullOrEmpty(payer.FirstName))
             {
-                ModelState.AddModelError("Payer.FirstName", _t.TranslateStr("tlumaczenia", "err_imieWK"));
+                ModelState.AddModelError("Payer.FirstName", translation.Translate("tlumaczenia", "err_imieWK"));
             }
             if (String.IsNullOrEmpty(payer.LastName))
             {
-                ModelState.AddModelError("Payer.LastName", _t.TranslateStr("tlumaczenia", "err_nazwiskoWK"));
+                ModelState.AddModelError("Payer.LastName", translation.Translate("tlumaczenia", "err_nazwiskoWK"));
             }
             if (ModelState.IsValid == false)
@@ -114 +114 @@
                 if (CheckConfirm(id1, order) == 0)   //nie ma potwierdzenia z eCardu
                 {
-                    invoiceDeatailsViewData.info = String.Format(_t.TranslateStr("tlumaczenia", "blad1"), invoiceDeatailsViewData.vPlatnosciEcard.Faktura_Numer);
+                    invoiceDeatailsViewData.info = String.Format(translation.Translate("tlumaczenia", "blad1"), invoiceDeatailsViewData.vPlatnosciEcard.Faktura_Numer);
                 }
                 else
                 {
-                    if (CheckConfirm(id1, order) == 2) invoiceDeatailsViewData.info = _t.TranslateStr("tlumaczenia", "weryfikacja");
+                    if (CheckConfirm(id1, order) == 2) invoiceDeatailsViewData.info = translation.Translate("tlumaczenia", "weryfikacja");
                 }
             }
@@ -214 +214 @@
         {
             string errortxt = "";
-            if (platnosc == null) errortxt = _t.TranslateStr("tlumaczenia", "brakdanych");
-            else if (!_func.UserIdentity(platnosc, HttpContext.User.Identity.Name)) errortxt = _t.TranslateStr("tlumaczenia","weryfikacja");
+            if (platnosc == null) errortxt = translation.Translate("tlumaczenia", "brakdanych");
+            else if (!_func.UserIdentity(platnosc, HttpContext.User.Identity.Name)) errortxt = translation.Translate("tlumaczenia","weryfikacja");
             ErrorViewData errorViewData = _func.InitErrorViewData(errortxt);
             return errorViewData;