2.3.6 fix Spainish short name trigger

fix #149

manifest.json

@@ -1,7 +1,7 @@
 {
 	"id": "obsidian-bible-reference",
 	"name": "Bible Reference",
-	"version": "2.3.5",
+	"version": "2.3.6",
 	"minAppVersion": "0.12.0",
 	"description": "Taking Bible Study note in Obsidian.md application easily. Automatically suggesting Bible Verses as references. ",
 	"author": "tim-hub",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "obsidian-bible-reference",
-  "version": "2.3.5",
+  "version": "2.3.6",
   "description": "Taking Bible Study note in Obsidian.md application easily. Automatically suggesting Bible Verses as references. ",
   "main": "main.js",
   "scripts": {
@@ -73,7 +73,7 @@
   },
   "dependencies": {
     "ackee-tracker": "^5.1.0",
-    "bible-reference-toolkit": "^2.3.1",
+    "bible-reference-toolkit": "^2.3.2",
     "flagsmith-nodejs": "^3.1.1"
   }
 }

src/utils/bookNameReference.ts

@@ -2,24 +2,26 @@ import Reference from 'bible-reference-toolkit'
 
 export const getBookIdFromBookName = (
   bookName: string,
-  langaugeCode: string = 'en'
+  languageCode: string = 'en'
 ): number => {
   try {
-    return Reference.bookIdFromTranslationAndName(langaugeCode, bookName)
+    console.debug('get book id first time', bookName, languageCode)
+    return Reference.bookIdFromTranslationAndName(languageCode, bookName)
   } catch (e) {
     // try in slow but in all supported languages
+    console.debug('get book id from all translations', bookName)
     return Reference.bookIdFromName(bookName)
   }
 }
 
 export const getFullBookName = (
   name: string,
-  langaugeCode: string = 'en'
+  languageCode: string = 'en'
 ): string => {
-  console.debug('getFullBookName', name, langaugeCode)
-  const bookId = getBookIdFromBookName(name, langaugeCode)
+  console.debug('getFullBookName', name, languageCode)
+  const bookId = getBookIdFromBookName(name, languageCode)
   try {
-    return Reference.bookNameFromTranslationAndId(langaugeCode, bookId)
+    return Reference.bookNameFromTranslationAndId(languageCode, bookId)
   } catch (e) {
     return Reference.bookEnglishFullNameFromId(bookId)
   }

src/utils/regs.ts

@@ -13,13 +13,13 @@ export const ORIGINAL_REG = /-{2}(([123])*)(\w{3,})\+\d{0,3}:*\d{0,3}-*\d{0,3}$/
  * --John12:1-3
  * --John1:1
  */
-export const SHORT_REG = /-{2}([123])*\s*[A-z]{3,}\s*\d{1,3}:\d{1,3}(-\d{1,3})*/
+export const SHORT_REG = /-{2}([123])*\s*[A-z]{2,}\s*\d{1,3}:\d{1,3}(-\d{1,3})*/
 
 /**
  * regular expression to match
  * John12:1-3
  * John1:1
  */
-export const MODAL_REG = /([123])*\s*[A-z]{3,}\s*\d{1,3}:\d{1,3}(-\d{1,3})*/
+export const MODAL_REG = /([123])*\s*[A-z]{2,}\s*\d{1,3}:\d{1,3}(-\d{1,3})*/
 
-export const BOOK_REG = /[123]*\s*[A-z]{3,}/
+export const BOOK_REG = /[123]*\s*[A-z]{2,}/

versions.json

@@ -61,5 +61,6 @@
 	"2.3.2": "0.12.0",
 	"2.3.3": "0.12.0",
 	"2.3.4": "0.12.0",
-	"2.3.5": "0.12.0"
+	"2.3.5": "0.12.0",
+	"2.3.6": "0.12.0"
 }