From 16c9a7c98202b0306ac67d52fc62fd8820d07f68 Mon Sep 17 00:00:00 2001 From: Berkan Sasmaz Date: Tue, 17 Aug 2021 12:24:07 +0300 Subject: [PATCH 1/7] Update en.json --- .../Commercial/Localization/Resources/en.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json index 6577e66dcf..a69a66554c 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json @@ -377,6 +377,14 @@ "AddressValidationMessage": "Address is too long!", "TaxNoValidationMessage": "TAX/VAT No is too long!", "NotesValidationMessage": "Notes field is too long!", - "CheckYourBillingInfo": "You can create your invoice only once! Check your billing info before creating your invoice." + "CheckYourBillingInfo": "You can create your invoice only once! Check your billing info before creating your invoice.", + "Volo.AbpIo.Commercial:030000": "You already used your trial period.", + "Volo.AbpIo.Commercial:030001": "There is already an organization called \"{CompanyName}\"", + "StartYourFreeTrial": "Start your free trial", + "TrialLicenseModelInvalidErrorMessage": "CountryName, CompanySize, Industry or PurposeOfUsage do not match.", + "Trial": "Trial", + "Purchased": "Purchased", + "PurchaseTeamNow": "Purchase Team Now", + "PurchaseTrialLicenseMessage": "Your license end date is {0}.
If you want to continue using the ABP projects you created during the trial licensing process, replace the code below with the code in the appsettings.secrets.json file in your project.
{1}" } } \ No newline at end of file From 0e588f0a1a4347da53248bf4c868ecf3d31b7f11 Mon Sep 17 00:00:00 2001 From: Alper Ebicoglu Date: Tue, 17 Aug 2021 13:37:44 +0300 Subject: [PATCH 2/7] Update en.json --- .../Commercial/Localization/Resources/en.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json index a69a66554c..61a16b6972 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json @@ -381,10 +381,10 @@ "Volo.AbpIo.Commercial:030000": "You already used your trial period.", "Volo.AbpIo.Commercial:030001": "There is already an organization called \"{CompanyName}\"", "StartYourFreeTrial": "Start your free trial", - "TrialLicenseModelInvalidErrorMessage": "CountryName, CompanySize, Industry or PurposeOfUsage do not match.", + "TrialLicenseModelInvalidErrorMessage": "One of the following fields are invalid: Country Name, Company Size, Industry or Purpose Of Usage.", "Trial": "Trial", "Purchased": "Purchased", - "PurchaseTeamNow": "Purchase Team Now", + "PurchaseTeamNow": "Purchase Team License", "PurchaseTrialLicenseMessage": "Your license end date is {0}.
If you want to continue using the ABP projects you created during the trial licensing process, replace the code below with the code in the appsettings.secrets.json file in your project.
{1}" } } \ No newline at end of file From e4f811a673ab573e31f0f7bf350cd373972ff1fe Mon Sep 17 00:00:00 2001 From: Berkan Sasmaz Date: Tue, 24 Aug 2021 10:33:04 +0300 Subject: [PATCH 3/7] Add missing localization --- .../Commercial/Localization/Resources/en.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json index 61a16b6972..119c97f3d9 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json @@ -384,7 +384,9 @@ "TrialLicenseModelInvalidErrorMessage": "One of the following fields are invalid: Country Name, Company Size, Industry or Purpose Of Usage.", "Trial": "Trial", "Purchased": "Purchased", - "PurchaseTeamNow": "Purchase Team License", - "PurchaseTrialLicenseMessage": "Your license end date is {0}.
If you want to continue using the ABP projects you created during the trial licensing process, replace the code below with the code in the appsettings.secrets.json file in your project.
{1}" + "PurchaseNow": "Purchase License", + "PurchaseTrialLicenseMessage": "Your {0} license end date is {1}.
If you want to continue using the ABP projects you created during the trial licensing process, replace the code below with the code in the appsettings.secrets.json file in your project.", + "TrialLicenseExpireMessage": "Your trial license will expire on {0}.", + "TryForFree": "Try For Free" } } \ No newline at end of file From 222c56241d6e913c2a927a68c1b7374631c206f0 Mon Sep 17 00:00:00 2001 From: Berkan Sasmaz Date: Wed, 8 Sep 2021 18:27:44 +0300 Subject: [PATCH 4/7] Add missing localizations --- .../Base/Localization/Resources/en.json | 5 ++++- .../Commercial/Localization/Resources/en.json | 10 ++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/en.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/en.json index b9c8d23563..c1ae2058ac 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/en.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/en.json @@ -35,6 +35,9 @@ "Support": "Support", "FreeDDDBook": "Free DDD E-book", "New": "New", - "Volo.AbpIo.Domain:020005": "License extend year can not be lower than {MinExtendLicenseYear} year and greater than {MaxExtendLicenseYear} years " + "Volo.AbpIo.Domain:020005": "License extend year can not be lower than {MinExtendLicenseYear} year and greater than {MaxExtendLicenseYear} years ", + "TrialLicensePeriodHasExpired": "Your trial license period has expired {0} days ago.", + "TrialLicensePeriodWillExpire": "Your trial license period will be expired in {0} days.", + "PurchaseNow": "Purchase Now!" } } \ No newline at end of file diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json index 24b07f8624..aba7589487 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json @@ -380,13 +380,15 @@ "CheckYourBillingInfo": "You can create your invoice only once! Check your billing info before creating your invoice.", "Volo.AbpIo.Commercial:030000": "You already used your trial period.", "Volo.AbpIo.Commercial:030001": "There is already an organization called \"{CompanyName}\"", + "Volo.AbpIo.Commercial:030002": "You already own an organization that has a license.", "StartYourFreeTrial": "Start your free trial", "TrialLicenseModelInvalidErrorMessage": "One of the following fields are invalid: Country Name, Company Size, Industry or Purpose Of Usage.", "Trial": "Trial", "Purchased": "Purchased", - "PurchaseNow": "Purchase License", - "PurchaseTrialLicenseMessage": "Your {0} license end date is {1}.
If you want to continue using the ABP projects you created during the trial licensing process, replace the code below with the code in the appsettings.secrets.json file in your project.", - "TrialLicenseExpireMessage": "Your trial license will expire on {0}.", - "TryForFree": "Try For Free" + "PurchaseLicense": "Purchase License", + "PurchaseTrialLicenseMessage": "Your license expiration date is {0}.
If you want to continue using the projects you created during your free trial period, you need to change the license keys in your appsettings.secrets.json files. Here is your license key:", + "TrialLicenseExpireMessage": "You are using the trial license and your trial license will expire on {0}.", + "TryForFree": "Try For Free", + "TrialLicenseExpiredInfo": "Your trial license period has expired!" } } \ No newline at end of file From 0f8da372f042bd01b98e32deecb4aead5581092f Mon Sep 17 00:00:00 2001 From: Berkan Sasmaz Date: Thu, 9 Sep 2021 13:28:39 +0300 Subject: [PATCH 5/7] Add missing localizations --- .../AbpIoLocalization/Base/Localization/Resources/en.json | 1 + .../AbpIoLocalization/Commercial/Localization/Resources/en.json | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/en.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/en.json index c1ae2058ac..ce28dcdb02 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/en.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/en.json @@ -38,6 +38,7 @@ "Volo.AbpIo.Domain:020005": "License extend year can not be lower than {MinExtendLicenseYear} year and greater than {MaxExtendLicenseYear} years ", "TrialLicensePeriodHasExpired": "Your trial license period has expired {0} days ago.", "TrialLicensePeriodWillExpire": "Your trial license period will be expired in {0} days.", + "TrialLicensePeriodExpireToday": "Your trial license period will be expired today.", "PurchaseNow": "Purchase Now!" } } \ No newline at end of file diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json index 6c61b37cf0..212212c4d5 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json @@ -380,7 +380,6 @@ "CheckYourBillingInfo": "You can create your invoice only once! Check your billing information before creating your invoice.", "Volo.AbpIo.Commercial:030000": "You already used your trial period.", "Volo.AbpIo.Commercial:030001": "There is already an organization called \"{CompanyName}\"", - "Volo.AbpIo.Commercial:030002": "You already own an organization that has a license.", "StartYourFreeTrial": "Start your free trial", "TrialLicenseModelInvalidErrorMessage": "One of the following fields are invalid: Country Name, Company Size, Industry or Purpose Of Usage.", "Trial": "Trial", From 5ad19d65602fb22a67d0766b6cb8e38676c64750 Mon Sep 17 00:00:00 2001 From: Berkan Sasmaz Date: Fri, 10 Sep 2021 10:01:29 +0300 Subject: [PATCH 6/7] Update en.json --- .../AbpIoLocalization/Commercial/Localization/Resources/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json index 212212c4d5..b31c33621c 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json @@ -379,7 +379,7 @@ "NotesValidationMessage": "Notes field is too long!", "CheckYourBillingInfo": "You can create your invoice only once! Check your billing information before creating your invoice.", "Volo.AbpIo.Commercial:030000": "You already used your trial period.", - "Volo.AbpIo.Commercial:030001": "There is already an organization called \"{CompanyName}\"", + "Volo.AbpIo.Commercial:030001": "This organization name already exists.", "StartYourFreeTrial": "Start your free trial", "TrialLicenseModelInvalidErrorMessage": "One of the following fields are invalid: Country Name, Company Size, Industry or Purpose Of Usage.", "Trial": "Trial", From 6cbaeb6728564ae4d437dae231eceed6acad1842 Mon Sep 17 00:00:00 2001 From: ebicoglu Date: Fri, 10 Sep 2021 12:32:15 +0300 Subject: [PATCH 7/7] Update en.json --- .../AbpIoLocalization/Base/Localization/Resources/en.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/en.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/en.json index ce28dcdb02..e5ef47d419 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/en.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/en.json @@ -35,10 +35,10 @@ "Support": "Support", "FreeDDDBook": "Free DDD E-book", "New": "New", - "Volo.AbpIo.Domain:020005": "License extend year can not be lower than {MinExtendLicenseYear} year and greater than {MaxExtendLicenseYear} years ", - "TrialLicensePeriodHasExpired": "Your trial license period has expired {0} days ago.", + "Volo.AbpIo.Domain:020005": "License extend year can not be lower than {MinExtendLicenseYear} year(s) and greater than {MaxExtendLicenseYear} year(s) ", + "TrialLicensePeriodHasExpired": "Your trial license period expired {0} days ago.", "TrialLicensePeriodWillExpire": "Your trial license period will be expired in {0} days.", "TrialLicensePeriodExpireToday": "Your trial license period will be expired today.", "PurchaseNow": "Purchase Now!" } -} \ No newline at end of file +}