From 662bf8f5d5f06367e45025b07d4d2cc75295066a Mon Sep 17 00:00:00 2001 From: Will Strohl Date: Wed, 10 Jun 2020 19:36:43 -0700 Subject: [PATCH 1/3] Typo and localization updates in the default template --- WebDeploy/HCCCMS.template | 34 +++++++++++++++++++--------- WebDeploy/HCCCMS.template.en-US.resx | 6 +++++ 2 files changed, 29 insertions(+), 11 deletions(-) diff --git a/WebDeploy/HCCCMS.template b/WebDeploy/HCCCMS.template index 7985985e7..b7b589e20 100644 --- a/WebDeploy/HCCCMS.template +++ b/WebDeploy/HCCCMS.template @@ -551,7 +551,7 @@ 0 - @@ -622,11 +622,11 @@ @@ -689,15 +689,15 @@ @@ -760,8 +760,8 @@ @@ -826,7 +826,7 @@ <div class="span6"> <img alt="Hotcakes Commerce" class="icon" src="/portals/0/Images/hc-logo-white.png" /> <h2>[Tab.Home.HccCloud.Header]</h2> - <a class="btn" href="https://upendoventures.com/Shop/Product/Hotcakes-Commerce-Cloud?utm_source=hcc&utm_medium=cms&utm_campaign=330" target="_blank">Hotcakes Cloud</a> + <a class="btn" href="https://upendoventures.com/Shop/Product/Hotcakes-Commerce-Cloud?utm_source=hcc&utm_medium=cms&utm_campaign=340" target="_blank">Hotcakes Cloud</a> </div> <div class="span6"> <img alt="Hotcakes Commerce" class="sample" src="/portals/0/Images/mac-laptop.png" /> @@ -896,7 +896,7 @@ <p>[Tab.Home.SeeHow.Description]</p> </div> <div class="span5"> - <a class="btn" href="https://hotcakes.org/Product?utm_source=hcc&utm_medium=cms&utm_campaign=330" target="_blank">[Tab.Home.SeeHow.Link.Text]</a> + <a class="btn" href="https://mmmcommerce.com/Product?utm_source=hcc&utm_medium=cms&utm_campaign=340" target="_blank">[Tab.Home.SeeHow.Link.Text]</a> </div> </div> </div> @@ -961,7 +961,19 @@ 0 - + diff --git a/WebDeploy/HCCCMS.template.en-US.resx b/WebDeploy/HCCCMS.template.en-US.resx index 558aed024..d46e501f3 100644 --- a/WebDeploy/HCCCMS.template.en-US.resx +++ b/WebDeploy/HCCCMS.template.en-US.resx @@ -277,6 +277,12 @@ Fax: (555) 555-4564 Don't know what products to add yet? Add some samples in 1-click! + + Sample Products + + + Step 3 + Enjoy building your new online store! From d8bac5f29579146570a8ffdcd47f4895861dce62 Mon Sep 17 00:00:00 2001 From: Will Strohl Date: Thu, 11 Jun 2020 14:24:25 -0700 Subject: [PATCH 2/3] Resolves #294 --- .../Core/Admin/AppCode/MenuProvider.cs | 31 +++++-------------- 1 file changed, 8 insertions(+), 23 deletions(-) diff --git a/Website/DesktopModules/Hotcakes/Core/Admin/AppCode/MenuProvider.cs b/Website/DesktopModules/Hotcakes/Core/Admin/AppCode/MenuProvider.cs index e5ce23849..d22262199 100644 --- a/Website/DesktopModules/Hotcakes/Core/Admin/AppCode/MenuProvider.cs +++ b/Website/DesktopModules/Hotcakes/Core/Admin/AppCode/MenuProvider.cs @@ -34,6 +34,7 @@ using DotNetNuke.Common.Utilities; using DotNetNuke.Services.Localization; using Hotcakes.Commerce; +using Hotcakes.Commerce.Globalization; using Hotcakes.Modules.Core.AppCode; namespace Hotcakes.Modules.Core.Admin.AppCode @@ -41,27 +42,10 @@ namespace Hotcakes.Modules.Core.Admin.AppCode [Serializable] public class MenuProvider { - protected static string LocalResourceFile - { - get - { - string language = System.Threading.Thread.CurrentThread.CurrentCulture.ToString(); - if (System.Web.HttpContext.Current.Request.Cookies["language"] != null) - { - language = string.Concat(".", HttpContext.Current.Request.Cookies["language"].Value); - } - - if (language.ToLower() == ".en-us") - { - language = string.Empty; - } - - return (string.Format("~/DesktopModules/Hotcakes/Core/Admin/App_LocalResources/AdminControlBar{0}.resx", language)); - } - } - + private const string localResourceFile = + "~/DesktopModules/Hotcakes/Core/Admin/App_LocalResources/AdminControlBar.resx"; private const string _MenuFileVirtualPath = "~/DesktopModules/Hotcakes/Core/Admin/Menu.xml"; - + private static ILocalizationHelper localization { get; set; } private static List _menuItems; public static List MenuItems @@ -159,18 +143,19 @@ public static bool IsCurrent(MenuItem mi, string url) private static List ParseXml(XElement el) { - string LocalizedFile = LocalResourceFile; - if (!el.HasElements) { return new List(); } + + localization = Factory.Instance.CreateLocalizationHelper(localResourceFile); + return el.Elements() .Select(e => new MenuItem { Name = e.GetAttributeValue("Name"), //Localize Text String that Loaded from Menu.xml - Text = Localization.GetString(e.GetAttributeValue("Text"), LocalizedFile), + Text = localization.GetString(e.GetAttributeValue("Text")), BaseUrl = e.GetAttributeValue("BaseUrl"), Url = e.GetAttributeValue("Url"), PermissionToken = e.GetAttributeValue("Permission"), From 6c15f18784b81b74e55b1aa974fdb28d357392c8 Mon Sep 17 00:00:00 2001 From: Will Strohl Date: Thu, 11 Jun 2020 18:25:30 -0700 Subject: [PATCH 3/3] Prep for 03.04.01 release --- Build.proj | 4 +- CommonAssemblyInfo.cs | 2 +- GlobalAssemblyInfo.cs | 4 +- Website/DesktopModules/Hotcakes/Hotcakes.dnn | 54 +++++++++---------- .../Hotcakes/Hotcakes_Symbols.dnn | 4 +- .../DesktopModules/Hotcakes/ReleaseNotes.txt | 45 ++++++++++++++++ 6 files changed, 79 insertions(+), 34 deletions(-) diff --git a/Build.proj b/Build.proj index 369f9b105..8b2b92ccc 100644 --- a/Build.proj +++ b/Build.proj @@ -8,14 +8,14 @@ - 03.04.00 + 03.04.01 01.00.00 01.00.00 - 03.04.00 + 03.04.01 $(BUILD_NUMBER) $(BUILD_NUMBER) diff --git a/CommonAssemblyInfo.cs b/CommonAssemblyInfo.cs index 41f62e8ca..67931de3a 100644 --- a/CommonAssemblyInfo.cs +++ b/CommonAssemblyInfo.cs @@ -11,7 +11,7 @@ [assembly: CLSCompliant(false)] [assembly: ComVisible(false)] -[assembly: AssemblyVersion("3.04.00")] +[assembly: AssemblyVersion("3.04.01")] [assembly: AssemblyDelaySign(false)] [assembly: AssemblyKeyFile("")] [assembly: AssemblyKeyName("")] diff --git a/GlobalAssemblyInfo.cs b/GlobalAssemblyInfo.cs index a94cff24b..1c3905084 100644 --- a/GlobalAssemblyInfo.cs +++ b/GlobalAssemblyInfo.cs @@ -10,7 +10,7 @@ [assembly: System.Reflection.AssemblyCopyright("Copyright © 2020. All rights reserved.")] [assembly: System.Reflection.AssemblyConfiguration("Release")] -[assembly: System.Reflection.AssemblyVersion("03.04.00")] +[assembly: System.Reflection.AssemblyVersion("03.04.01")] [assembly: System.Reflection.AssemblyFileVersion("01.00.00")] [assembly: System.Reflection.AssemblyInformationalVersion("01.00.00")] @@ -22,7 +22,7 @@ internal sealed partial class ThisAssembly { internal const string AssemblyConfiguration = "Release"; - internal const string AssemblyVersion = "03.04.00"; + internal const string AssemblyVersion = "03.04.01"; internal const string AssemblyFileVersion = "01.00.00"; diff --git a/Website/DesktopModules/Hotcakes/Hotcakes.dnn b/Website/DesktopModules/Hotcakes/Hotcakes.dnn index dacb06e18..dc9893a78 100644 --- a/Website/DesktopModules/Hotcakes/Hotcakes.dnn +++ b/Website/DesktopModules/Hotcakes/Hotcakes.dnn @@ -1,6 +1,6 @@ - + Hotcakes Commerce ~/DesktopModules/Hotcakes/Core/Images/hcc-logo.png @@ -58,7 +58,7 @@ Hotcakes.Modules.Core.HotcakesController, Hotcakes.Modules [DESKTOPMODULEID] - 01.00.00,01.00.07,01.05.00,01.06.00,01.07.00,01.08.00,01.09.00,01.10.00,02.00.00,02.00.01,02.00.02,02.00.03,02.00.04,02.00.05,02.00.06,03.00.00,03.00.01,03.01.00,03.02.00,03.02.01,03.02.02,03.02.03,03.03.00,03.04.00 + 01.00.00,01.00.07,01.05.00,01.06.00,01.07.00,01.08.00,01.09.00,01.10.00,02.00.00,02.00.01,02.00.02,02.00.03,02.00.04,02.00.05,02.00.06,03.00.00,03.00.01,03.01.00,03.02.00,03.02.01,03.02.02,03.02.03,03.03.00,03.04.00,03.04.01 @@ -208,7 +208,7 @@ @@ -548,7 +548,7 @@ - + Hotcakes Extension Url Provider ~/DesktopModules/Hotcakes/Core/Images/hcc-logo.png @@ -574,7 +574,7 @@ - + Hotcakes Address Book Core/Images/hcc-logo.png @@ -628,7 +628,7 @@ - + Hotcakes Cart Core/Images/hcc-logo.png @@ -700,7 +700,7 @@ - + Hotcakes Category Menu Core/Images/hcc-logo.png @@ -772,7 +772,7 @@ - + Hotcakes Category Viewer Core/Images/hcc-logo.png @@ -846,7 +846,7 @@ - + Hotcakes Checkout Core/Images/hcc-logo.png @@ -948,7 +948,7 @@ - + Hotcakes Featured Products Core/Images/hcc-logo.png @@ -1020,7 +1020,7 @@ - + Hotcakes Last Products Viewed Core/Images/hcc-logo.png @@ -1092,7 +1092,7 @@ - + Hotcakes Mini Cart Core/Images/hcc-logo.png @@ -1164,7 +1164,7 @@ - + Hotcakes Search Input Core/Images/hcc-logo.png @@ -1236,7 +1236,7 @@ - + HCSKINAFFILIATE SkinObject ~/DesktopModules/Hotcakes/Core/Images/hcc-logo.png @@ -1269,7 +1269,7 @@ - + HCSKINSEARCH SkinObject ~/DesktopModules/Hotcakes/Core/Images/hcc-logo.png @@ -1302,7 +1302,7 @@ - + Hotcakes Order History Core/Images/hcc-logo.png @@ -1374,7 +1374,7 @@ - + Hotcakes Product Grid Core/Images/hcc-logo.png @@ -1444,7 +1444,7 @@ - + Hotcakes Product Viewer Core/Images/hcc-logo.png @@ -1518,7 +1518,7 @@ - + Hotcakes Product Reviews Core/Images/hcc-logo.png @@ -1590,7 +1590,7 @@ - + Hotcakes Content Blocks Core/Images/hcc-logo.png @@ -1662,7 +1662,7 @@ - + Hotcakes Search Core/Images/hcc-logo.png @@ -1734,7 +1734,7 @@ - + Hotcakes Top Weekly Sellers Core/Images/hcc-logo.png @@ -1806,7 +1806,7 @@ - + Hotcakes Top 10 Products Core/Images/hcc-logo.png @@ -1878,7 +1878,7 @@ - + Hotcakes Wish List Core/Images/hcc-logo.png @@ -1932,7 +1932,7 @@ - + Hotcakes Affiliate Registration Hotcakes Wish List @@ -1987,7 +1987,7 @@ - + Hotcakes Affiliate Dashboard Core/Images/hcc-logo.png @@ -2042,4 +2042,4 @@ - + \ No newline at end of file diff --git a/Website/DesktopModules/Hotcakes/Hotcakes_Symbols.dnn b/Website/DesktopModules/Hotcakes/Hotcakes_Symbols.dnn index b1865ce31..8531daedc 100644 --- a/Website/DesktopModules/Hotcakes/Hotcakes_Symbols.dnn +++ b/Website/DesktopModules/Hotcakes/Hotcakes_Symbols.dnn @@ -1,6 +1,6 @@ - + Hotcakes Commerce Symbols ~/DesktopModules/Hotcakes/Core/Images/hcc-logo.png @@ -15,7 +15,7 @@ true 09.02.02 - Hotcakes.Core + Hotcakes.Core diff --git a/Website/DesktopModules/Hotcakes/ReleaseNotes.txt b/Website/DesktopModules/Hotcakes/ReleaseNotes.txt index d4d4aa3fe..9aad86545 100644 --- a/Website/DesktopModules/Hotcakes/ReleaseNotes.txt +++ b/Website/DesktopModules/Hotcakes/ReleaseNotes.txt @@ -4,6 +4,51 @@ .muy-importante { color:red;font-weight:bold; }
+

Hotcakes Commerce: Version 03.04.01

+ +

The release notes continue after the Sponsors and Code Contributors below.

+ +

Sponsors

+

Open-source is not free. We're so GRATEFUL for the following people/organizations for sponsoring developers to work on this release!

+

Sponsorship is Powered by GitHub Sponsors and ensures that this project lives and thrives. Please consider contributing any amount.

+

THANK YOU to the following rockstars!

+ + +

Code Contributors

+

THANK YOU to the following community members for participating in this release!

+ + +

Partners

+

THANK YOU to the following partners for participating in this release!

+ + +

Release Note Prefixes

+

The following prefixes are defined as:

+ + +

Enhancements

+
    +
  • Nothing to note in this release.
    • +
+ +

Maintenance Updates

+
    +
  • Issue 294 - Store administration menu localization not falling back to English.
    • +
+

Hotcakes Commerce: Version 03.04.00

Highlights