Fix total time missing (sheepzh#352)

Author: sheepzh

src/i18n/message/popup/content-resource.json

@@ -12,6 +12,8 @@
             "saveAsImageTitle": "保存",
             "averageTime": "平均每天 {value}",
             "averageCount": "平均每天 {value} 次",
+            "totalTime": "共 {totalTime}",
+            "totalCount": "共 {totalCount} 次",
             "otherLabel": "其他{count}个网站"
         },
         "ranking": {
@@ -31,6 +33,8 @@
             "saveAsImageTitle": "保存",
             "averageCount": "平均每天 {value} 次",
             "averageTime": "平均每天 {value}",
+            "totalTime": "共 {totalTime}",
+            "totalCount": "共 {totalCount} 次",
             "otherLabel": "其他 {count} 個站點"
         },
         "ranking": {
@@ -50,6 +54,8 @@
             "saveAsImageTitle": "Snapshot",
             "averageCount": "{value} times per day on average",
             "averageTime": "{value} per day on average",
+            "totalTime": "Total {totalTime}",
+            "totalCount": "Total {totalCount} times",
             "otherLabel": "Other {count} sites"
         },
         "ranking": {
@@ -69,6 +75,8 @@
             "saveAsImageTitle": "ダウンロード",
             "averageCount": "1日平均 {value} 回",
             "averageTime": "1日平均 {value}",
+            "totalTime": "合計 {totalTime}",
+            "totalCount": "合計 {totalCount} 回",
             "otherLabel": "他 {count} サイト"
         },
         "ranking": {
@@ -88,6 +96,8 @@
             "saveAsImageTitle": "Capturas",
             "averageCount": "{value} vezes por dia em média",
             "averageTime": "{value} por dia em média",
+            "totalTime": "Total {totalTime}",
+            "totalCount": "Total {totalCount} vezes",
             "otherLabel": "Outros sites do {count}"
         },
         "ranking": {
@@ -107,6 +117,8 @@
             "saveAsImageTitle": "Знімок",
             "averageCount": "{value} разів на день у середньому",
             "averageTime": "{value} на день у середньому",
+            "totalTime": "Всього {totalTime}",
+            "totalCount": "Всього {totalCount} разів",
             "otherLabel": "Інші {count} сайтів"
         },
         "ranking": {
@@ -126,6 +138,8 @@
             "saveAsImageTitle": "Captura de pantalla",
             "averageCount": "{value} veces al día en promedio",
             "averageTime": "{value} al día en promedio",
+            "totalTime": "Total {totalTime}",
+            "totalCount": "Total {totalCount} veces",
             "otherLabel": "Otros {count} sitios"
         },
         "ranking": {
@@ -145,6 +159,8 @@
             "saveAsImageTitle": "Bildschirmfoto",
             "averageCount": "{value} mal pro Tag",
             "averageTime": "{value} pro Tag im Durchschnitt",
+            "totalTime": "Gesamt {totalTime}",
+            "totalCount": "Gesamt {totalCount} mal",
             "otherLabel": "{count} andere Websites"
         },
         "ranking": {
@@ -164,6 +180,8 @@
             "saveAsImageTitle": "Capture d'écran",
             "averageCount": "{value} fois par jour en moyenne",
             "averageTime": "{value} fois par jour en moyenne",
+            "totalTime": "{totalTime} au total",
+            "totalCount": "{totalCount} fois au total",
             "otherLabel": "{count} autres sites"
         },
         "ranking": {
@@ -183,6 +201,8 @@
             "saveAsImageTitle": "Снимок",
             "averageCount": "{value} раз в день в среднем",
             "averageTime": "{value} в день в среднем",
+            "totalTime": "Всего {totalTime}",
+            "totalCount": "Всего {totalCount} раз",
             "otherLabel": "Другие {count} сайты"
         },
         "ranking": {
@@ -202,6 +222,8 @@
             "saveAsImageTitle": "تحميل",
             "averageCount": "متوسط {value} زيارة يومياً",
             "averageTime": "متوسط {value} يومياً",
+            "totalTime": "الإجمالي {totalTime}",
+            "totalCount": "الإجمالي {totalCount} زيارة",
             "otherLabel": "{count} مواقع أخرى"
         },
         "ranking": {

src/i18n/message/popup/content.ts

@@ -13,6 +13,8 @@ export type ContentMessage = {
         saveAsImageTitle: string
         averageTime: string
         averageCount: string
+        totalTime: string
+        totalCount: string
         otherLabel: string
     }
     ranking: {

src/pages/popup/components/Header/LangSelect.tsx

@@ -1,10 +1,13 @@
+import { createTab } from "@api/chrome/tab"
 import { useManualRequest, useRequest } from "@hooks/useRequest"
 import { ALL_LOCALES, localeSameAsBrowser, t } from "@i18n"
 import optionMessages from "@i18n/message/app/option"
 import localeMessages from "@i18n/message/common/locale"
 import Flex from "@pages/components/Flex"
 import { usePopupContext } from "@popup/context"
+import { t as tPopup } from "@popup/locale"
 import optionService from "@service/option-service"
+import { CROWDIN_HOMEPAGE } from "@util/constant/url"
 import { ElDropdown, ElDropdownItem, ElDropdownMenu, ElIcon, ElText } from "element-plus"
 import { defineComponent, type StyleValue } from "vue"
 
@@ -64,10 +67,15 @@ const LangSelect = defineComponent(() => {
                         <ElDropdownItem
                             onClick={() => saveLocale('default')}
                             style={current.value === 'default' ? SELECTED_STYLES : null}
-                            divided
                         >
                             {t(optionMessages, { key: m => m.appearance.locale.default })}
                         </ElDropdownItem>
+                        <ElDropdownItem
+                            onClick={() => createTab(CROWDIN_HOMEPAGE)}
+                            divided
+                        >
+                            {tPopup(msg => msg.menu.helpUs)}
+                        </ElDropdownItem>
                     </ElDropdownMenu>
                 )
             }}

src/pages/popup/components/Percentage/chart.ts

@@ -1,6 +1,8 @@
 import { jump2Report } from "@popup/common"
 import { t } from "@popup/locale"
+import { sum } from "@util/array"
 import { IS_SAFARI } from "@util/constant/environment"
+import { isRtl } from "@util/document"
 import { generateSiteLabel } from "@util/site"
 import { getPrimaryTextColor, getSecondaryTextColor } from "@util/style"
 import { formatPeriodCommon, formatTime, parseTime } from "@util/time"
@@ -39,7 +41,7 @@ function combineDate(start: Date, end: Date, format: string): string {
         .replace('{ed}', ed.toString().padStart(2, '0'))
 }
 
-function calculateSubTitleText(date: Date | [Date, Date?], dataDate: [string, string]): string {
+function formatDateStr(date: Date | [Date, Date?], dataDate: [string, string]): string {
     const format = t(msg => msg.calendar.dateFormat)
 
     if (!date) {
@@ -57,11 +59,32 @@ function calculateSubTitleText(date: Date | [Date, Date?], dataDate: [string, st
     return combineDate(start, end, format)
 }
 
+function formatTotalStr(rows: timer.stat.Row[], type: timer.core.Dimension): string {
+    if (type === 'focus') {
+        const total = sum(rows.map(r => r?.focus ?? 0))
+        const totalTime = formatPeriodCommon(total)
+        return t(msg => msg.content.percentage.totalTime, { totalTime })
+    } else if (type === 'time') {
+        const totalCount = sum(rows.map(r => r.time ?? 0))
+        return t(msg => msg.content.percentage.totalCount, { totalCount })
+    } else {
+        return ''
+    }
+}
+
+function calculateSubTitleText(result: PercentageResult): string {
+    let { date, dataDate, rows, query: { type } = {} } = result
+    const dateStr = formatDateStr(date, dataDate)
+    const totalStr = formatTotalStr(rows, type)
+    let parts = [totalStr, dateStr].filter(str => !!str)
+    isRtl() && (parts = parts.reverse())
+    return parts.join(' @ ')
+}
+
 export function generateTitleOption(result: PercentageResult): TitleComponentOption {
-    const { chartTitle, date, dataDate } = result || {}
     return {
-        text: chartTitle,
-        subtext: calculateSubTitleText(date, dataDate),
+        text: result?.chartTitle,
+        subtext: calculateSubTitleText(result),
         left: 'center',
         textStyle: { color: getPrimaryTextColor() },
         subtextStyle: { color: getSecondaryTextColor() },