From 70e8cae9cde68524ef9b7d2671ff02d33bf9f428 Mon Sep 17 00:00:00 2001
From: Made Baruna <made.setia@gmail.com>
Date: Tue, 30 Mar 2021 02:18:31 +0800
Subject: [PATCH] Update faqs

---
 src/components/WishImportModal.svelte |  9 +++--
 src/locales/en.json                   | 48 +++++++++++++++++++++------
 src/locales/id.json                   | 46 ++++++++++++++++++++-----
 3 files changed, 82 insertions(+), 21 deletions(-)

diff --git a/src/components/WishImportModal.svelte b/src/components/WishImportModal.svelte
index 8415962c..4ba61fe6 100644
--- a/src/components/WishImportModal.svelte
+++ b/src/components/WishImportModal.svelte
@@ -583,13 +583,17 @@
           >{$t('wish.import.faqs.a4.1')}
           <a
             class="text-primary hover:underline"
-            href="https://gist.github.com/MadeBaruna/64785ae992c924e0cbfe575e404b7155"
+            href="https://github.com/MadeBaruna/paimon-moe-api"
             target="__blank">{$t('wish.import.faqs.a4.2')}</a
           >
         </p>
         <p class="text-white font-semibold mt-4">{$t('wish.import.faqs.q5')}</p>
         <p class="text-gray-400">
-          {$t('wish.import.faqs.a5')}
+          {$t('wish.import.faqs.a5.0')}
+          <a class="text-primary hover:underline" href="/privacy-policy" target="__blank"
+            >{$t('wish.import.faqs.a5.1')}</a
+          >
+          {$t('wish.import.faqs.a5.2')}
           <!-- If you don't want any passing around your url, you can use the small importer app to process the wish
           history on your local PC (PC Local option) -->
         </p>
@@ -700,6 +704,7 @@
       </div>
     </div>
   </div>
+  <div class="pb-16 md:pb-0" />
 {/if}
 
 <style>
diff --git a/src/locales/en.json b/src/locales/en.json
index 92d12c35..7c14e9fe 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -51,7 +51,11 @@
       "success": "Import success 😀!",
       "wishTallyCheck": "Submit pity for global wish tally",
       "wishTally": "We are doing a global wish tally! You can submit your wish tally to participate. All pity data will be aggregated to know what is the average pity of paimon.moe users.",
-      "wishTallyCollected": ["What will be collected:", "and", "pity from your wish history"],
+      "wishTallyCollected": [
+        "What will be collected:",
+        "and",
+        "pity from your wish history"
+      ],
       "faqs": {
         "title": "Import Wish History FAQ",
         "q1": "How does it work?",
@@ -60,7 +64,7 @@
         "a2": "Paimon.moe uses the same request that Genshin Impact use to get the wish history, and Paimon.moe has no way whatsoever to modify any game files or memory, and it should be safe. But use it at your own risk (well I use it on my main account). You still can input your data manually 😀.",
         "q3": "Can you hack my account then?",
         "a3": [
-          "Paimon.moe never saves anything related to your account (even your UID or nickname), so the answer is no. This project is open source on",
+          "Paimon.moe never saves private information like your account credentials (even your UID or nickname), so the answer is no. This project is open source on",
           "; I'm not planning to damage my reputation by hacking other people's account."
         ],
         "q4": "Hey I checked the requests and stuff, but why does it request to your domain instead of MiHoYo API?",
@@ -70,7 +74,11 @@
           "here"
         ],
         "q5": "Do you store my temporary key or wish history?",
-        "a5": "Paimon.moe will never store your keys, and uses HTTPS to pass your URL to a CORS proxy to make the CORS work. All your wish history is saved on your device only (or your Google Drive if you turned on sync). Paimon.moe does not save anything to the server (yes, anything).",
+        "a5": [
+          "Paimon.moe will never store your keys, and uses HTTPS to pass your URL to a CORS proxy to make the CORS work. Paimon.moe will save your 4* pity, 5* pity, and 5* wish information if you submit your wish for our global wish tally (no private information saved! please check",
+          "Privacy Policy",
+          "for more information). You can uncheck submit wish tally to disable wish submission. Then all your wish history is saved on your device (or your Google Drive if you turned on sync)."
+        ],
         "q6": "I've done all the steps, but I got some API error?",
         "a6": "Make sure you copy all the text (hold and press Select All for mobile devices); maybe you missed some text that are needed for the importer to work."
       },
