From 3e8df508470c3f759f38028de2af4b4e1d819673 Mon Sep 17 00:00:00 2001
From: vapormusic <vietanhfat@gmail.com>
Date: Tue, 25 Jan 2022 21:16:36 +0700
Subject: [PATCH] move macos build files to resources, fix date for i18n

---
 build/entitlements.mac.plist                | 14 --------------
 package.json                                |  8 ++++----
 {build => resources}/afterPack.js           |  0
 resources/entitlements.mac.plist            |  8 +++++---
 {build => resources}/notarize.js            |  0
 src/renderer/views/pages/cider-playlist.ejs |  8 ++++----
 6 files changed, 13 insertions(+), 25 deletions(-)
 delete mode 100644 build/entitlements.mac.plist
 rename {build => resources}/afterPack.js (100%)
 rename {build => resources}/notarize.js (100%)

diff --git a/build/entitlements.mac.plist b/build/entitlements.mac.plist
deleted file mode 100644
index fcb8d4a3..00000000
--- a/build/entitlements.mac.plist
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-  <dict>
-    <!-- https://github.com/electron/electron-notarize#prerequisites -->
-    <key>com.apple.security.cs.allow-jit</key>
-    <true/>
-    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
-    <true/>
-    <!-- https://github.cm/electron-userland/electron-builder/issues/3940 -->
-    <key>com.apple.security.cs.disable-library-validation</key>
-    <true/>
-  </dict>
-</plist>
\ No newline at end of file
diff --git a/package.json b/package.json
index 25e68733..e8dae576 100644
--- a/package.json
+++ b/package.json
@@ -95,8 +95,8 @@
       "mirror": "https://github.com/castlabs/electron-releases/releases/download/v"
     },
     "appId": "cider",
-    "afterPack": "./build/afterPack.js",
-    "afterSign": "./build/notarize.js",
+    "afterPack": "./resources/afterPack.js",
+    "afterSign": "./resources/notarize.js",
     "protocols": [
       {
         "name": "Cider",
@@ -158,8 +158,8 @@
       "gatekeeperAssess": false,
       "icon": "./resources/icons/icon.icns",
       "category": "public.app-category.music",
-      "entitlements": "build/entitlements.mac.plist",
-      "entitlementsInherit": "build/entitlements.mac.plist",
+      "entitlements": "./resources/entitlements.mac.plist",
+      "entitlementsInherit": "./resources/entitlements.mac.plist",
       "darkModeSupport": true,
       "target": [
         "dmg"
diff --git a/build/afterPack.js b/resources/afterPack.js
similarity index 100%
rename from build/afterPack.js
rename to resources/afterPack.js
diff --git a/resources/entitlements.mac.plist b/resources/entitlements.mac.plist
index 8fff4988..fcb8d4a3 100644
--- a/resources/entitlements.mac.plist
+++ b/resources/entitlements.mac.plist
@@ -2,11 +2,13 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
   <dict>
+    <!-- https://github.com/electron/electron-notarize#prerequisites -->
+    <key>com.apple.security.cs.allow-jit</key>
+    <true/>
     <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
     <true/>
+    <!-- https://github.cm/electron-userland/electron-builder/issues/3940 -->
     <key>com.apple.security.cs.disable-library-validation</key>
     <true/>
-    <key>com.apple.security.cs.allow-dyld-environment-variables</key>
-    <false/>
   </dict>
-</plist>
+</plist>
\ No newline at end of file
diff --git a/build/notarize.js b/resources/notarize.js
similarity index 100%
rename from build/notarize.js
rename to resources/notarize.js
diff --git a/src/renderer/views/pages/cider-playlist.ejs b/src/renderer/views/pages/cider-playlist.ejs
index e08893ea..1c7ac047 100644
--- a/src/renderer/views/pages/cider-playlist.ejs
+++ b/src/renderer/views/pages/cider-playlist.ejs
@@ -441,11 +441,11 @@
                 let month, year;
                 try {
                     const releaseDate = new Date(date);
-                    month = new Intl.DateTimeFormat('en-US', {month: 'long'}).format(releaseDate);
-                    date = releaseDate.getDate();
-                    year = releaseDate.getFullYear();
+                    // month = new Intl.DateTimeFormat(this.app.cfg.general.language.replace('_','-'), {month: 'long'}).format(releaseDate);
+                    // date = releaseDate.getDate();
+                    // year = releaseDate.getFullYear();
 
-                    return prefix + date + " " + month + " " + year;
+                    return prefix + new Intl.DateTimeFormat(this.app.cfg.general.language?.replace('_','-') ?? 'en-US', {day:'numeric',month: 'long', year: 'numeric'}).format(releaseDate);
                 } catch (e) {
                     return ""
                 }