Merge pull request #20327 from abpframework/salihozkara/abpUnited

abp united

README.md

@@ -1,6 +1,6 @@
 # ABP Framework
 
-![build and test](https://img.shields.io/github/actions/workflow/status/abpframework/abp/build-and-test.yml?branch=dev&style=flat-square) 🔹 [![codecov](https://codecov.io/gh/abpframework/abp/branch/dev/graph/badge.svg?token=jUKLCxa6HF)](https://codecov.io/gh/abpframework/abp) 🔹 [![NuGet](https://img.shields.io/nuget/v/Volo.Abp.Core.svg?style=flat-square)](https://www.nuget.org/packages/Volo.Abp.Core) 🔹 [![NuGet (with prereleases)](https://img.shields.io/nuget/vpre/Volo.Abp.Core.svg?style=flat-square)](https://www.nuget.org/packages/Volo.Abp.Core) 🔹 [![MyGet (nightly builds)](https://img.shields.io/myget/abp-nightly/vpre/Volo.Abp.svg?style=flat-square)](https://docs.abp.io/en/abp/latest/Nightly-Builds) 🔹 
+![build and test](https://img.shields.io/github/actions/workflow/status/abpframework/abp/build-and-test.yml?branch=dev&style=flat-square) 🔹 [![codecov](https://codecov.io/gh/abpframework/abp/branch/dev/graph/badge.svg?token=jUKLCxa6HF)](https://codecov.io/gh/abpframework/abp) 🔹 [![NuGet](https://img.shields.io/nuget/v/Volo.Abp.Core.svg?style=flat-square)](https://www.nuget.org/packages/Volo.Abp.Core) 🔹 [![NuGet (with prereleases)](https://img.shields.io/nuget/vpre/Volo.Abp.Core.svg?style=flat-square)](https://www.nuget.org/packages/Volo.Abp.Core) 🔹 [![MyGet (nightly builds)](https://img.shields.io/myget/abp-nightly/vpre/Volo.Abp.svg?style=flat-square)](https://abp.io/docs/latest/release-info/nightly-builds) 🔹 
 [![NuGet Download](https://img.shields.io/nuget/dt/Volo.Abp.Core.svg?style=flat-square)](https://www.nuget.org/packages/Volo.Abp.Core) 🔹 [![Code of Conduct](https://img.shields.io/badge/Contributor%20Covenant-v2.0%20adopted-ff69b4.svg)](https://github.com/abpframework/abp/blob/dev/CODE_OF_CONDUCT.md) 🔹 [![CLA Signed](https://cla-assistant.io/readme/badge/abpframework/abp)](https://cla-assistant.io/abpframework/abp) 🔹 [![Discord Shield](https://discord.com/api/guilds/951497912645476422/widget.png?style=shield)](https://discord.gg/abp)
 
 ABP Framework is a complete **infrastructure** based on **ASP.NET Core** that creates **modern web applications** and **APIs** by following the software development **best practices** and the **latest technologies**.
@@ -9,9 +9,9 @@ ABP Framework is a complete **infrastructure** based on **ASP.NET Core** that cr
 
 ## Getting Started
 
-- [Quick Start](https://docs.abp.io/en/abp/latest/Tutorials/Todo/Index) is a single-part, quick-start tutorial to build a simple application with the ABP Framework. Start with this tutorial if you want to understand how ABP works quickly.
-- [Getting Started guide](https://docs.abp.io/en/abp/latest/Getting-Started) can be used to create and run ABP-based solutions with different options and details.
-- [Web Application Development Tutorial](https://docs.abp.io/en/abp/latest/Tutorials/Part-1) is a complete tutorial on developing a full-stack web application with all aspects of a real-life solution.
+- [Quick Start](https://abp.io/docs/latest/tutorials/todo) is a single-part, quick-start tutorial to build a simple application with the ABP Framework. Start with this tutorial if you want to understand how ABP works quickly.
+- [Getting Started guide](https://abp.io/docs/latest/get-started) can be used to create and run ABP-based solutions with different options and details.
+- [Web Application Development Tutorial](https://abp.io/docs/latest/tutorials/book-store) is a complete tutorial on developing a full-stack web application with all aspects of a real-life solution.
 
 ### Quick Start
 
@@ -27,7 +27,7 @@ Create a new solution:
 > abp new BookStore -u mvc -d ef
 ````
 
-> See the [CLI documentation](https://docs.abp.io/en/abp/latest/CLI) for all available options.
+> See the [CLI documentation](https://abp.io/docs/latest/cli) for all available options.
 
 
 
@@ -53,40 +53,40 @@ ABP provides a **full stack developer experience**.
 
 <img src="docs/en/images/ddd-microservice-simple.png">
 
-ABP offers a complete, **modular** and **layered** software architecture based on **[Domain Driven Design](https://docs.abp.io/en/abp/latest/Domain-Driven-Design)** principles and patterns. It also provides the necessary infrastructure and guidance to [implement this architecture](https://docs.abp.io/en/abp/latest/Domain-Driven-Design-Implementation-Guide).
+ABP offers a complete, **modular** and **layered** software architecture based on **[Domain Driven Design](https://abp.io/docs/latest/framework/architecture/domain-driven-design)** principles and patterns. It also provides the necessary infrastructure and guidance to [implement this architecture](https://abp.io/books/implementing-domain-driven-design).
 
-ABP Framework is suitable for **[microservice solutions](https://docs.abp.io/en/abp/latest/Microservice-Architecture)** as well as monolithic applications.
+ABP Framework is suitable for **[microservice solutions](https://abp.io/docs/latest/framework/architecture/microservices)** as well as monolithic applications.
 
 
 
 ### Infrastructure
 
-There are a lot of features provided by the ABP Framework to achieve real-world scenarios easier, like [Event Bus](https://docs.abp.io/en/abp/latest/Event-Bus), [Background Job System](https://docs.abp.io/en/abp/latest/Background-Jobs), [Audit Logging](https://docs.abp.io/en/abp/latest/Audit-Logging), [BLOB Storing](https://docs.abp.io/en/abp/latest/Blob-Storing), [Data Seeding](https://docs.abp.io/en/abp/latest/Data-Seeding), [Data Filtering](https://docs.abp.io/en/abp/latest/Data-Filtering), etc.
+There are a lot of features provided by the ABP Framework to achieve real-world scenarios easier, like [Event Bus](https://abp.io/docs/latest/framework/infrastructure/event-bus), [Background Job System](https://abp.io/docs/latest/framework/infrastructure/background-jobs), [Audit Logging](https://abp.io/docs/latest/framework/infrastructure/audit-logging), [BLOB Storing](https://abp.io/docs/latest/framework/infrastructure/blob-storing), [Data Seeding](https://abp.io/docs/latest/framework/infrastructure/data-seeding), [Data Filtering](https://abp.io/docs/latest/framework/infrastructure/data-filtering), etc.
 
 
 
 ### Cross-Cutting Concerns
 
-ABP also simplifies (and even automates wherever possible) cross-cutting concerns and common non-functional requirements like [Exception Handling](https://docs.abp.io/en/abp/latest/Exception-Handling), [Validation](https://docs.abp.io/en/abp/latest/Validation), [Authorization](https://docs.abp.io/en/abp/latest/Authorization), [Localization](https://docs.abp.io/en/abp/latest/Localization), [Caching](https://docs.abp.io/en/abp/latest/Caching), [Dependency Injection](https://docs.abp.io/en/abp/latest/Dependency-Injection), [Setting Management](https://docs.abp.io/en/abp/latest/Settings), etc.
+ABP also simplifies (and even automates wherever possible) cross-cutting concerns and common non-functional requirements like [Exception Handling](https://abp.io/docs/latest/framework/fundamentals/exception-handling), [Validation](https://abp.io/docs/latest/framework/fundamentals/validation), [Authorization](https://abp.io/docs/latest/framework/fundamentals/authorizationn), [Localization](https://abp.io/docs/latest/framework/fundamentals/localization), [Caching](https://abp.io/docs/latest/framework/fundamentals/caching), [Dependency Injection](https://abp.io/docs/latest/framework/fundamentals/dependency-injection), [Setting Management](https://abp.io/docs/latest/framework/infrastructure/settings), etc.
 
 
 
 ### Application Modules
 
 ABP is a modular framework and the Application Modules provide **pre-built application functionalities**;
 
-- [**Account**](https://docs.abp.io/en/abp/latest/Modules/Account): Provides UI for the account management and allows user to login/register to the application.
-- **[Identity](https://docs.abp.io/en/abp/latest/Modules/Identity)**: Manages organization units, roles, users and their permissions based on the Microsoft Identity library.
-- [**OpenIddict**](https://docs.abp.io/en/abp/latest/Modules/OpenIddict): Integrates to OpenIddict.
-- [**Tenant Management**](https://docs.abp.io/en/abp/latest/Modules/Tenant-Management): Manages tenants for a [multi-tenant](https://docs.abp.io/en/abp/latest/Multi-Tenancy) (SaaS) application.
+- [**Account**](https://abp.io/docs/latest/modules/account): Provides UI for the account management and allows user to login/register to the application.
+- **[Identity](https://abp.io/docs/latest/modules/identity)**: Manages organization units, roles, users and their permissions based on the Microsoft Identity library.
+- [**OpenIddict**](https://abp.io/docs/latest/modules/openiddict): Integrates to OpenIddict.
+- [**Tenant Management**](https://abp.io/docs/latest/modules/tenant-management): Manages tenants for a [multi-tenant](https://abp.io/docs/latest/framework/architecture/multi-tenancy) (SaaS) application.
 
-See the [Application Modules](https://docs.abp.io/en/abp/latest/Modules/Index) document for all pre-built modules.
+See the [Application Modules](https://abp.io/docs/latest/modules) document for all pre-built modules.
 
 
 
 ### Startup Templates
 
-The [Startup templates](https://docs.abp.io/en/abp/latest/Startup-Templates/Index) are pre-built Visual Studio solution templates. You can create your own solution based on these templates to **immediately start your development**.
+The [Startup templates](https://abp.io/docs/latest/solution-templates) are pre-built Visual Studio solution templates. You can create your own solution based on these templates to **immediately start your development**.
 
 
 
@@ -102,31 +102,31 @@ This book will help you to gain a complete understanding of the ABP Framework an
 
 ### ABP Community Web Site
 
-The [ABP Community](https://community.abp.io/) is a website to publish **articles** and share **knowledge** about the ABP Framework. You can also create content for the community!
+The [ABP Community](https://abp.io/community) is a website to publish **articles** and share **knowledge** about the ABP Framework. You can also create content for the community!
 
 ### Blog
 
-Follow the [ABP Blog](https://blog.abp.io/) to learn the latest happenings in the ABP Framework.
+Follow the [ABP Blog](https://abp.io/blog) to learn the latest happenings in the ABP Framework.
 
 ### Samples
 
-See the [sample projects](https://docs.abp.io/en/abp/latest/Samples/Index) built with the ABP Framework.
+See the [sample projects](https://abp.io/docs/latest/samples) built with the ABP Framework.
 
 ### Want to Contribute?
 
-ABP is a community-driven open-source project. See [the contribution guide](https://docs.abp.io/en/abp/latest/Contribution/Index) if you want to participate in this project.
+ABP is a community-driven open-source project. See [the contribution guide](https://abp.io/docs/latest/contribution) if you want to participate in this project.
 
 
 
 ## Official Links
 
 * [Home Website](https://abp.io)
   * [Get Started](https://abp.io/get-started)
-  * [Features](https://abp.io/features)
-* [Documents](https://docs.abp.io/)
-* [Samples](https://docs.abp.io/en/abp/latest/Samples/Index)
-* [Blog](https://blog.abp.io/)
-* [Community](https://community.abp.io/)
+  * [Features](https://abp.io/framework)
+* [Documents](https://abp.io/docs/latest)
+* [Samples](https://abp.io/docs/latest/samples)
+* [Blog](https://abp.io/blog)
+* [Community](https://abp.io/community)
 * [Stackoverflow](https://stackoverflow.com/questions/tagged/abp)
 * [Twitter](https://twitter.com/abpframework)
 

abp_io/AbpIoLocalization/AbpIoLocalization/AbpIoLocalizationModule.cs

@@ -2,8 +2,6 @@
 using AbpIoLocalization.Admin.Localization;
 using AbpIoLocalization.Base.Localization;
 using AbpIoLocalization.Blog.Localization;
-using AbpIoLocalization.Commercial.Localization;
-using AbpIoLocalization.Community.Localization;
 using AbpIoLocalization.Docs.Localization;
 using AbpIoLocalization.Support.Localization;
 using AbpIoLocalization.Www;
@@ -28,9 +26,7 @@ public override void ConfigureServices(ServiceConfigurationContext context)
 
             Configure<AbpExceptionLocalizationOptions>(options =>
             {
-                options.MapCodeNamespace("Volo.AbpIo.Commercial", typeof(AbpIoCommercialResource));
                 options.MapCodeNamespace("Volo.AbpIo.Domain", typeof(AbpIoBaseResource));
-                options.MapCodeNamespace("Volo.AbpIo.Community", typeof(AbpIoCommunityResource));
             });
 
             Configure<AbpLocalizationOptions>(options =>
@@ -57,11 +53,6 @@ public override void ConfigureServices(ServiceConfigurationContext context)
                     .AddVirtualJson("/Blog/Localization/Resources")
                     .AddBaseTypes(typeof(AbpIoBaseResource));
 
-                options.Resources
-                    .Add<AbpIoCommercialResource>("en")
-                    .AddVirtualJson("/Commercial/Localization/Resources")
-                    .AddBaseTypes(typeof(AbpIoBaseResource));
-
                 options.Resources
                     .Add<AbpIoDocsResource>("en")
                     .AddVirtualJson("/Docs/Localization/Resources")
@@ -76,11 +67,6 @@ public override void ConfigureServices(ServiceConfigurationContext context)
                     .Add<AbpIoWwwResource>("en")
                     .AddVirtualJson("/Www/Localization/Resources")
                     .AddBaseTypes(typeof(AbpIoBaseResource));
-
-                options.Resources
-                    .Add<AbpIoCommunityResource>("en")
-                    .AddVirtualJson("/Community/Localization/Resources")
-                    .AddBaseTypes(typeof(AbpIoBaseResource));
             });
         }
     }

abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/en.json

@@ -72,7 +72,7 @@
     "Menu:NpmPackages": "NPM Packages",
     "Menu:Modules": "Modules",
     "Menu:Maintenance": "Maintenance",
-    "Menu:NugetPackages": "Nuget Packages",
+    "Menu:NugetPackages": "NuGet Packages",
     "CreateAnOrganization": "Create an organization",
     "Organizations": "Organizations",
     "LongName": "Long name",
@@ -219,8 +219,8 @@
     "ReIndexAllPostsConfirmationMessage": "Are you sure you want to reindex all posts?",
     "SuccessfullyReIndexAllPosts": "All posts have been successfully reindexed.",
     "Permission:FullSearch": "Full text search",
-    "Menu:CliAnalytics": "Cli Analytics",
-    "Menu:Reports": "Reports",
+    "Menu:CliAnalytics": "CLI Analytics",
+    "Menu:Reports": "Dynamic Reports",
     "TemplateName": "Template name",
     "TemplateVersion": "Template version",
     "DatabaseProvider": "Database provider",
@@ -232,7 +232,7 @@
     "UiFramework": "Ui framework",
     "Options": "Options",
     "CliAnalytics": "Cli Analytics",
-    "Reports": "Reports",
+    "Reports": "Dynamic Reports",
     "Permission:CliAnalyticses": "Cli Analyticses",
     "Permission:CliAnalytics": "Cli Analytics",
     "Permission:Reports": "Reports",
@@ -590,7 +590,7 @@
     "OrganizationDoesNotHaveACreditCardInGateway": "Organization does not have a credit card in the gateway!",
     "Permission:EditWinners": "Edit Winners",
     "Permission:ChangeDrawingStatus": "Change Drawing Status",
-    "Menu:Licenses": "Licenses",
+    "Menu:Licenses": "Licensing",
     "OrganizationId": "Organization Id",
     "RemoveAllWinnersConfirmationMessage": "Are you sure you want to remove all winners?",
     "AutoRenewals": "Auto Renewals",
@@ -623,6 +623,17 @@
     "DeleteImageSuccessMessage": "Image successfully deleted",
     "DeleteImage": "Delete Image",
     "NetTerms": "Terms (Days)",
+    "Menu:DynamicReports": "Dynamic Reports",
+    "Menu:Others": "Others",
+    "Menu:Packs&Modules": "Packs & Modules",
+    "ReleaseCaches": "Release Cache",
+    "Menu:HeroSections": "Hero Sections",
+    "HeroSections": "Hero Sections",
+    "DynamicReports": "Dynamic Reports",
+    "Menu:ReportsMenu": "Reports",
+    "Permission:HeroSections": "Hero Sections",
+    "RedirectLink": "Redirect link",
+    "HeroSectionsDeletionConfirmationMessage": "Are you sure you want to delete the hero section?",
     "AbpStudioName": "Abp Studio name"
   }
 }

abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/en.json

@@ -90,9 +90,9 @@
     "TermsAndConditions": "Terms & Conditions",
     "WouldLikeToReceiveMarketingMaterials": "I would like to receive marketing materials like product deals & special offers.",
     "JoinOurMarketingNewsletter": "Join our marketing newsletter",
-    "CommunityPrivacyPolicyConfirmation": "I agree to the Terms & Conditions and <a class=\"text-white fw-6 text-decoration-underline opacity-50\" href=\"https://commercial.abp.io/Privacy\">Privacy Policy</a>.",
+    "CommunityPrivacyPolicyConfirmation": "I agree to the Terms & Conditions and <a class=\"text-white fw-6 text-decoration-underline opacity-50\" href=\"/Privacy\">Privacy Policy</a>.",
     "WouldLikeToReceiveNotification": "I would like to receive the latest news from abp.io websites.",
-    "CommercialNewsletterConfirmationMessage": "I agree to the <a class=\"text-white fw-bolder text-decoration-underline\" href=\"https://commercial.abp.io/TermsConditions\">Terms & Conditions</a> and <a  class=\"text-white fw-bolder text-decoration-underline\" href=\"https://commercial.abp.io/Privacy\">Privacy Policy</a>.",
+    "CommercialNewsletterConfirmationMessage": "I agree to the <a href=\"/TermsConditions\">Terms & Conditions</a> and <a href=\"/Privacy\">Privacy Policy</a>.",
     "FreeDDDEBook": "Free DDD E-Book",
     "AdditionalServices": "Additional Services",
     "Learn": "Learn",
@@ -118,7 +118,7 @@
     "EULA": "EULA",
     "ABPCommercialIntroductionMessage": "Pre-built application modules, advanced startup templates, rapid application development tooling, professional UI themes and premium support.",
     "MasteringAbpFrameworkEBook": "Mastering ABP Framework",
-    "MasteringTheABPFrameworkExplanation": "Written by the creator of the ABP Framework, this book will help you gain a complete understanding of the framework and modern web application development techniques.",
+    "MasteringTheABPFrameworkExplanation": "Mastering ABP Framework e-book; written by the creator of the ABP Framework, will help you gain a complete understanding of the framework and modern web application development techniques.",
     "Speakers": "Speakers",
     "PreviousEvents": "Previous Events",
     "WatchTheEvent": "Watch the Event",
@@ -158,7 +158,7 @@
     "SeePreviousEvents": "See Previous Events",
     "CookieConsent_Accept": "Accept",
     "CookieConsent_Explanation_1": "We use cookies to give you the best experience on our website.",
-    "CookieConsent_Explanation_2": "If you continue to browse, then you agree to our <a href=\"@Url.Page(\"/Privacy\")\">Privacy policy and cookie policy.</a>.",
+    "CookieConsent_Explanation_2": "If you continue to browse, then you agree to our <a href=\"/Privacy\">Privacy policy and cookie policy.</a>.",
     "Error_Page_400_Title": "There was a problem serving the requested page.",
     "Error_Page_400_Description_1": "Usually this means that an unexpected error happened while processing your request.",
     "Error_Page_400_Description_2": "If the problem persists, contact us at <a href=\"mailto:info@abp.io\">info@abp.io</a> and we'll help get you on your way.",
@@ -239,7 +239,7 @@
     "Trainings": "Trainings",
     "MeetTheABPCommunity": "Meet the ABP <span class=\"gradient-community\">Community</span>",
     "DisplayName:CommunityIndexPagePoll": "Community Index Page Poll",
-    "ReturnOfInvestment": "Return Of Investment",
+    "ReturnOnInvestment": "Return On Investment",
     "PromotionalOffers": "Promotional Offers",
     "PromotionalOffersDefinition": "Discounts, seasonal campaigns, etc.",
     "EventsDefinition": "Community Talks, Webinars, ABP .NET Conference, etc.",