@@ -116,7 +124,11 @@
       "exportFinish": "Export success, please wait until the browser download the file!",
       "wishTallyTitle": "Submit Wish Tally",
       "wishTally": "We are doing a global wish tally! You can submit your wish tally to participate. All pity data will be aggregated to know what is the average pity of paimon.moe users.",
-      "wishTallyCollected": ["What will be collected:", "and", "pity from your wish history"],
+      "wishTallyCollected": [
+        "What will be collected:",
+        "and",
+        "pity from your wish history"
+      ],
       "wishTallySubmit": "Submit Wish Tally",
       "wishTallyThankyou": "Thankyou for participating!",
       "manualTitle": "Manual Input Setting",
@@ -130,13 +142,22 @@
         "whenYouGet": "when you get",
         "p1": "It will automatically add the lifetime pulls,",
         "and": "and",
-        "p2": ["When the", "pity reaches 10, it will automatically be reset to 0"],
-        "p3": ["When the", "pity reaches 90, it will automatically be reset to 0"],
+        "p2": [
+          "When the",
+          "pity reaches 10, it will automatically be reset to 0"
+        ],
+        "p3": [
+          "When the",
+          "pity reaches 90, it will automatically be reset to 0"
+        ],
         "p4": [
           "After a 10x Wish, press",
           "but keep in mind that the pity counter might not be accurate, because there is no way to tell when the drop occured (maybe you got it on the 1st or even the 10th pull). To ensure that the counter is still accurate, you need to check the history table and add it one-by-one like you do 1x Wishes."
         ],
