Merge branch 'lakejason0-main' into main

src/components/WishImportModal.svelte

@@ -577,7 +577,7 @@
         <Icon path={mdiLoading} spin color="white" />
         <div class="ml-2">
           <p>{$t('wish.import.processing')} {currentBanner} {$t('wish.import.banner')}</p>
-          <p>{$t('wish.import.page')} {currentPage}</p>
+          <p>{$t('wish.import.page', values: { page: currentPage } )}</p>
         </div>
       </div>
       <table class="min-w-full md:min-w-0 mt-2">

src/locales/de.json

@@ -155,7 +155,7 @@
       "reCalculating": "Rekalkulation der Garantie...",
       "processing": "Wird verarbeitet",
       "banner": "Banner",
-      "page": "Seite",
+      "page": "Seite {page}",
       "parsing": "Wird analysiert...",
       "save": "Speichern",
       "cancel": "Abbrechen",
@@ -858,4 +858,4 @@
     "save": "Speichern",
     "cancel": "Abbrechen"
   }
-}
+}

src/locales/en.json

@@ -155,7 +155,7 @@
       "reCalculating": "Re-calculating pity...",
       "processing": "Processing",
       "banner": "Banner",
-      "page": "Page",
+      "page": "Page {page}",
       "parsing": "Parsing...",
       "save": "Save",
       "cancel": "Cancel",
@@ -865,4 +865,4 @@
     "save": "Save",
     "cancel": "Cancel"
   }
-}
+}

src/locales/es.json

@@ -155,7 +155,7 @@
       "reCalculating": "Recalculando pity...",
       "processing": "Procesando",
       "banner": "Banner",
-      "page": "Página",
+      "page": "Página {page}",
       "parsing": "Analizando...",
       "save": "Guardar",
       "cancel": "Cancelar",
@@ -858,4 +858,4 @@
     "save": "Guardar",
     "cancel": "Cancelar"
   }
-}
+}

src/locales/fr.json

@@ -155,7 +155,7 @@
       "reCalculating": "Recalcul de la pity...",
       "processing": "Traitement de la",
       "banner": "Bannière",
-      "page": "Page",
+      "page": "Page {page}",
       "parsing": "Analyse...",
       "save": "Sauvegarder",
       "cancel": "Annuler",
@@ -858,4 +858,4 @@
     "save": "Sauvegarder",
     "cancel": "Annuler"
   }
-}
+}

src/locales/id.json

@@ -155,7 +155,7 @@
       "reCalculating": "Menghitung pity...",
       "processing": "Memproses",
       "banner": "Banner",
-      "page": "Halaman",
+      "page": "Halaman {page}",
       "parsing": "Membaca...",
       "save": "Simpan",
       "cancel": "Batal",
@@ -865,4 +865,4 @@
     "save": "Simpan",
     "cancel": "Batal"
   }
-}
+}

src/locales/ja.json

@@ -155,7 +155,7 @@
       "reCalculating": "天井カウントを再計算中...",
       "processing": "処理中",
       "banner": "祈願",
-      "page": "ページ",
+      "page": "ページ {page}",
       "parsing": "解析中...",
       "save": "保存",
       "cancel": "キャンセル",
@@ -858,4 +858,4 @@
     "save": "保存",
     "cancel": "キャンセル"
   }
-}
+}

src/locales/ko.json

@@ -155,7 +155,7 @@
       "reCalculating": "천장 재계산 중...",
       "processing": "처리중",
       "banner": "픽업",
-      "page": "페이지",
+      "page": "페이지 {page}",
       "parsing": "파싱 중...",
       "save": "저장",
       "cancel": "취소",
@@ -858,4 +858,4 @@
     "save": "저장",
     "cancel": "취소"
   }
-}
+}

src/locales/pt.json

@@ -155,7 +155,7 @@
       "reCalculating": "Recalculando pity...",
       "processing": "Processando",
       "banner": "Banner",
-      "page": "Página",
+      "page": "Página {page}",
       "parsing": "Parsing...",
       "save": "Salvar",
       "cancel": "Cancelar",
@@ -858,4 +858,4 @@
     "save": "Salvar",
     "cancel": "Cancelar"
   }
-}
+}

src/locales/ru.json

@@ -155,7 +155,7 @@
       "reCalculating": "Пересчитываем гаранты...",
       "processing": "Обработка",
       "banner": "Баннер",
-      "page": "Страница",
+      "page": "Страница {page}",
       "parsing": "Анализируем...",
       "save": "Сохранить",
       "cancel": "Отменить",
@@ -858,4 +858,4 @@
     "save": "Сохранить",
     "cancel": "Отмена"
   }
-}
+}

src/locales/th.json

@@ -155,7 +155,7 @@
       "reCalculating": "กำลังคำนวณค่า pity อีกครั้ง...",
       "processing": "กำลังประมวลผล",
       "banner": "Banner",
-      "page": "หน้า",
+      "page": "หน้า {page}",
       "parsing": "กำลังอ่านค่า...",
       "save": "บันทึก",
       "cancel": "ยกเลิก",
@@ -858,4 +858,4 @@
     "save": "บันทึก",
     "cancel": "ยกเลิก"
   }
-}
+}

src/locales/tw.json

@@ -155,7 +155,7 @@
       "reCalculating": "重新計算保底...",
       "processing": "處理中",
       "banner": "祈願池",
-      "page": "頁",
+      "page": "第 {page} 頁",
       "parsing": "解析中...",
       "save": "儲存",
       "cancel": "取消",
@@ -858,4 +858,4 @@
     "save": "儲存",
     "cancel": "取消"
   }
-}
+}

src/locales/vi.json

@@ -155,7 +155,7 @@
       "reCalculating": "Đang tính lại bảo hiểm...",
       "processing": "Đang xử lý",
       "banner": "Banner",
-      "page": "Trang",
+      "page": "Trang {page}",
       "parsing": "Đang phân tích...",
       "save": "Lưu",
       "cancel": "Hủy",
@@ -858,4 +858,4 @@
     "save": "Lưu",
     "cancel": "Hủy"
   }
-}
+}

src/locales/zh.json

@@ -155,7 +155,7 @@
       "reCalculating": "重新计算保底...",
       "processing": "处理中",
       "banner": "祈愿池",
-      "page": "页",
+      "page": "第 {page} 页",
       "parsing": "解析中...",
       "save": "保存",
       "cancel": "取消",
@@ -858,4 +858,4 @@
     "save": "保存",
     "cancel": "取消"
   }
-}
+}

src/routes/wish/import.svelte

@@ -1257,7 +1257,7 @@
         {#if !finishedProcessingLog}
           <div class="text-white mb-2">
             <p>{$t('wish.import.processing')} {currentBanner} {$t('wish.import.banner')}</p>
-            <p>{$t('wish.import.page')} {currentPage}</p>
+            <p>{$t('wish.import.page', { values: { page: currentPage } })}</p>
           </div>
         {/if}
         {#if !noNewData}