Release build 11.40.0 [ci release]

Author: shakyShane

CHANGELOG.txt

@@ -1,3 +1,2 @@
-- Support Windows permission handling in nested iframes in DDG-WebView (#2027)
-- Default disable page-context features that aren't currently used (#2018)
-- jingram/subscription win back banner: Adds Subscription Win-Back Banner (#2014)
+- Add Subscription NextSteps card to NTP (#2019)
+- history: adding sites support (#1954)

build/apple/pages/history/dist/index.css

@@ -724,6 +724,20 @@ body {
 [data-theme=dark] .Sidebar_item:focus-visible {
   background: var(--color-white-at-6);
 }
+.Sidebar_item.Sidebar_item_sites {
+  margin-top: 16px;
+}
+.Sidebar_item.Sidebar_item_sites::before {
+  content: "";
+  position: absolute;
+  top: -8px;
+  left: 16px;
+  right: 16px;
+  border-top: 1px solid var(--color-black-at-6);
+}
+[data-theme=dark] .Sidebar_item.Sidebar_item_sites::before {
+  border-top: 1px solid var(--color-white-at-6);
+}
 .Sidebar_item:hover .Sidebar_delete[aria-disabled=true] {
   opacity: 0.3;
   cursor: default;

build/apple/pages/history/dist/index.js

@@ -2857,6 +2857,10 @@
     range_older: {
       title: "Older",
       note: "Label on a button that shows older history entries."
+    },
+    range_sites: {
+      title: "Sites",
+      note: "Label on a button that shows which sites have been visited"
     }
   };
 
@@ -3491,7 +3495,8 @@
       "saturday",
       "sunday",
       "recentlyOpened",
-      "older"
+      "older",
+      "sites"
     ];
     return valid.includes(input) ? (
       /** @type {import('../types/history.js').RangeId} */
@@ -4368,7 +4373,7 @@
      * @param {string} props.url - The text to be displayed for the item.
      * @param {string} props.domain - The text to be displayed for the domain
      * @param {number} props.kind - The kind or type of the item that determines its visual style.
-     * @param {string} props.dateTimeOfDay - the time of day, like 11.00am.
+     * @param {string} [props.dateTimeOfDay] - the time of day, like 11.00am.
      * @param {string} props.dateRelativeDay - the time of day, like 11.00am.
      * @param {string|null} props.etldPlusOne
      * @param {number} props.index - original index
@@ -4404,7 +4409,7 @@
         )),
         /* @__PURE__ */ _("a", { href: props.url, "data-url": props.url, class: Item_default.entryLink, tabindex: 0 }, title),
         /* @__PURE__ */ _("span", { class: Item_default.domain, "data-testid": "Item.domain", title: props.domain }, props.domain),
-        /* @__PURE__ */ _("span", { class: Item_default.time }, dateTimeOfDay),
+        dateTimeOfDay && /* @__PURE__ */ _("span", { className: Item_default.time }, dateTimeOfDay),
         /* @__PURE__ */ _("button", { class: Item_default.dots, "data-action": BTN_ACTION_ENTRIES_MENU, "data-index": index, value: props.id, tabindex: -1 }, /* @__PURE__ */ _(Dots, null))
       ));
     }
@@ -4616,6 +4621,7 @@
     pageTitle: "Sidebar_pageTitle",
     nav: "Sidebar_nav",
     item: "Sidebar_item",
+    item_sites: "Sidebar_item_sites",
     delete: "Sidebar_delete",
     active: "Sidebar_active",
     link: "Sidebar_link",
@@ -4657,7 +4663,8 @@
     friday: "icons/day.svg",
     saturday: "icons/day.svg",
     sunday: "icons/day.svg",