-        "p5": ["You can also press the", "button to edit the values manually!"],
+        "p5": [
+          "You can also press the",
+          "button to edit the values manually!"
+        ],
         "p6": [
           "Press the arrow on the bottom to see your pulls' details. A popup will show up when you get a",
           "or",
@@ -220,7 +241,11 @@
       "calculateTalent": "Calculate Talent Material?",
       "inputTalentLevel": "Input the 1st, 2nd & 3rd current talent level",
       "inputTalentNotice": "If it has different color, substract it by 3",
-      "inputTalent": ["1st talent lvl", "2nd talent lvl", "3rd talent lvl"],
+      "inputTalent": [
+        "1st talent lvl",
+        "2nd talent lvl",
+        "3rd talent lvl"
+      ],
       "talentToLevel": "to level",
       "calculate": "Calculate",
       "unknownInformation": "There are some unknown information",
@@ -283,7 +308,10 @@
   "todo": {
     "title": "Todo List",
     "summary": "Summary",
-    "empty": ["Nothing to do yet 😀", "Add some from the Items page or the Calculator!"],
+    "empty": [
+      "Nothing to do yet 😀",
+      "Add some from the Items page or the Calculator!"
+    ],
     "farmableToday": "Farmable Today",
     "resin": "Resin needed",
     "based": "Based on AR:{ar} and WL:{wl}",
@@ -332,4 +360,4 @@
       "reset": "Reset"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/locales/id.json b/src/locales/id.json
index 957a33e9..5a17fb90 100644
--- a/src/locales/id.json
+++ b/src/locales/id.json
@@ -51,7 +51,11 @@
       "success": "Import berhasil 😀!",
       "wishTallyCheck": "Submit pity untuk perhitungan pity global",
       "wishTally": "Kita sedang melakukan perhitungan pity global! Kamu bisa mensubmit pity mu untuk berpartisipasi. Semua data pity akan dikumpulkan untuk mengetahui berapa pity rata-rata pengguna paimon.moe.",
-      "wishTallyCollected": ["Yang dikumpulkan:", "dan", "pity dari riwayat wish mu"],
+      "wishTallyCollected": [
+        "Yang dikumpulkan:",
+        "dan",
+        "pity dari riwayat wish mu"
+      ],
       "faqs": {
         "title": "Import Riwayat Wish FAQS",
         "q1": "Cara kerjanya gimana?",
@@ -70,7 +74,11 @@
           "sini"
         ],
         "q5": "Apakah kamu menyimpan key sementara ku atau riwayat history ku?",
-        "a5": "Paimon.moe tidak menyimpan key mu, dan menggunakan HTTPS untuk mengirim link mu ke proxy cors sehingga bisa digunakan. Semua data riwayat wish mu disimpan pada device masing-masing (atau google drive mu jika kamu menyalakan sync di setting). Paimon.moe tidak menyimpan apapun di server (ya apapun)",
+        "a5": [
+          "Paimon.moe tidak menyimpan key mu, dan menggunakan HTTPS untuk mengirim link mu ke proxy cors sehingga bisa digunakan. Paimon.moe akan menyimpan pity 4*, pity 5*, dan informasi wish 5* jika kamu mensubmit wish mu ke perhitungan pity global paimon.moe (tidak ada data pribadi yang disimpan! harap cek",
+          "Privacy Policy",
+          "untuk info lebih lanjut). Kamu bisa tidak mencentang submit pity untuk tidak mengirim data wish. Kemudian semua data riwayat wish mu disimpan pada device masing-masing (atau google drive mu jika kamu menyalakan sync di setting)."
+        ],
         "q6": "Saya udah coba step-step nya, tapi kok malah dapet API error?",
         "a6": "Coba pastiin sudah di copy semua text nya (coba select all aja text nya, jangan di potong-potong), mungkin ada yang kelewatan, jadi ada yang terpotong"
       },
@@ -116,7 +124,11 @@
       "exportFinish": "Export berhasil, harap tunggu sampai file nya sudah ter-download!",
       "wishTallyTitle": "Submit Perhitungan Pity Wish",
       "wishTally": "Kita sedang melakukan perhitungan pity global! Kamu bisa mensubmit pity mu untuk berpartisipasi. Semua data pity akan dikumpulkan untuk mengetahui berapa pity rata-rata pengguna paimon.moe.",
-      "wishTallyCollected": ["Yang dikumpulkan:", "dan", "pity dari riwayat wish mu"],
+      "wishTallyCollected": [
+        "Yang dikumpulkan:",
+        "dan",
+        "pity dari riwayat wish mu"
+      ],
       "wishTallySubmit": "Submit Perhitungan Pity Wish",
       "wishTallyThankyou": "Terimakasih sudah berpartisipasi!",
       "manualTitle": "Pengaturan Manual Input",
@@ -130,13 +142,22 @@
         "whenYouGet": "ketika kamu mendapatkan",
         "p1": "Itu akan otomatis menambahkan total pull",
         "and": "dan",
-        "p2": ["Ketika", "pity mencapai 10, angkanya akan otomatis reset menjadi 0"],
-        "p3": ["Ketika", "pity mencapai 90, angkanya akan otomatis reset menjadi 0"],
+        "p2": [
+          "Ketika",
+          "pity mencapai 10, angkanya akan otomatis reset menjadi 0"
+        ],
+        "p3": [
+          "Ketika",
+          "pity mencapai 90, angkanya akan otomatis reset menjadi 0"
+        ],
         "p4": [
           "Ketika kamu melakukan wish x10 pull, tekan",
           "tapi counter pity nya tidak akan akurat, karena tidak tahu kapan drop nya terjadi (bisa saja kamu dapat nya saat pull ke 1 atau bisa saja ke 10). Untuk membuat counter nya akurat, kamu perlu mengecek nya di tabel riwayat wish mu dan tabahkan 1-per-1 seperti kamu melakukan 1x pull wish."
         ],
-        "p5": ["Kamu juga bisa menekan", "untuk mengedit nilai nya secara manual!"],
+        "p5": [
+          "Kamu juga bisa menekan",
+          "untuk mengedit nilai nya secara manual!"
+        ],
         "p6": [
           "Tekan tombol panah dibawah untuk melihat detail riwayat mu. Sebuah form akan muncul ketika kamu mendapat",
           "atau",
@@ -220,7 +241,11 @@
       "calculateTalent": "Hitung Material Talent?",
       "inputTalentLevel": "Masukkan level talent ke 1, 2 dan 3 saat ini",
       "inputTalentNotice": "Jika warna level nya berbeda, kurangi 3",
-      "inputTalent": ["lvl talent ke 1", "lvl talent ke 2", "lvl talent ke 3"],
+      "inputTalent": [
+        "lvl talent ke 1",
+        "lvl talent ke 2",
+        "lvl talent ke 3"
+      ],
       "talentToLevel": "ke level",
       "calculate": "Hitung",
       "unknownInformation": "Ada beberapa informasi yang tidak diketahui",
@@ -283,7 +308,10 @@
   "todo": {
     "title": "Todo List",
     "summary": "Summary",
-    "empty": ["Belum ada yang ditambahkan 😀", "Tambahkan todo dari halaman Items atau dari Kalkulator!"],
+    "empty": [
+      "Belum ada yang ditambahkan 😀",
+      "Tambahkan todo dari halaman Items atau dari Kalkulator!"
+    ],
     "farmableToday": "Bisa di farm hari ini",
     "resin": "resin diperlukan",
     "based": "Berdasarkan AR:{ar} and WL:{wl}",
@@ -332,4 +360,4 @@
       "reset": "Reset"
     }
   }
-}
+}
\ No newline at end of file