Merge branch 'develop'

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## not released
 
+## v1.7.1 (2024-01-11)
+
+- Add: Translation of humanized dates
+- Add: Screenshots / icon for [https://joplinapp.org/plugins/](https://joplinapp.org/plugins/)
+
 ## v1.7.0 (2023-12-24)
 
 - Add: Translation

GENERATOR_DOC.md

@@ -7,7 +7,7 @@ This documentation describes how to create a plugin, and how to work with the pl
 First, install [Yeoman](http://yeoman.io) and generator-joplin using [npm](https://www.npmjs.com/) (we assume you have pre-installed [node.js](https://nodejs.org/)).
 
 ```bash
-npm install -g yo
+npm install -g yo@4.3.1
 npm install -g generator-joplin
 ```
 

README.md

@@ -3,11 +3,11 @@
 <!-- markdownlint-disable MD007 -->
 <!-- markdownlint-disable MD045 -->
 
-# Joplin note overview
+# Joplin note overview <img src=img/icon_32.png>
 
 A note overview is created based on the defined search and the specified fields.
 
-<img src=img/main.jpg>
+<img src=img/main.png>
 
 <!-- prettier-ignore-start -->
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "joplin-plugin-note-overview",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "scripts": {
     "dist": "webpack --env joplin-plugin-config=buildMain && webpack --env joplin-plugin-config=buildExtraScripts && webpack --env joplin-plugin-config=createArchive",
     "prepare": "npm run dist && husky install",

src/manifest.json

@@ -2,11 +2,29 @@
   "manifest_version": 1,
   "id": "io.github.jackgruber.note-overview",
   "app_min_version": "1.8.1",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "name": "Note overview",
   "description": "A note overview is created based on the defined search and the specified fields.",
   "author": "JackGruber",
   "homepage_url": "https://github.com/JackGruber/joplin-plugin-note-overview/blob/master/README.md",
   "repository_url": "https://github.com/JackGruber/joplin-plugin-note-overview",
-  "keywords": ["search", "overview", "savedsearch", "saved", "query"]
+  "keywords": ["search", "overview", "savedsearch", "saved", "query"],
+  "categories": ["productivity"],
+  "screenshots": [
+    {
+      "src": "img/main.png",
+      "label": "Screenshot: Main Screenshot"
+    },
+    {
+      "src": "img/showcase1.png",
+      "label": "Screenshot: Showcase 1"
+    },
+    {
+      "src": "img/showcase2.png",
+      "label": "Screenshot: Showcase 2"
+    }
+  ],
+  "icons": {
+    "256": "img/icon_256.png"
+  }
 }

src/noteoverview.ts

@@ -1554,6 +1554,7 @@ export namespace noteoverview {
       objectNotation: true,
     });
     i18n.setLocale(joplinLocale);
+    moment.locale(joplinLocale);
   }
 }
 

webpack.config.js

@@ -93,19 +93,24 @@ function validateCategories(categories) {
 
 function validateScreenshots(screenshots) {
 	if (!screenshots) return null;
-	// eslint-disable-next-line github/array-foreach -- Old code before rule was applied
-	screenshots.forEach(screenshot => {
+	for (const screenshot of screenshots) {
 		if (!screenshot.src) throw new Error('You must specify a src for each screenshot');
 
+		// Avoid attempting to download and verify URL screenshots.
+		if (screenshot.src.startsWith('https://') || screenshot.src.startsWith('http://')) {
+			continue;
+		}
+
 		const screenshotType = screenshot.src.split('.').pop();
 		if (!allPossibleScreenshotsType.includes(screenshotType)) throw new Error(`${screenshotType} is not a valid screenshot type. Valid types are: \n${allPossibleScreenshotsType}\n`);
 
-		const screenshotPath = path.resolve(srcDir, screenshot.src);
+		const screenshotPath = path.resolve(rootDir, screenshot.src);
+
 		// Max file size is 1MB
 		const fileMaxSize = 1024;
 		const fileSize = fs.statSync(screenshotPath).size / 1024;
 		if (fileSize > fileMaxSize) throw new Error(`Max screenshot file size is ${fileMaxSize}KB. ${screenshotPath} is ${fileSize}KB`);
-	});
+	}
 }
 
 function readManifest(manifestPath) {