diff options
| author | uurgothat <cckhmck@gmail.com> | 2021-10-09 19:08:18 +0300 |
|---|---|---|
| committer | uurgothat <cckhmck@gmail.com> | 2021-10-09 19:08:18 +0300 |
| commit | 8c8dc1f8b9e091817988f1115cf858c69b5a2409 (patch) | |
| tree | d0fd94920bd763ff5aead09362bf22625383eddd | |
| parent | Merge branch 'master' of https://github.com/fosscord/fosscord-server (diff) | |
| parent | :bug: rewrite locale en to en-US (diff) | |
| download | server-8c8dc1f8b9e091817988f1115cf858c69b5a2409.tar.xz | |
Merge branch 'master' of https://github.com/fosscord/fosscord-server
| -rw-r--r-- | api/client_test/index.html | 6 | ||||
| -rw-r--r-- | bundle/scripts/build.js | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/api/client_test/index.html b/api/client_test/index.html index 41d41598..e35fe900 100644 --- a/api/client_test/index.html +++ b/api/client_test/index.html @@ -62,6 +62,12 @@ } }); } + + const settings = JSON.parse(localStorage.getItem("UserSettingsStore")); + if (settings && settings.locale === "en") { + settings.locale = "en-US"; + localStorage.setItem("UserSettingsStore", JSON.stringify(settings)); + } </script> <script src="/assets/479a2f1e7d625dc134b9.js"></script> <script src="/assets/a15fd133a1d2d77a2424.js"></script> diff --git a/bundle/scripts/build.js b/bundle/scripts/build.js index 05cf37ce..4266942f 100644 --- a/bundle/scripts/build.js +++ b/bundle/scripts/build.js @@ -89,7 +89,7 @@ function walk(dir) { var results = []; var list = fs.readdirSync(dir); list.forEach(function (file) { - file = dir + "/" + file; + file = path.join(dir, file); var stat = fs.statSync(file); if (stat && stat.isDirectory()) { /* Recurse into a subdirectory */ |