From 10742f7786220acd8e7689512bc9ea2e02e4a9e8 Mon Sep 17 00:00:00 2001
From: Kamesuta <kamesuta@gmail.com>
Date: Sat, 2 Sep 2023 08:39:01 +0900
Subject: [PATCH] langloader.js placeholder support

---
 app/assets/js/langloader.js | 18 ++++++++++++------
 app/assets/lang/en_US.json  |  2 +-
 app/settings.ejs            |  2 +-
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/app/assets/js/langloader.js b/app/assets/js/langloader.js
index 866c9da8..e6606911 100644
--- a/app/assets/js/langloader.js
+++ b/app/assets/js/langloader.js
@@ -7,19 +7,25 @@ exports.loadLanguage = function(id){
     lang = JSON.parse(fs.readFileSync(path.join(__dirname, '..', 'lang', `${id}.json`))) || {}
 }
 
-exports.query = function(id){
+exports.query = function(id, placeHolders){
     let query = id.split('.')
     let res = lang
     for(let q of query){
         res = res[q]
     }
-    return res === lang ? {} : res
+    let text = res === lang ? '' : res
+    if (placeHolders) {
+        Object.entries(placeHolders).forEach(([key, value]) => {
+            text = text.replace(`{${key}}`, value)
+        })
+    }
+    return text
 }
 
-exports.queryJS = function(id){
-    return exports.query(`js.${id}`)
+exports.queryJS = function(id, placeHolders){
+    return exports.query(`js.${id}`, placeHolders)
 }
 
-exports.queryEJS = function(id){
-    return exports.query(`ejs.${id}`)
+exports.queryEJS = function(id, placeHolders){
+    return exports.query(`ejs.${id}`, placeHolders)
 }
\ No newline at end of file
diff --git a/app/assets/lang/en_US.json b/app/assets/lang/en_US.json
index debbb4b8..6a726bcb 100644
--- a/app/assets/lang/en_US.json
+++ b/app/assets/lang/en_US.json
@@ -122,7 +122,7 @@
             "javaExecSelButtonText": "Choose File",
             "javaExecDesc": "The Java executable is validated before game launch.",
             "javaReqDesc": "Requires Java 8 x64.",
-            "javaPathDesc": "The path should end with <strong>bin<%= process.platform === 'win32' ? '\\\\javaw.exe' : '/java' %></strong>.",
+            "javaPathDesc": "The path should end with <strong>{pathSuffix}</strong>.",
             "jvmOptsTitle": "Additional JVM Options",
             "jvmOptsDesc": "Options to be provided to the JVM at runtime. <em>-Xms</em> and <em>-Xmx</em> should not be included.",
             "jvmOptsLink": "https://docs.oracle.com/javase/8/docs/technotes/tools/<%= process.platform === 'win32' ? 'windows' : 'unix' %>/java.html",
diff --git a/app/settings.ejs b/app/settings.ejs
index a7446b98..18bec3c5 100644
--- a/app/settings.ejs
+++ b/app/settings.ejs
@@ -245,7 +245,7 @@
                         <button class="settingsFileSelButton" id="settingsJavaExecSel" dialogTitle="<%- lang('settings.javaExecSelDialogTitle') %>" dialogDirectory="false"><%- lang('settings.javaExecSelButtonText') %></button>
                     </div>
                 </div>
-                <div class="settingsFileSelDesc"><%- lang('settings.javaExecDesc') %> <strong id="settingsJavaReqDesc"><%- lang('settings.javaReqDesc') %></strong><br><%- evalEjs(lang('settings.javaPathDesc')) %></div>
+                <div class="settingsFileSelDesc"><%- lang('settings.javaExecDesc') %> <strong id="settingsJavaReqDesc"><%- lang('settings.javaReqDesc') %></strong><br><%- lang('settings.javaPathDesc', {'pathSuffix': `bin${process.platform === 'win32' ? '\\\\javaw.exe' : '/java'}`}) %></div>
             </div>
             <div id="settingsJVMOptsContainer">
                 <div id="settingsJVMOptsTitle"><%- lang('settings.jvmOptsTitle') %></div>