From f045e58cc7ba076a0ac4b0b5bf0702fa155eaa59 Mon Sep 17 00:00:00 2001
From: Yarden Shoham <git@yardenshoham.com>
Date: Mon, 17 Apr 2023 21:26:01 +0300
Subject: Localize activity heatmap (except tooltip) (#24131)

The calculation of the total sum is moved to the backend so a full HTML
string could be sent.


![image](https://user-images.githubusercontent.com/20454870/232112381-c11d896b-ba47-40f8-b2a3-71cf4b3208de.png)

- Closes #10669
- 2nd attempt (the first was in #21570)

---------

Signed-off-by: Yarden Shoham <git@yardenshoham.com>
Co-authored-by: Giteabot <teabot@gitea.io>
---
 web_src/js/components/ActivityHeatmap.vue | 11 +----------
 web_src/js/features/heatmap.js            |  6 +++++-
 2 files changed, 6 insertions(+), 11 deletions(-)

(limited to 'web_src')

diff --git a/web_src/js/components/ActivityHeatmap.vue b/web_src/js/components/ActivityHeatmap.vue
index 98ffce44b5..7834ebe82c 100644
--- a/web_src/js/components/ActivityHeatmap.vue
+++ b/web_src/js/components/ActivityHeatmap.vue
@@ -1,7 +1,7 @@
 <template>
   <div id="user-heatmap">
     <div class="total-contributions">
-      {{ sum }} contributions in the last 12 months
+      {{ locale.contributions_in_the_last_12_months }}
     </div>
     <calendar-heatmap
       :locale="locale"
@@ -41,15 +41,6 @@ export default {
     ],
     endDate: new Date(),
   }),
-  computed: {
-    sum() {
-      let s = 0;
-      for (let i = 0; i < this.values.length; i++) {
-        s += this.values[i].count;
-      }
-      return s;
-    }
-  },
   mounted() {
     // work around issue with first legend color being rendered twice and legend cut off
     const legend = document.querySelector('.vch__external-legend-wrapper');
diff --git a/web_src/js/features/heatmap.js b/web_src/js/features/heatmap.js
index f80089ee43..2c65293b64 100644
--- a/web_src/js/features/heatmap.js
+++ b/web_src/js/features/heatmap.js
@@ -18,11 +18,15 @@ export function initHeatmap() {
       return {date: new Date(v), count: heatmap[v]};
     });
 
+    // last heatmap tooltip localization attempt https://github.com/go-gitea/gitea/pull/24131/commits/a83761cbbae3c2e3b4bced71e680f44432073ac8
     const locale = {
       months: new Array(12).fill().map((_, idx) => translateMonth(idx)),
       days: new Array(7).fill().map((_, idx) => translateDay(idx)),
       contributions: 'contributions',
-      no_contributions: 'No contributions',
+      contributions_in_the_last_12_months: el.getAttribute('data-locale-total-contributions'),
+      no_contributions: el.getAttribute('data-locale-no-contributions'),
+      more: el.getAttribute('data-locale-more'),
+      less: el.getAttribute('data-locale-less'),
     };
 
     const View = createApp(ActivityHeatmap, {values, locale});
-- 
cgit v1.2.3