Fixed locale bug and possibly "includes" error in "human friendly dat…

…es" feature.

flatpak/com.github.ransome1.sleek.appdata.xml

@@ -9,7 +9,7 @@
   <developer_name>Robin Ahle</developer_name>
   <content_rating type="oars-1.1"/>
   <releases>
-    <release version="2.0.12-rc.4" date="2024-03-16"/>
+    <release version="2.0.12-rc.5" date="2024-03-22"/>
   </releases>
   <url type="homepage">https://github.com/ransome1/sleek</url>
   <url type="contact">https://github.com/ransome1/sleek/issues</url>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sleek",
-  "version": "2.0.12-rc.4",
+  "version": "2.0.12-rc.5",
   "main": "./src/main/main.tsx",
   "scripts": {
     "build": "concurrently \"yarn run peggy\" \"yarn run build:main\" \"yarn run build:renderer\"",
@@ -221,10 +221,10 @@
         "appx"
       ],
       "icon": "assets/icons/sleek.ico",
-      "artifactName": "${productName}-${version}-win.${ext}"
+      "artifactName": "${productName}-${version}-win-${arch}.${ext}"
     },
     "nsis": {
-      "artifactName": "${productName}-${version}-win-Setup.${ext}"
+      "artifactName": "${productName}-${version}-win-${arch}-Setup.${ext}"
     },
     "appx": {
       "displayName": "sleek - todo.txt manager for Windows, free and open-source (FOSS)",

release/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sleek",
-  "version": "2.0.12-rc.4",
+  "version": "2.0.12-rc.5",
   "description": "todo.txt manager for Linux, Windows and MacOS, free and open-source (FOSS)",
   "synopsis": "todo.txt manager for Linux, Windows and MacOS, free and open-source (FOSS)",
   "keywords": [

snap/snapcraft.yaml

@@ -1,6 +1,6 @@
 name: sleek
 base: core20
-version: "2.0.12-rc.4"
+version: "2.0.12-rc.5"
 summary: todo.txt manager for Linux, free and open-source (FOSS)
 description: |
   sleek is an open-source (FOSS) todo manager based on the todo.txt syntax. Stripped down to only the most necessary features, and with a clean and simple interface, sleek aims to help you focus on getting things done.

src/main/modules/Filters/Filters.tsx

@@ -22,7 +22,7 @@ function applyFilters(todoObjects: TodoObject[], filters: Filters | null): TodoO
 
         const hasMatchingValue = Array.isArray(attributeValues)
           ? attributeValues.some((val) => values.includes(val))
-          : attributeValues !== undefined && values.includes(attributeValues);
+          : Array.isArray(values) && values.includes(attributeValues);
 
         return exclude ? !hasMatchingValue : hasMatchingValue;
       });

src/renderer/Drawer/Attributes.tsx

@@ -44,6 +44,7 @@ const DrawerAttributes: React.FC<DrawerAttributesProps> = memo(({
       if (attributes[key]) {
         const count = attributes[key].count;
         const formattedValues = settings.useHumanFriendlyDates && isDate ? friendlyDate(key, attributeKey, settings.language, t) : [key];
+
         formattedValues.forEach((formattedValue) => {
           if (!processedAttributes[formattedValue]) {
             processedAttributes[formattedValue] = {

src/renderer/Shared.tsx

@@ -6,7 +6,7 @@ import weekday from 'dayjs/plugin/weekday';
 dayjs.extend(relativeTime);
 dayjs.extend(duration);
 dayjs.extend(calendar);
-dayjs.extend(weekday)
+dayjs.extend(weekday);
 
 const { store, ipcRenderer } = window.api;
 
@@ -58,12 +58,13 @@ export const translatedAttributes = (t: typeof i18n.t) => {
 };
 
 export const friendlyDate = (value: string, attributeKey: string, language: string, t: typeof i18n.t) => {
+
+  dayjs.locale(language)
+
   const today = dayjs();
   const date = dayjs(value);
   const results = [];
 
-  dayjs.locale(language)
-
   if (date.isBefore(today, 'day')) {
     results.push((attributeKey === 'due') ? t('drawer.attributes.overdue') : t('drawer.attributes.elapsed'));
   }