From bc3c14686d312a18706bb8fc85458fee26f24e28 Mon Sep 17 00:00:00 2001 From: braim23 <94292623+braim23@users.noreply.github.com> Date: Tue, 24 May 2022 23:53:00 +0300 Subject: [PATCH 1/3] Adding all new localizations --- .../Blog/Localization/Resources/en.json | 2 + .../Www/Localization/Resources/en.json | 71 ++++++++++++++++++- .../Pages/Blogs/Posts/Index.cshtml | 4 +- 3 files changed, 74 insertions(+), 3 deletions(-) diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Blog/Localization/Resources/en.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Blog/Localization/Resources/en.json index 189662ee7c..208052caad 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Blog/Localization/Resources/en.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Blog/Localization/Resources/en.json @@ -1,5 +1,7 @@ { "culture": "en", "texts": { + "ABPTitle": "ABP Framework - Open Source Web Application Framework", + "ABPDescription": "ABP is an open source application framework focused on AspNet Core based web application development. Don't repeat yourself, focus on your own business code." } } \ No newline at end of file diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/en.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/en.json index d17259241c..4d115771d6 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/en.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/en.json @@ -325,6 +325,75 @@ "CreateYourProjectNow": "Create Your Project Now", "OrderOn": "Order on {0}", "DownloadFreeDDDBook": "Download Free DDD Book", - "WhatIsABPFramework": "What is the ABP Framework?" + "WhatIsABPFramework": "What is the ABP Framework?", + "Tenant1Database": "Tenant 1 Database", + "Tenant2Database": "Tenant 2 Database", + "Tenant3Database": "Tenant 3 Database", + "SharedDatabase": "Shared Database", + "ConnectionResolver": "Connection Resolver", + "TenantBasedDataFilter": "Tenant Based Data Filter", + "ApplicationCode": "Application Code", + "TenantResolution": "Tenant Resolution", + "Tenant1User": "Tenant 1 User", + "Tenant2User": "Tenant 2 User", + "Tenant3User": "Tenant 3 User", + "Tenant4User": "Tenant 4 User", + "CardTitle": "Card title", + "View": "View", + "Model": "Model", + "Email": "Email", + "Password": "Password", + "Address": "Address", + "Gender": "Gender", + "Male": "Male", + "Female": "Female", + "Submit": "Submit", + "Unspecified": "Unspecified", + "StaticFileMiddleware": "Static File Middleware", + "RazorViewEngine": "Razor View Engine", + "PhysicalFiles": "Physical Files (wwwroot)", + "EmbeddedFiles": "Embedded Files (DLL)", + "DynamicFiles": "Dynamic Files (Memory)", + "BuildSolutionsWithAbp": "Build maintainable .NET solutions by following software development best practices using ABP.", + "BuyOnAmazon": "Buy on Amazon", + "BuyOnPackt": "Buy on Packt", + "Discounted": "Discounted", + "KeyFeatures": "Key Features", + "KeyFeaturesDescription1": "Build robust, maintainable, modular, and scalable software solutions using ABP Framework.", + "KeyFeaturesDescription2": "Learn how to implement SOLID principles and domain-driven design in your web applications.", + "KeyFeaturesDescription3": "Discover how ABP Framework speeds up your development cycle by automating repetitive tasks.", + "BookDescription": "Book Description", + "BookDescriptionDetails1": "ABP Framework is a complete infrastructure for creating modern web applications by following software \n development best practices and conventions. With ABP's high-level framework and ecosystem, you can \n implement the Don't Repeat Yourself (DRY) principle and focus on your business code.", + "BookDescriptionDetails2": "Written by the creator of ABP Framework, this book will help you to gain a complete understanding of the\n framework and modern web application development techniques. With step-by-step explanations of essential\n concepts and practical examples, you'll understand the requirements of a modern web solution and how ABP\n Framework makes it enjoyable to develop your own solutions. You'll discover the common requirements of\n enterprise web application development and explore the infrastructure provided by ABP. Throughout the\n book, you'll get to grips with software development best practices for building maintainable and modular\n web solutions.", + "BookDescriptionDetails3": "By the end of this book, you'll be able to create a complete web solution that is easy to develop,\n maintain, and test.", + "WhatYouWillLearn": "What you will learn", + "WhatYouWillLearn1": "Set up the development environment and get started with ABP Framework.", + "WhatYouWillLearn2": "Work with Entity Framework Core and MongoDB to develop your data access layer.", + "WhatYouWillLearn3": "Understand cross-cutting concerns and how ABP automates repetitive tasks.", + "WhatYouWillLearn4": "Get to grips with implementing domain-driven design with ABP Framework.", + "WhatYouWillLearn5": "Build UI pages and components with ASP.NET Core MVC (Razor Pages) and Blazor.", + "WhatYouWillLearn6": "Work with multi-tenancy to create modular web applications.", + "WhatYouWillLearn7": "Understand modularity and create reusable application modules.", + "WhatYouWillLearn8": "Write unit, integration, and UI tests using ABP Framework.", + "WhoIsThisBookFor": "Who's this book for", + "WhoIsThisBookForDescription": "This book is for web developers who want to learn software architectures and best practices for building\n maintainable web-based solutions using Microsoft technologies and ABP Framework. Basic knowledge of C#\n and ASP.NET Core is necessary to get started with this book.", + "Computers&Technology": "Computers & Technology", + "TableOfContents1": "Modern Software Development and ABP Framework", + "TableOfContents2": "Getting Started with ABP Framework", + "TableOfContents3": "Step-By-Step Application Development", + "TableOfContents4": "Understanding the Reference Solution", + "TableOfContents5": "Exploring the ASP.NET and ABP Infrastructure", + "TableOfContents6": "Working with the Data Access Infrastructure", + "TableOfContents7": "Exploring Cross-Cutting Concerns", + "TableOfContents8": "Using the Features and Services of ABP", + "TableOfContents9": "Understanding Domain-Driven Design", + "TableOfContents10": "DDD – The Domain Layer", + "TableOfContents11": "DDD – The Application Layer", + "TableOfContents12": "Working with MVC/Razor Pages", + "TableOfContents13": "Working with the Blazor WebAssembly UI", + "TableOfContents14": "Building HTTP APIs and Real-Time Services", + "TableOfContents15": "Working with Modularity", + "TableOfContents16": "Implementing Multi-Tenancy", + "TableOfContents17": "Building Automated Tests" } } diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Index.cshtml b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Index.cshtml index b01b9c0c28..ec48bfab46 100644 --- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Index.cshtml +++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Index.cshtml @@ -49,7 +49,7 @@

