New: Translate page names in PDFs

ollm · ollm · commit 8855fbefd498 · 2023-10-16T20:52:22.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Improved touch screen navigation (swipe gesture, 2 finger zoom and reset zoom with 2 finger click) [`f848463`](https://github.com/ollm/OpenComic/commit/f84846399f1521c736b9b6e048f204513ac304da)
 - Improved detection of image edges when zoom is applied [`e7ec771`](https://github.com/ollm/OpenComic/commit/e7ec77104360b1e2ac2aa96d97b6c1d2cc2d6d01)
 - Frameless window (Full only in Windows and macOS)	[`9c7346c`](https://github.com/ollm/OpenComic/commit/9c7346cb37fe3c7aed9200d49e27ed4c5bdbfc96)
+- Translate page names in PDFs
 
 ##### 🐛 Bug Fixes
 
diff --git a/languages/ca.json b/languages/ca.json
@@ -47,6 +47,7 @@
 		"settings": "Configuració",
 		"theme": "Tema",
 		"days": "Dies",
+		"pageAndNumber": "Pàgina $1",
 		"valueCannotBeEmpty": "El valor no pot estar buit",
 		"nightMode": "Mode nit"
 	},
diff --git a/languages/cs.json b/languages/cs.json
@@ -47,6 +47,7 @@
 		"settings": "",
 		"theme": "Vzhled",
 		"days": "",
+		"pageAndNumber": "",
 		"valueCannotBeEmpty": "Hodnota nesmí být prázdná",
 		"nightMode": "Noční režim"
 	},
diff --git a/languages/de.json b/languages/de.json
@@ -47,6 +47,7 @@
 		"settings": "",
 		"theme": "Thema",
 		"days": "",
+		"pageAndNumber": "",
 		"valueCannotBeEmpty": "",
 		"nightMode": "Nachtmodus"
 	},
diff --git a/languages/en.json b/languages/en.json
@@ -47,6 +47,7 @@
 		"settings": "Settings",
 		"theme": "Theme",
 		"days": "Days",
+		"pageAndNumber": "Page $1",
 		"valueCannotBeEmpty": "Value cannot be empty",
 		"nightMode": "Night mode"
 	},
diff --git a/languages/es.json b/languages/es.json
@@ -47,6 +47,7 @@
 		"settings": "Ajustes",
 		"theme": "Tema",
 		"days": "Días",
+		"pageAndNumber": "Página $1",
 		"valueCannotBeEmpty": "El valor no puede estar vació",
 		"nightMode": "Modo noche"
 	},
diff --git a/languages/fr.json b/languages/fr.json
@@ -47,6 +47,7 @@
 		"settings": "",
 		"theme": "Theme",
 		"days": "",
+		"pageAndNumber": "",
 		"valueCannotBeEmpty": "",
 		"nightMode": "Mode nuit"
 	},
diff --git a/languages/hu.json b/languages/hu.json
@@ -47,6 +47,7 @@
 		"settings": "",
 		"theme": "Téma",
 		"days": "",
+		"pageAndNumber": "",
 		"valueCannotBeEmpty": "",
 		"nightMode": "Sötét téma"
 	},
diff --git a/languages/it.json b/languages/it.json
@@ -47,6 +47,7 @@
 		"settings": "",
 		"theme": "Tema",
 		"days": "",
+		"pageAndNumber": "",
 		"valueCannotBeEmpty": "",
 		"nightMode": "Modalità notte"
 	},
diff --git a/languages/ja.json b/languages/ja.json
@@ -47,6 +47,7 @@
 		"settings": "",
 		"theme": "テーマ",
 		"days": "",
+		"pageAndNumber": "",
 		"valueCannotBeEmpty": "",
 		"nightMode": "ナイトモード"
 	},
diff --git a/languages/pt-br.json b/languages/pt-br.json
@@ -47,6 +47,7 @@
 		"settings": "",
 		"theme": "Tema",
 		"days": "",
+		"pageAndNumber": "",
 		"valueCannotBeEmpty": "",
 		"nightMode": "Modo Noturno"
 	},
diff --git a/languages/ru.json b/languages/ru.json
@@ -47,6 +47,7 @@
 		"settings": "",
 		"theme": "Тема",
 		"days": "",
+		"pageAndNumber": "",
 		"valueCannotBeEmpty": "Значение не может быть пустым",
 		"nightMode": "Ночной режим"
 	},
diff --git a/languages/vi.json b/languages/vi.json
@@ -47,6 +47,7 @@
 		"settings": "",
 		"theme": "Chủ đề",
 		"days": "",
