From 04e333aa36600ca3106eddeea714af31cc9f9db9 Mon Sep 17 00:00:00 2001
From: myl7 <myl@myl.moe>
Date: Sun, 6 Feb 2022 20:09:59 +0800
Subject: [PATCH] fix double plurals with context

---
 components/FileListing.tsx       | 7 +++++--
 i18next-parser.config.js         | 1 +
 next-i18next.config.js           | 7 ++++++-
 public/locales/en/common.json    | 8 ++++++--
 public/locales/zh-CN/common.json | 4 +++-
 5 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/components/FileListing.tsx b/components/FileListing.tsx
index 499f330..2df9202 100644
--- a/components/FileListing.tsx
+++ b/components/FileListing.tsx
@@ -321,10 +321,13 @@ const FileListing: FC<{ query?: ParsedUrlQuery }> = ({ query }) => {
         {!onlyOnePage && (
           <div className="rounded-b bg-white dark:bg-gray-900 dark:text-gray-100">
             <div className="border-b border-gray-200 p-3 text-center font-mono text-sm text-gray-400 dark:border-gray-700">
-              {t('- showing {{count}} page(s) of {{totalFileNum}} files -', {
+              {t('- showing {{count}} page(s) ', {
                 count: size,
                 totalFileNum: isLoadingMore ? '...' : folderChildren.length
-              })}
+              }) +
+                (isLoadingMore
+                  ? t('of {{count}} file(s) -', { count: folderChildren.length, context: 'loading' })
+                  : t('of {{count}} file(s) -', { count: folderChildren.length, context: 'loaded' }))}
             </div>
             <button
               className={`flex w-full items-center justify-center space-x-2 p-3 disabled:cursor-not-allowed ${
diff --git a/i18next-parser.config.js b/i18next-parser.config.js
index 177b2c3..439b39f 100644
--- a/i18next-parser.config.js
+++ b/i18next-parser.config.js
@@ -9,6 +9,7 @@ module.exports = {
   keySeparator: false,
   namespaceSeparator: false,
   pluralSeparator: '——',
+  contextSeparator: '——',
   lineEnding: 'lf',
   locales: i18n.locales,
   output: path.join(localePath, '$LOCALE/$NAMESPACE.json'),
diff --git a/next-i18next.config.js b/next-i18next.config.js
index bf2e486..ea149e4 100644
--- a/next-i18next.config.js
+++ b/next-i18next.config.js
@@ -5,5 +5,10 @@ module.exports = {
     defaultLocale: 'en',
     locales: ['en', 'zh-CN']
   },
-  localePath: path.resolve('public/locales')
+  localePath: path.resolve('public/locales'),
+  reloadOnPrerender: process.env.NODE_ENV === 'development',
+  keySeparator: false,
+  namespaceSeparator: false,
+  pluralSeparator: '——',
+  contextSeparator: '——'
 }
diff --git a/public/locales/en/common.json b/public/locales/en/common.json
index 5791f46..d1e7cf3 100644
--- a/public/locales/en/common.json
+++ b/public/locales/en/common.json
@@ -1,6 +1,6 @@
 {
-  "- showing {{count}} page(s) of {{totalFileNum}} files -——one": "- showing {{count}} page of {{totalFileNum}} files -",
-  "- showing {{count}} page(s) of {{totalFileNum}} files -——other": "- showing {{count}} pages of {{totalFileNum}} files -",
+  "- showing {{count}} page(s) ——one": "- showing {{count}} page ",
+  "- showing {{count}} page(s) ——other": "- showing {{count}} pages ",
   "{{count}} item(s)——one": "{{count}} item",
   "{{count}} item(s)——other": "{{count}} items",
   "Actions": "Actions",
@@ -45,6 +45,10 @@
   "Name": "Name",
   "No more files": "No more files",
   "Nothing here.": "Nothing here.",
+  "of {{count}} file(s) -——loaded——one": "of {{count}} file -",
+  "of {{count}} file(s) -——loaded——other": "of {{count}} files -",
+  "of {{count}} file(s) -——loading——one": "of ... file(s) -",
+  "of {{count}} file(s) -——loading——other": "of ... file(s) -",
   "Oops, that&apos;s a <1>four-oh-four</1>.": "Oops, that&apos;s a <1>four-oh-four</1>.",
   "Press <2>F12</2> and open devtools for more details, or seek help at <6>onedrive-vercel-index discussions</6>.": "Press <2>F12</2> and open devtools for more details, or seek help at <6>onedrive-vercel-index discussions</6>.",
   "Search ...": "Search ...",
diff --git a/public/locales/zh-CN/common.json b/public/locales/zh-CN/common.json
index cec15b6..53d7e75 100644
--- a/public/locales/zh-CN/common.json
+++ b/public/locales/zh-CN/common.json
@@ -1,5 +1,5 @@
 {
-  "- showing {{count}} page(s) of {{totalFileNum}} files -——other": "已显示 {{count}}  页，共 {{totalFileNum}} 个文件",
+  "- showing {{count}} page(s) ——other": "已显示 {{count}} 页",
   "{{count}} item(s)——other": "{{count}} 个项目",
   "Actions": "操作",
   "Cancel": "取消",
@@ -43,6 +43,8 @@
   "Name": "文件名",
   "No more files": "加载完毕",
   "Nothing here.": "无内容。",
+  "of {{count}} file(s) -——loaded——other": "共 {{count}} 个文件",
+  "of {{count}} file(s) -——loading——other": "共 ... 个文件",
   "Oops, that&apos;s a <1>four-oh-four</1>.": "Oops，这里是 <1>404</1> 页面。",
   "Press <2>F12</2> and open devtools for more details, or seek help at <6>onedrive-vercel-index discussions</6>.": "请按下 <2>F12</2> 来打开开发者工具窗口以获取详细信息，或是到 <6>onedrive-vercel-index 社区讨论</6> 处寻求帮助。",
   "Search ...": "搜索……",