@Html.Raw(BloggingPageHelper.GetShortContent(post.Content))

- Continue Reading → + @L["ContinueReading"] → @if (post.Writer != null) @@ -168,7 +168,7 @@

@Html.Raw(BloggingPageHelper.GetShortContent(post.Content))

- Continue Reading → + @L["ContinueReading"] → @if (post.Writer != null) { From 49a3676e72623114ba6d738908ad592ccbdfb40d Mon Sep 17 00:00:00 2001 From: braim23 <94292623+braim23@users.noreply.github.com> Date: Wed, 25 May 2022 12:12:58 +0300 Subject: [PATCH 2/3] More enhancements --- .../Blog/Localization/Resources/en.json | 4 +-- .../Www/Localization/Resources/en.json | 28 ++----------------- .../Pages/Blogs/Posts/Index.cshtml | 4 +-- 3 files changed, 7 insertions(+), 29 deletions(-) diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Blog/Localization/Resources/en.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Blog/Localization/Resources/en.json index 208052caad..6f52556e72 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Blog/Localization/Resources/en.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Blog/Localization/Resources/en.json @@ -1,7 +1,7 @@ { "culture": "en", "texts": { - "ABPTitle": "ABP Framework - Open Source Web Application Framework", - "ABPDescription": "ABP is an open source application framework focused on AspNet Core based web application development. Don't repeat yourself, focus on your own business code." + "AbpTitle": "ABP Framework - Open Source Web Application Framework", + "AbpDescription": "ABP is an open source application framework focused on AspNet Core based web application development. Don't repeat yourself, focus on your own business code." } } \ No newline at end of file diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/en.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/en.json index 4d115771d6..612459a04a 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/en.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/en.json @@ -326,18 +326,13 @@ "OrderOn": "Order on {0}", "DownloadFreeDDDBook": "Download Free DDD Book", "WhatIsABPFramework": "What is the ABP Framework?", - "Tenant1Database": "Tenant 1 Database", - "Tenant2Database": "Tenant 2 Database", - "Tenant3Database": "Tenant 3 Database", + "TenantDatabase": "Tenant {0} Database", "SharedDatabase": "Shared Database", "ConnectionResolver": "Connection Resolver", "TenantBasedDataFilter": "Tenant Based Data Filter", "ApplicationCode": "Application Code", "TenantResolution": "Tenant Resolution", - "Tenant1User": "Tenant 1 User", - "Tenant2User": "Tenant 2 User", - "Tenant3User": "Tenant 3 User", - "Tenant4User": "Tenant 4 User", + "TenantUser": "Tenant {0} User", "CardTitle": "Card title", "View": "View", "Model": "Model", @@ -377,23 +372,6 @@ "WhatYouWillLearn8": "Write unit, integration, and UI tests using ABP Framework.", "WhoIsThisBookFor": "Who's this book for", "WhoIsThisBookForDescription": "This book is for web developers who want to learn software architectures and best practices for building\n maintainable web-based solutions using Microsoft technologies and ABP Framework. Basic knowledge of C#\n and ASP.NET Core is necessary to get started with this book.", - "Computers&Technology": "Computers & Technology", - "TableOfContents1": "Modern Software Development and ABP Framework", - "TableOfContents2": "Getting Started with ABP Framework", - "TableOfContents3": "Step-By-Step Application Development", - "TableOfContents4": "Understanding the Reference Solution", - "TableOfContents5": "Exploring the ASP.NET and ABP Infrastructure", - "TableOfContents6": "Working with the Data Access Infrastructure", - "TableOfContents7": "Exploring Cross-Cutting Concerns", - "TableOfContents8": "Using the Features and Services of ABP", - "TableOfContents9": "Understanding Domain-Driven Design", - "TableOfContents10": "DDD – The Domain Layer", - "TableOfContents11": "DDD – The Application Layer", - "TableOfContents12": "Working with MVC/Razor Pages", - "TableOfContents13": "Working with the Blazor WebAssembly UI", - "TableOfContents14": "Building HTTP APIs and Real-Time Services", - "TableOfContents15": "Working with Modularity", - "TableOfContents16": "Implementing Multi-Tenancy", - "TableOfContents17": "Building Automated Tests" + "ComputersAndTechnology": "Computers & Technology" } } diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Index.cshtml b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Index.cshtml index ec48bfab46..03514aaf3a 100644 --- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Index.cshtml +++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Index.cshtml @@ -4,11 +4,11 @@ @using Volo.Blogging @inject IAuthorizationService Authorization @model Volo.Blogging.Pages.Blog.Posts.IndexModel -@using Microsoft.AspNetCore.Mvc.Localization +@using Microsoft.Extensions.Localization @using Volo.Blogging.Localization @using Volo.Blogging.Pages.Blog @using IndexModel = Volo.Blogging.Pages.Blog.Posts.IndexModel -@inject IHtmlLocalizer L +@inject IStringLocalizer L @inject BloggingPageHelper BloggingPageHelper @{ ViewBag.Title = "Read All Blog Posts"; From f8aad113975c252eb9d525a161df63b30b437c91 Mon Sep 17 00:00:00 2001 From: braim23 <94292623+braim23@users.noreply.github.com> Date: Wed, 25 May 2022 17:05:16 +0300 Subject: [PATCH 3/3] specified the keys more --- .../Www/Localization/Resources/en.json | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/en.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/en.json index 612459a04a..41eda60de6 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/en.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/en.json @@ -353,25 +353,25 @@ "BuyOnAmazon": "Buy on Amazon", "BuyOnPackt": "Buy on Packt", "Discounted": "Discounted", - "KeyFeatures": "Key Features", - "KeyFeaturesDescription1": "Build robust, maintainable, modular, and scalable software solutions using ABP Framework.", - "KeyFeaturesDescription2": "Learn how to implement SOLID principles and domain-driven design in your web applications.", - "KeyFeaturesDescription3": "Discover how ABP Framework speeds up your development cycle by automating repetitive tasks.", - "BookDescription": "Book Description", - "BookDescriptionDetails1": "ABP Framework is a complete infrastructure for creating modern web applications by following software \n development best practices and conventions. With ABP's high-level framework and ecosystem, you can \n implement the Don't Repeat Yourself (DRY) principle and focus on your business code.", - "BookDescriptionDetails2": "Written by the creator of ABP Framework, this book will help you to gain a complete understanding of the\n framework and modern web application development techniques. With step-by-step explanations of essential\n concepts and practical examples, you'll understand the requirements of a modern web solution and how ABP\n Framework makes it enjoyable to develop your own solutions. You'll discover the common requirements of\n enterprise web application development and explore the infrastructure provided by ABP. Throughout the\n book, you'll get to grips with software development best practices for building maintainable and modular\n web solutions.", - "BookDescriptionDetails3": "By the end of this book, you'll be able to create a complete web solution that is easy to develop,\n maintain, and test.", - "WhatYouWillLearn": "What you will learn", - "WhatYouWillLearn1": "Set up the development environment and get started with ABP Framework.", - "WhatYouWillLearn2": "Work with Entity Framework Core and MongoDB to develop your data access layer.", - "WhatYouWillLearn3": "Understand cross-cutting concerns and how ABP automates repetitive tasks.", - "WhatYouWillLearn4": "Get to grips with implementing domain-driven design with ABP Framework.", - "WhatYouWillLearn5": "Build UI pages and components with ASP.NET Core MVC (Razor Pages) and Blazor.", - "WhatYouWillLearn6": "Work with multi-tenancy to create modular web applications.", - "WhatYouWillLearn7": "Understand modularity and create reusable application modules.", - "WhatYouWillLearn8": "Write unit, integration, and UI tests using ABP Framework.", - "WhoIsThisBookFor": "Who's this book for", - "WhoIsThisBookForDescription": "This book is for web developers who want to learn software architectures and best practices for building\n maintainable web-based solutions using Microsoft technologies and ABP Framework. Basic knowledge of C#\n and ASP.NET Core is necessary to get started with this book.", + "MasteringAbpFramework_Book_KeyFeatures": "Key Features", + "MasteringAbpFramework_Book_Key_Features_Description_1": "Build robust, maintainable, modular, and scalable software solutions using ABP Framework.", + "MasteringAbpFramework_Book_Key_Features_Description_2": "Learn how to implement SOLID principles and domain-driven design in your web applications.", + "MasteringAbpFramework_Book_Key_Features_Description_3": "Discover how ABP Framework speeds up your development cycle by automating repetitive tasks.", + "MasteringAbpFramework_Book_Description": "Book Description", + "MasteringAbpFramework_Book_Description_Details_1": "ABP Framework is a complete infrastructure for creating modern web applications by following software \n development best practices and conventions. With ABP's high-level framework and ecosystem, you can \n implement the Don't Repeat Yourself (DRY) principle and focus on your business code.", + "MasteringAbpFramework_Book_Description_Details_2": "Written by the creator of ABP Framework, this book will help you to gain a complete understanding of the\n framework and modern web application development techniques. With step-by-step explanations of essential\n concepts and practical examples, you'll understand the requirements of a modern web solution and how ABP\n Framework makes it enjoyable to develop your own solutions. You'll discover the common requirements of\n enterprise web application development and explore the infrastructure provided by ABP. Throughout the\n book, you'll get to grips with software development best practices for building maintainable and modular\n web solutions.", + "MasteringAbpFramework_Book_Description_Details_3": "By the end of this book, you'll be able to create a complete web solution that is easy to develop,\n maintain, and test.", + "MasteringAbpFramework_Book_WhatYouWillLearn": "What you will learn", + "MasteringAbpFramework_Book_What_You_Will_Learn_1": "Set up the development environment and get started with ABP Framework.", + "MasteringAbpFramework_Book_What_You_Will_Learn_2": "Work with Entity Framework Core and MongoDB to develop your data access layer.", + "MasteringAbpFramework_Book_What_You_Will_Learn_3": "Understand cross-cutting concerns and how ABP automates repetitive tasks.", + "MasteringAbpFramework_Book_What_You_Will_Learn_4": "Get to grips with implementing domain-driven design with ABP Framework.", + "MasteringAbpFramework_Book_What_You_Will_Learn_5": "Build UI pages and components with ASP.NET Core MVC (Razor Pages) and Blazor.", + "MasteringAbpFramework_Book_What_You_Will_Learn_6": "Work with multi-tenancy to create modular web applications.", + "MasteringAbpFramework_Book_What_You_Will_Learn_7": "Understand modularity and create reusable application modules.", + "MasteringAbpFramework_Book_What_You_Will_Learn_8": "Write unit, integration, and UI tests using ABP Framework.", + "MasteringAbpFramework_Book_WhoIsThisBookFor": "Who's this book for", + "MasteringAbpFramework_Book_WhoIsThisBookFor_Description": "This book is for web developers who want to learn software architectures and best practices for building\n maintainable web-based solutions using Microsoft technologies and ABP Framework. Basic knowledge of C#\n and ASP.NET Core is necessary to get started with this book.", "ComputersAndTechnology": "Computers & Technology" } }