Merge pull request #59 from abpframework/gterdem/localization_fix

eShopOnAbp: Fix missing localizations

apps/public-web/src/EShopOnAbp.PublicWeb/Components/Payment/Default.cshtml

@@ -12,7 +12,7 @@
 <div class="row">
     <div class="col-lg-9">
         <div class="address-list p-5">
-            <h5>Select Address</h5>
+            <h5 class="mb-5">@L["Payment:SelectAddress"]</h5>
             <abp-row>
                 @foreach (var address in Model.Address)
                 {
@@ -33,7 +33,7 @@
         </div>
 
         <div class="payment-list p-5">
-            <h5>Select Payment Method</h5>
+            <h5 class="mb-5">@L["Payment:SelectPaymentMethod"]</h5>
             <abp-row>
                 @foreach (var paymentType in Model.PaymentTypes)
                 {

apps/public-web/src/EShopOnAbp.PublicWeb/Components/UserOrders/Default.cshtml

@@ -9,7 +9,7 @@
     <div>SERVICE ERROR</div>
 }
 <abp-row class="m-2 p-2" style="text-align: center">
-    <span class="order-title"><strong>@Model.UserOrders.Count sipariş</strong> verildi.</span>
+    <span class="order-title">@L["UserOrders:TotalOrderCount"] <strong>@Model.UserOrders.Count</strong></span>
 </abp-row>
 @foreach (var order in Model.UserOrders)
 {
@@ -19,22 +19,22 @@
         <div class="card-header">
             <div class="row">
                 <div class="col">
-                    <div class="o-header">Sipariş Tarihi</div>
+                    <div class="o-header">@L["UserOrders:OrderDate"]</div>
                     <div class="o-description">@order.OrderDate.ToString("dd MMMM yyyy")</div>
                 </div>
                 <div class="col">
-                    <div class="o-header">Toplam</div>
+                    <div class="o-header">@L["Purchase:OrderTotal"]</div>
                     <div class="o-description">@orderTotalString</div>
                 </div>
                 <div class="col">
-                    <div class="o-header">Teslimat Adresi</div>
+                    <div class="o-header">@L["OrderReceived:DeliveryAddress"]</div>
                     <div>
                         <abp-button abp-tooltip-bottom="@addressString">@order.Address.Description</abp-button>
                     </div>
                 </div>
                 <div class="col">
                     <div>
-                        <span class="o-header">Sipariş No</span> <span class="o-order-no">@order.OrderNo.ToString("N0", new NumberFormatInfo() {NumberGroupSeparator = " "})</span>
+                        <span class="o-header">@L["OrderReceived:OrderNo"]</span> <span class="o-order-no">@order.OrderNo.ToString("N0", new NumberFormatInfo() {NumberGroupSeparator = " "})</span>
                     </div>
                 </div>
             </div>
@@ -52,18 +52,18 @@
                                 <img class="img-size" src="/product-images/@item.PictureUrl"/>
                             </abp-column>
                             <abp-column size-lg="_4">
-                                <div>@item.ProductName</div>
+                                <div><strong>@item.ProductName</strong></div>
-                                <div>Ürünü iade edebileceğiniz son tarih: @order.OrderDate.AddMonths(1).ToString("dd MMMM yyyy")</div>
+                                <div>@L["UserOrders:ProductReturnDate"] @order.OrderDate.AddMonths(1).ToString("dd MMMM yyyy")</div>
                                 <div class="mt-3">
-                                    <abp-button icon="fas fa-cart-plus" class="btn btn-warning buy-again" text="Tekrar Satın Alın" data-product-id="@item.ProductId"></abp-button>
+                                    <abp-button icon="fas fa-cart-plus" class="btn btn-warning buy-again" text="@L["UserOrders:BuyAgain"]" data-product-id="@item.ProductId"></abp-button>
                                 </div>
                             </abp-column>
                             <abp-column offset="_3" size="_2">
                                 <abp-row class="pb-3">
-                                    <abp-button class="btn btn-light shadow" disabled="true" abp-tooltip-right="Not available yet">Ürünleri iade et</abp-button>
+                                    <abp-button class="btn btn-light shadow" disabled="true" abp-tooltip-right="Not available yet">@L["UserOrders:ReturnProducts"]</abp-button>
                                 </abp-row>
                                 <abp-row>
-                                    <abp-button class="btn btn-light shadow" disabled="true" abp-tooltip-right="Not available yet">Ürün yorumu yazın</abp-button>
+                                    <abp-button class="btn btn-light shadow" disabled="true" abp-tooltip-right="Not available yet">@L["UserOrders:AddReview"]</abp-button>
                                 </abp-row>
                             </abp-column>
                         </abp-row>

apps/public-web/src/EShopOnAbp.PublicWeb/Pages/MyOrders.cshtml

@@ -19,15 +19,20 @@
 @{
     string lastYearString = $"y{DateTime.Today.Year - 1}";
     string filter = "";
+    int lastYearCounter = 2;
     var selectList = new List<SelectListItem>
     {
-        new(@L["Last30Days"], "last30", selected: true),
+        new(@L["MyOrders:Last30Days"], "last30", selected: true),
-        new(@L["LastMonth"], "m1"),
+        new(@L["MyOrders:LastMonth"], "m1"),
-        new(@L["Last3Months"], "m3"),
+        new(@L["MyOrders:Last3Months"], "m3"),
-        new(@L["LastYear"], lastYearString),
+        new(@L["MyOrders:LastYear"], lastYearString)
-        new("2020", "y2020"),
-        new("2019", "y2019")
     };
+    for (int i = 0; i < lastYearCounter; i++)
+    {
+        selectList.Add(
+            new((DateTime.Today.Year - 2 - i).ToString(), $"y{DateTime.Today.Year - 2 - i}")
+            );
+    }
 }
 
 <div class="mt-5 col">

apps/public-web/src/EShopOnAbp.PublicWeb/Pages/OrderReceived.cshtml

@@ -1,6 +1,9 @@
 @page "{orderNo:int}"
 @using System.Globalization
+@using EShopOnAbp.Localization
+@using Microsoft.Extensions.Localization
 @model EShopOnAbp.PublicWeb.Pages.OrderReceivedModel
+@inject IStringLocalizer<EShopOnAbpResource> L
 @{
     decimal orderTotal = Model.ReceivedOrder.Items.Sum(q => q.UnitPrice * q.Units);
     string orderTotalString = orderTotal.ToString("C", new CultureInfo("en-US")); // We work with USD any ways
@@ -23,21 +26,23 @@
                 </abp-column>
                 <abp-column>
                     <div>
-                        <h4>Sipariş alındı!</h4>
+                        <h4>@L["OrderReceived:AcceptedOrder"]</h4>
-                        <p>Siparişiniz ile ilgili detaylar <strong>@Model.ReceivedOrder.Buyer.Email</strong> adresine gönderildi. <a href="/MyOrders">Siparişlerime git</a></p>
+                        <p>
+                            @L["OrderReceived:MailSentTo"] <strong>@Model.ReceivedOrder.Buyer.Email</strong> @L["OrderReceived:MailSentToEnd"] <a href="/MyOrders">@L["OrderReceived:LinkToMyOrders"]</a>
+                        </p>
                     </div>
                 </abp-column>
 
             </abp-row>
             <abp-row>
                 <abp-column>
-                    <div class="ro-title">Sipariş Numarası</div>
+                    <div class="ro-title">@L["OrderReceived:OrderNo"]</div>
                     <div class="ro-body ro-ono">
                         @orderNoString
                     </div>
                 </abp-column>
                 <abp-column>
-                    <div class="ro-title">Teslimat Adresi</div>
+                    <div class="ro-title">@L["OrderReceived:DeliveryAddress"]</div>
                     <div class="ro-body ro-large">
                         @Model.ReceivedOrder.Address.Description
                     </div>
@@ -45,7 +50,7 @@
                     <div>@Model.ReceivedOrder.Address.City / @Model.ReceivedOrder.Address.Country</div>
                 </abp-column>
                 <abp-column>
-                    <div class="ro-title">Ödenen Tutar</div>
+                    <div class="ro-title">@L["OrderReceived:PaidTotal"]</div>
                     <div class="ro-body ro-large">@orderTotalString</div>
                     <div class="pt-2">
                         <i class="fa fa-5x @paymentIcon" style="color:indigo"></i>

shared/EShopOnAbp.Shared.Localization/Localization/EShopOnAbp/en.json

@@ -23,6 +23,25 @@
     "RemoveFromBasket": "Remove from basket",
     "CompletePurchase": "Complete purchase",
     "CompleteOrder": "Complete order",
-    "Index:AddToBasket": "Add to basket"
+    "Index:AddToBasket": "Add to basket",
+    "Payment:SelectAddress": "Select Address",
+    "Payment:SelectPaymentMethod": "Select Payment Method",
+    "OrderReceived:AcceptedOrder": "Your order is received!",
+    "OrderReceived:MailSentTo": "Your order details have been sent to ",
+    "OrderReceived:MailSentToEnd": " email address.",
+    "OrderReceived:LinkToMyOrders": "Go to my orders.",
+    "OrderReceived:OrderNo": "Order No",
+    "OrderReceived:DeliveryAddress": "Delivery Address",
+    "OrderReceived:PaidTotal": "Paid Total",
+    "MyOrders:Last30Days": "Last 30 days",
+    "MyOrders:LastMonth": "Last month",
+    "MyOrders:Last3Months": "Last 3 months",
+    "MyOrders:LastYear": "Last year",
+    "UserOrders:TotalOrderCount": "Total order count:",
+    "UserOrders:OrderDate": "Order Date",
+    "UserOrders:BuyAgain": "Buy Again",
+    "UserOrders:ProductReturnDate": "Last date for product return:",
+    "UserOrders:ReturnProducts": "Return products",
+    "UserOrders:AddReview": "Add product review"
   }
 }

shared/EShopOnAbp.Shared.Localization/Localization/EShopOnAbp/tr.json

@@ -23,6 +23,25 @@
     "RemoveFromBasket": "Sepetten kaldır",
     "CompletePurchase": "Alışverişi tamamla",
     "CompleteOrder": "Siparişi onayla",
-    "Index:AddToBasket": "Sepete ekle"
+    "Index:AddToBasket": "Sepete ekle",
+    "Payment:SelectAddress": "Adres Seçin",
+    "Payment:SelectPaymentMethod": "Ödeme Şeklini Seçin",
+    "OrderReceived:AcceptedOrder": "Siparişiniz alındı!",
+    "OrderReceived:MailSentTo": "Siparişiniz ile ilgili detaylar ",
+    "OrderReceived:MailSentToEnd": " email adresine gönderildi.",
+    "OrderReceived:LinkToMyOrders": "Siparişlerime git.",
+    "OrderReceived:OrderNo": "Sipariş Numarası",
+    "OrderReceived:DeliveryAddress": "Teslimat Adresi",
+    "OrderReceived:PaidTotal": "Ödenen Tutar",
+    "MyOrders:Last30Days": "Son 30 gün",
+    "MyOrders:LastMonth": "Geçen ay",
+    "MyOrders:Last3Months": "Son 3 ay",
+    "MyOrders:LastYear": "Geçen yıl",
+    "UserOrders:TotalOrderCount": "Toplam verilen sipariş:",
+    "UserOrders:OrderDate": "Sipariş Tarihi",
+    "UserOrders:BuyAgain": "Tekrar Satın Alın",
+    "UserOrders:ProductReturnDate": "Ürünü iade edebileceğiniz son tarih:",
+    "UserOrders:ReturnProducts": "Ürünleri iade et",
+    "UserOrders:AddReview": "Ürün yorumu yazın"
   }
 }