Desktop, Mobile: Fixes #1870: Support non-alphabetical characters in …

…note link anchors

ElectronClient/app/package.json

@@ -154,6 +154,7 @@
     "tcp-port-used": "^0.1.2",
     "uglifycss": "0.0.29",
     "url-parse": "^1.4.3",
+    "uslug": "^1.0.4",
     "uuid": "^3.2.1",
     "valid-url": "^1.0.9",
     "xml2js": "^0.4.19"

ReactNativeClient/lib/renderers/MdToHtml.js

@@ -15,6 +15,7 @@ const rules = {
 };
 const setupLinkify = require('./MdToHtml/setupLinkify');
 const hljs = require('highlight.js');
+const uslug = require('uslug');
 const markdownItAnchor = require('markdown-it-anchor');
 // The keys must match the corresponding entry in Setting.js
 const plugins = {
@@ -142,7 +143,9 @@ class MdToHtml {
 		if (Setting.value('markdown.plugin.fountain')) markdownIt.use(rules.fountain(context, ruleOptions));
 		markdownIt.use(rules.highlight_keywords(context, ruleOptions));
 		markdownIt.use(rules.code_inline(context, ruleOptions));
-		markdownIt.use(markdownItAnchor);
+		markdownIt.use(markdownItAnchor, {
+			slugify: s => uslug(s),
+		});
 
 		for (let key in plugins) {
 			if (Setting.value('markdown.plugin.' + key)) markdownIt.use(plugins[key].module, plugins[key].options);

ReactNativeClient/lib/urlUtils.js

@@ -1,4 +1,5 @@
 const { rtrimSlashes } = require('lib/path-utils');
+const { urlDecode } = require('lib/string-utils');
 
 const urlUtils = {};
 
@@ -55,7 +56,11 @@ urlUtils.parseResourceUrl = function(url) {
 	};
 
 	if (splitted.length) output.itemId = splitted[0];
-	if (splitted.length >= 2) output.hash = splitted[1];
+
+	// In general we want the hash to be decoded so that non-alphabetical languages
+	// appear as-is without being encoded with %.
+	// Fixes https://github.com/laurent22/joplin/issues/1870
+	if (splitted.length >= 2) output.hash = urlDecode(splitted[1]);
 
 	return output;
 };

ReactNativeClient/package.json

@@ -72,6 +72,7 @@
     "timers": "^0.1.1",
     "url": "^0.11.0",
     "url-parse": "^1.4.7",
+    "uslug": "^1.0.4",
     "uuid": "^3.0.1",
     "valid-url": "^1.0.9",
     "word-wrap": "^1.2.3",