-    older: "icons/older.svg"
+    older: "icons/older.svg",
+    sites: "icons/sites.svg"
   };
   var titleMap = {
     all: (t4) => t4("range_all"),
@@ -4670,7 +4677,8 @@
     friday: (t4) => t4("range_friday"),
     saturday: (t4) => t4("range_saturday"),
     sunday: (t4) => t4("range_sunday"),
-    older: (t4) => t4("range_older")
+    older: (t4) => t4("range_older"),
+    sites: (t4) => t4("range_sites")
   };
   function Sidebar({ ranges }) {
     const { t: t4 } = useTypedTranslation();
@@ -4699,7 +4707,7 @@
       if (range === "all" && current.value === null) {
         return (0, import_classnames4.default)(Sidebar_default.item, Sidebar_default.active);
       }
-      return (0, import_classnames4.default)(Sidebar_default.item, current.value === range && Sidebar_default.active);
+      return (0, import_classnames4.default)(Sidebar_default.item, current.value === range && Sidebar_default.active, Sidebar_default[`item_${range}`]);
     });
     return /* @__PURE__ */ _("div", { class: classNames, key: range }, /* @__PURE__ */ _(
       "button",
@@ -4754,6 +4762,7 @@
       case "thursday":
       case "friday":
       case "saturday":
+      case "sites":
       case "sunday":
         return { linkLabel: t4("show_history_for", { range }), buttonLabel: t4("delete_history_for", { range }) };
       case "older":

build/apple/pages/history/icons/sites.svg

@@ -116,5 +116,9 @@
   "range_older": {
     "title": "Older",
     "note": "Label on a button that shows older history entries."
+  },
+  "range_sites": {
+    "title": "Sites",
+    "note": "Label on a button that shows which sites have been visited"
   }
 }

build/apple/pages/history/locales/en/history.json

@@ -7329,6 +7329,14 @@
           title: t4("nextSteps_pinAppToTaskbarWindows_title"),
           summary: t4("nextSteps_pinAppToTaskbarWindows_summary"),
           actionText: t4("nextSteps_pinAppToTaskbarWindows_actionText")
+        }),
+        /** @param {(translationId: keyof enStrings) => string} t */
+        subscription: (t4) => ({
+          id: "subscription",
+          icon: "Subscription",
+          title: t4("nextSteps_subscription_title"),
+          summary: t4("nextSteps_subscription_summary"),
+          actionText: t4("nextSteps_subscription_actionText")
         })
       };
       otherText = {
@@ -30083,6 +30091,18 @@
       title: "Pinned to Taskbar!",
       note: "Button text after clicking on the Next Steps card for adding DDG app to OS dock"
     },
+    nextSteps_subscription_title: {
+      title: "Unlock Your Free Trial",
+      note: "Title of the Next Steps card for unlocking your free trial of DuckDuckGo subscription"
+    },
+    nextSteps_subscription_summary: {
+      title: "Try our subscription featuring a VPN + 3 more premium features.",
+      note: "Summary of the Next Steps card about the DuckDuckGo subscription"
+    },
+    nextSteps_subscription_actionText: {
+      title: "Try Free for 7 Days",
+      note: "Button text of the Next Steps card for trying the DuckDuckGo subscription"
+    },
     favorites_show_less: {
       title: "Show less",
       note: "Button label to display fewer items"

build/apple/pages/new-tab/dist/index.js

@@ -296,6 +296,18 @@
     "title" : "An die Taskleiste angeheftet!",
     "note" : "Button text after clicking on the Next Steps card for adding DDG app to OS dock"
   },
+  "nextSteps_subscription_title" : {
+    "title" : "Schalte deine kostenlose Testversion frei",
+    "note" : "Title of the Next Steps card for unlocking your free trial of DuckDuckGo subscription"
+  },
+  "nextSteps_subscription_summary" : {
+    "title" : "Teste unser Abonnement mit VPN + 3 weiteren Premium-Funktionen.",
+    "note" : "Summary of the Next Steps card about the DuckDuckGo subscription"
+  },
+  "nextSteps_subscription_actionText" : {
+    "title" : "7 Tage lang kostenlos testen",
+    "note" : "Button text of the Next Steps card for trying the DuckDuckGo subscription"
+  },
   "favorites_show_less" : {
     "title" : "Weniger anzeigen",
     "note" : "Button label to display fewer items"

build/apple/pages/new-tab/icons/Subscription-128.svg

@@ -297,6 +297,18 @@
     "title": "Pinned to Taskbar!",
     "note": "Button text after clicking on the Next Steps card for adding DDG app to OS dock"
   },
+  "nextSteps_subscription_title": {
+    "title": "Unlock Your Free Trial",
+    "note": "Title of the Next Steps card for unlocking your free trial of DuckDuckGo subscription"
+  },
+  "nextSteps_subscription_summary": {
+    "title": "Try our subscription featuring a VPN + 3 more premium features.",
+    "note": "Summary of the Next Steps card about the DuckDuckGo subscription"
+  },
+  "nextSteps_subscription_actionText": {
+    "title": "Try Free for 7 Days",
+    "note": "Button text of the Next Steps card for trying the DuckDuckGo subscription"
+  },
   "favorites_show_less": {
     "title": "Show less",
     "note": "Button label to display fewer items"

build/apple/pages/new-tab/locales/de/new-tab.json

@@ -296,6 +296,18 @@
     "title" : "¡Anclada a tu barra de tareas!",
     "note" : "Button text after clicking on the Next Steps card for adding DDG app to OS dock"
   },
+  "nextSteps_subscription_title" : {
+    "title" : "Accede a tu prueba gratuita",
+    "note" : "Title of the Next Steps card for unlocking your free trial of DuckDuckGo subscription"
+  },
+  "nextSteps_subscription_summary" : {
+    "title" : "Prueba nuestra suscripción con una VPN y 3 funciones prémium adicionales.",
+    "note" : "Summary of the Next Steps card about the DuckDuckGo subscription"
+  },
+  "nextSteps_subscription_actionText" : {
+    "title" : "Prueba gratuita durante 7 días",
+    "note" : "Button text of the Next Steps card for trying the DuckDuckGo subscription"
+  },
   "favorites_show_less" : {
     "title" : "Mostrar menos",
     "note" : "Button label to display fewer items"