Improve Language/Literacy handling (#458)

- Fix #458
- Custom Language generation now uses Foundry's String#slugify
- Added generic support for Literacy languages

Author: mclemente

src/lang/en.json

@@ -184,6 +184,7 @@
 		"UESRPG.Language": "Language",
 		"Generic": {
 			"Language": "Language",
+			"Literacy": "Literacy",
 			"Read": "Read"
 		},
 		"COC7": {

src/module/logic.js

@@ -120,7 +120,7 @@ export class Polyglot {
 	}
 
 	get omniglot() {
-		return this._omniglot.trim().toLowerCase().replace(/[\s']/g, "_");
+		return this._omniglot.slugify({ replacement: "_" });
 	}
 
 	set omniglot(lang) {
@@ -131,7 +131,7 @@ export class Polyglot {
 	}
 
 	get comprehendLanguages() {
-		return this._comprehendLanguages.trim().toLowerCase().replace(/[\s']/g, "_");
+		return this._comprehendLanguages.slugify({ replacement: "_" });
 	}
 
 	set comprehendLanguages(lang) {
@@ -142,7 +142,7 @@ export class Polyglot {
 	}
 
 	get truespeech() {
-		return this._truespeech.trim().toLowerCase().replace(/[\s']/g, "_");
+		return this._truespeech.slugify({ replacement: "_" });
 	}
 
 	set truespeech(lang) {

src/module/providers/templates/Base.js

@@ -502,7 +502,7 @@ export default class LanguageProvider {
 	addLanguage(lang, options = {}) {
 		if (!lang) return;
 
-		const key = lang.toLowerCase().replace(/[\s']/g, "_");
+		const key = lang.slugify({ replacement: "_" });
 		const languagesSetting = game.settings.get("polyglot", "Languages");
 		const defaultOptions = {
 			font: languagesSetting[key]?.font ?? this.defaultFont,
@@ -524,7 +524,7 @@ export default class LanguageProvider {
 		if (!lang) return;
 		const customLanguages = game.settings.get("polyglot", "customLanguages");
 		if (customLanguages.includes(lang)) return;
-		const key = lang.trim().toLowerCase().replace(/[\s']/g, "_");
+		const key = lang.slugify({ replacement: "_" });
 		delete this.languages[key];
 		this.removeFromConfig(key);
 	}
@@ -645,12 +645,19 @@ export default class LanguageProvider {
 			}
 		} else if (game.settings.settings.has("polyglot.LanguageRegex")) {
 			const languageRegex = game.settings.get("polyglot", "LanguageRegex");
-			let myRegex = new RegExp(`${languageRegex}\\s*\\((.+)\\)`, "i");
+			let literacyRegex;
+			if (game.settings.settings.has("polyglot.LiteracyRegex")) {
+				literacyRegex = game.settings.get("polyglot", "LiteracyRegex");
+			}
+			const langRegex = new RegExp(`${languageRegex}\\s*\\((.+)\\)`, "i");
+			const litRegex = new RegExp(`${literacyRegex} \\((.+)\\)`, "i");
 			for (let item of actor.items) {
 				const name = item?.flags?.babele?.originalName || item.name;
 				// adding only the descriptive language name, not "Language (XYZ)"
-				if (myRegex.test(name)) {
-					knownLanguages.add(name.match(myRegex)[1].trim().toLowerCase());
+				if (langRegex.test(name)) {
+					knownLanguages.add(name.match(langRegex)[1].slugify({ replacement: "_" }));
+				} else if (literacyRegex && litRegex.test(name)) {
+					literateLanguages.add(name.match(litRegex)[1].slugify({ replacement: "_" }));
 				}
 			}
 		}

src/module/providers/templates/Generic.js

@@ -23,6 +23,10 @@ export default class GenericLanguageProvider extends LanguageProvider {
 				type: String,
 				default: game.i18n.localize("POLYGLOT.Generic.Language"),
 			},
+			LiteracyRegex: {
+				type: String,
+				default: game.i18n.localize("POLYGLOT.Generic.Literacy"),
+			},
 		};
 	}
 

src/module/providers/wwn.js

@@ -29,7 +29,7 @@ export default class wwnLanguageProvider extends LanguageProvider {
 			game.settings.set("wwn", "languageList", languages);
 		}
 		lang = lang.trim();
-		const key = lang.toLowerCase().replace(/[\s']/g, "_");
+		const key = lang.slugify({ replacement: "_" });
 		this.languages[key] = {
 			label: lang,
 			font: languagesSetting[key]?.font ?? this.defaultFont,
@@ -44,14 +44,14 @@ export default class wwnLanguageProvider extends LanguageProvider {
 			languages.replace(new RegExp(`,\\s*${lang}`), "");
 			game.settings.set("wwn", "languageList", languages);
 		}
-		const key = lang.trim().toLowerCase().replace(/[\s']/g, "_");
+		const key = lang.slugify({ replacement: "_" });
 		delete this.languages[key];
 	}
 
 	async getLanguages() {
 		const languagesSetting = game.settings.get("polyglot", "Languages");
 		for (let lang of game.settings.get("wwn", "languageList").split(",")) {
-			const key = lang.toLowerCase().replace(/[\s']/g, "_");
+			const key = lang.slugify({ replacement: "_" });
 			this.languages[key] = {
 				label: lang,
 				font: languagesSetting[key]?.font || this.defaultFont,