+		"pageAndNumber": "",
 		"valueCannotBeEmpty": "Giá trị không được để trống",
 		"nightMode": "Chế độ tối"
 	},
diff --git a/languages/zh-hans.json b/languages/zh-hans.json
@@ -47,6 +47,7 @@
 		"settings": "",
 		"theme": "主题",
 		"days": "",
+		"pageAndNumber": "",
 		"valueCannotBeEmpty": "",
 		"nightMode": "夜间模式"
 	},
diff --git a/languages/zh-hant.json b/languages/zh-hant.json
@@ -47,6 +47,7 @@
 		"settings": "",
 		"theme": "圖形介面",
 		"days": "",
+		"pageAndNumber": "",
 		"valueCannotBeEmpty": "",
 		"nightMode": "夜間模式"
 	},
diff --git a/scripts/dom.js b/scripts/dom.js
@@ -116,44 +116,6 @@ function getReadingProgress(path, callback)
 	return false;
 }
 
-function calcReadingProgress(path, mainPath, callback)
-{
-	(function(path, mainPath, callback){
-
-		process.nextTick(function() {
-
-			var progress = calcReadingProgressWD(path, mainPath, callback);
-
-			if(checkError(progress))
-			{
-				(function(error, path, mainPath, callback){
-
-					fileCompressed.addCompressedFilesQueue(error.compressedPath, false, function(files){
-
-						if(!checkError(files))
-							dom.calcReadingProgress(path, mainPath, callback);
-						else
-							callback(files);
-
-					});
-
-				})(progress, path, mainPath, callback)
-			}
-			else
-			{
-				if(callback)
-					callback(progress);
-			}
-		});
-
-	})(path, mainPath, callback);
-}
-
-function calcReadingProgressWD()
-{
-
-}
-
 function addImageToDom(querySelector, path, animation = true)
 {
 	let backgroundImage = 'url('+path+')';
@@ -174,6 +136,11 @@ function addImageToDom(querySelector, path, animation = true)
 	}
 }
 
+function translatePageName(name)
+{
+	return name.replace(/^page\-([0-9]+)/, language.global.pageAndNumber);
+}
+
 async function loadFilesIndexPage(file, animation, path, keepScroll, mainPath)
 {
 	return file.read().then(async function(files){
@@ -232,7 +199,7 @@ async function loadFilesIndexPage(file, animation, path, keepScroll, mainPath)
 
 					pathFiles.push({
 						sha: sha,
-						name: fileName.replace(/\.[^\.]*$/, ''),
+						name: translatePageName(fileName.replace(/\.[^\.]*$/, '')),
 						path: filePath,
 						mainPath: mainPath,
 						thumbnail: (thumbnail.cache) ? thumbnail.path : '',
@@ -1570,8 +1537,6 @@ module.exports = {
 	addComicButtons: addComicButtons,
 	comicContextMenu: comicContextMenu,
 	removeComic: removeComic,
-	calcReadingProgress: calcReadingProgress,
-	calcReadingProgressWD: calcReadingProgressWD,
 	compressedError: compressedError,
 	addImageToDom: addImageToDom,
 	addSepToEnd: addSepToEnd,
@@ -1581,6 +1546,7 @@ module.exports = {
 	indexMainPathA: function(){return indexMainPathA},
 	currentPathScrollTop: function(){return currentPathScrollTop},
 	getFolderThumbnails: getFolderThumbnails,
+	translatePageName: translatePageName,
 	search: search,
 	this: domManager.this,
 	query: domManager.query,
diff --git a/scripts/reading.js b/scripts/reading.js
@@ -2788,7 +2788,7 @@ function loadBookmarks()
 			});
 
 			bookmarksPath[bookmarkDirname].push({
-				name: decodeURI(p.basename(bookmark.path).replace(/\.[^\.]*$/, '')),
+				name: dom.translatePageName(decodeURI(p.basename(bookmark.path).replace(/\.[^\.]*$/, ''))),
 				index: (bookmarkDirname !== readingCurrentPath) ? bookmark.index : imagesPath[bookmark.path],
 				sha: sha,
 				mainPath: mainPath,
@@ -2840,7 +2840,7 @@ function loadBookmarks()
 			path: bookmarkDirname,
 			name: p.basename(bookmarkDirname),
 			bookmarks: [{
-				name: decodeURI(p.basename(readingProgress.path).replace(/\.[^\.]*$/, '')),
+				name: dom.translatePageName(decodeURI(p.basename(readingProgress.path).replace(/\.[^\.]*$/, ''))),
 				index: readingProgress.index,
 				sha: sha,
 				mainPath: readingProgress.mainPath,
