From 047979191c2083b2136fce42e3699d283b437867 Mon Sep 17 00:00:00 2001
From: Yarden Shoham <hrsi88@gmail.com>
Date: Sun, 23 Oct 2022 18:34:08 +0000
Subject: [PATCH 01/12] Localize time units on activity heatmap

Previously, the months and days were hardcoded into English

Signed-off-by: Yarden Shoham <hrsi88@gmail.com>
---
 web_src/js/components/ActivityHeatmap.vue |  3 ++-
 web_src/js/features/heatmap-locale.js     | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 web_src/js/features/heatmap-locale.js

diff --git a/web_src/js/components/ActivityHeatmap.vue b/web_src/js/components/ActivityHeatmap.vue
index b5c5c65bbf495..f04bf0b9a8104 100644
--- a/web_src/js/components/ActivityHeatmap.vue
+++ b/web_src/js/components/ActivityHeatmap.vue
@@ -16,6 +16,7 @@
 </template>
 <script>
 import {CalendarHeatmap} from 'vue3-calendar-heatmap';
+import heatmapLocale from '../features/heatmap-locale.js';
 
 export default {
   name: 'ActivityHeatmap',
@@ -39,7 +40,7 @@ export default {
     locale: {
       contributions: 'contributions',
       no_contributions: 'No contributions',
-    },
+      ...heatmapLocale},
   }),
   computed: {
     sum() {
diff --git a/web_src/js/features/heatmap-locale.js b/web_src/js/features/heatmap-locale.js
new file mode 100644
index 0000000000000..fd1d65e46ed33
--- /dev/null
+++ b/web_src/js/features/heatmap-locale.js
@@ -0,0 +1,14 @@
+const {lang} = document.documentElement;
+
+// given a month (0-11), returns it in the documents language
+const formatMonth = (month) => new Date(Date.UTC(2022, month, 12)).toLocaleString(lang, {month: 'short'});
+
+// given a weekday (0-6, Sunday to Saturday), returns it in the documents language
+const formatDay = (day) => new Date(Date.UTC(2022, 7, day)).toLocaleString(lang, {weekday: 'short'});
+
+const months = new Array(12).fill().map((_, idx) => formatMonth(idx));
+const days = new Array(7).fill().map((_, idx) => formatDay(idx));
+
+const heatmapLocale = {months, days};
+
+export default heatmapLocale;

From 9bbba0692d9d0c2ef64744bcacbedcce93390ca7 Mon Sep 17 00:00:00 2001
From: Yarden Shoham <hrsi88@gmail.com>
Date: Mon, 24 Oct 2022 19:23:12 +0000
Subject: [PATCH 02/12] Localize heatmap constants and tooltip

Signed-off-by: Yarden Shoham <hrsi88@gmail.com>
---
 options/locale/locale_en-US.ini           |  7 +++++++
 templates/base/head_script.tmpl           |  6 ++++++
 web_src/js/components/ActivityHeatmap.vue | 16 +++++++++++-----
 web_src/js/features/heatmap-locale.js     | 14 --------------
 web_src/js/utils.js                       | 16 ++++++++++++++++
 5 files changed, 40 insertions(+), 19 deletions(-)
 delete mode 100644 web_src/js/features/heatmap-locale.js

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 3c2e70187cd75..a6c8e94539d88 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -23,6 +23,13 @@ enable_javascript = This website works better with JavaScript.
 toc = Table of Contents
 licenses = Licenses
 return_to_gitea = Return to Gitea
+contributions = Contributions
+no_contributions = No contributions
+contributions_in_the_last_12_months = Contributions in the last 12 months
+on = On
+less = Less
+more = More
+
 
 username = Username
 email = Email Address
diff --git a/templates/base/head_script.tmpl b/templates/base/head_script.tmpl
index c4ac18a86ee5e..54a075d37b7f0 100644
--- a/templates/base/head_script.tmpl
+++ b/templates/base/head_script.tmpl
@@ -41,6 +41,12 @@ If you introduce mistakes in it, Gitea JavaScript code wouldn't run correctly.
 			copy_error: '{{.locale.Tr "copy_error"}}',
 			error_occurred: '{{.locale.Tr "error.occurred"}}',
 			network_error: '{{.locale.Tr "error.network_error"}}',
+			contributions: '{{.locale.Tr "contributions"}}',
+			no_contributions: '{{.locale.Tr "no_contributions"}}',
+			contributions_in_the_last_12_months: '{{.locale.Tr "contributions_in_the_last_12_months"}}',
+			on: '{{.locale.Tr "on"}}',
+			less: '{{.locale.Tr "less"}}',
+			more: '{{.locale.Tr "more"}}',
 		},
 	};
 	{{/* in case some pages don't render the pageData, we make sure it is an object to prevent null access */}}
diff --git a/web_src/js/components/ActivityHeatmap.vue b/web_src/js/components/ActivityHeatmap.vue
index f04bf0b9a8104..79c63d589adf1 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
+      {{ sum }} {{ locale.contributions_in_the_last_12_months }}
     </div>
     <calendar-heatmap
       :locale="locale"
@@ -16,7 +16,7 @@
 </template>
 <script>
 import {CalendarHeatmap} from 'vue3-calendar-heatmap';
-import heatmapLocale from '../features/heatmap-locale.js';
+import {formatMonth, formatDay, getCurrentLocale} from '../utils.js';
 
 export default {
   name: 'ActivityHeatmap',
@@ -38,9 +38,15 @@ export default {
     ],
     endDate: new Date(),
     locale: {
-      contributions: 'contributions',
-      no_contributions: 'No contributions',
-      ...heatmapLocale},
+      months: new Array(12).fill().map((_, idx) => formatMonth(idx)),
+      days: new Array(7).fill().map((_, idx) => formatDay(idx)),
+      contributions: window.config.i18n.contributions.toLocaleLowerCase(getCurrentLocale()),
+      no_contributions: window.config.i18n.no_contributions,
+      contributions_in_the_last_12_months: window.config.i18n.contributions_in_the_last_12_months.toLocaleLowerCase(getCurrentLocale()),
+      on: window.config.i18n.on.toLocaleLowerCase(getCurrentLocale()),
+      less: window.config.i18n.less,
+      more: window.config.i18n.more,
+    },
   }),
   computed: {
     sum() {
diff --git a/web_src/js/features/heatmap-locale.js b/web_src/js/features/heatmap-locale.js
deleted file mode 100644
index fd1d65e46ed33..0000000000000
--- a/web_src/js/features/heatmap-locale.js
+++ /dev/null
@@ -1,14 +0,0 @@
-const {lang} = document.documentElement;
-
-// given a month (0-11), returns it in the documents language
-const formatMonth = (month) => new Date(Date.UTC(2022, month, 12)).toLocaleString(lang, {month: 'short'});
-
-// given a weekday (0-6, Sunday to Saturday), returns it in the documents language
-const formatDay = (day) => new Date(Date.UTC(2022, 7, day)).toLocaleString(lang, {weekday: 'short'});
-
-const months = new Array(12).fill().map((_, idx) => formatMonth(idx));
-const days = new Array(7).fill().map((_, idx) => formatDay(idx));
-
-const heatmapLocale = {months, days};
-
-export default heatmapLocale;
diff --git a/web_src/js/utils.js b/web_src/js/utils.js
index 4020b7a7f4877..f27218056a287 100644
--- a/web_src/js/utils.js
+++ b/web_src/js/utils.js
@@ -70,3 +70,19 @@ export function prettyNumber(num, locale = 'en-US') {
 export function parseUrl(str) {
   return new URL(str, str.startsWith('http') ? undefined : window.location.origin);
 }
+
+// return current locale chosen by user
+export function getCurrentLocale() {
+  const {lang} = document.documentElement;
+  return lang;
+}
+
+// given a month (0-11), returns it in the documents language
+export function formatMonth(month) {
+  return new Date(Date.UTC(2022, month, 12)).toLocaleString(getCurrentLocale(), {month: 'short'});
+}
+
+// given a weekday (0-6, Sunday to Saturday), returns it in the documents language
+export function formatDay(day) {
+  return new Date(Date.UTC(2022, 7, day)).toLocaleString(getCurrentLocale(), {weekday: 'short'});
+}

From 57e4135d23d0fba4f9d7b1a7f8b8a4afab7eefa8 Mon Sep 17 00:00:00 2001
From: Yarden Shoham <hrsi88@gmail.com>
Date: Mon, 24 Oct 2022 19:38:57 +0000
Subject: [PATCH 03/12] Add tests

---
 web_src/js/utils.test.js | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/web_src/js/utils.test.js b/web_src/js/utils.test.js
index 7bf5bb7eb61d8..ae1c83574f372 100644
--- a/web_src/js/utils.test.js
+++ b/web_src/js/utils.test.js
@@ -1,7 +1,7 @@
 import {expect, test} from 'vitest';
 import {
   basename, extname, isObject, uniq, stripTags, joinPaths, parseIssueHref,
-  prettyNumber, parseUrl,
+  prettyNumber, parseUrl, formatMonth, formatDay
 } from './utils.js';
 
 test('basename', () => {
@@ -109,3 +109,21 @@ test('parseUrl', () => {
   expect(parseUrl('https://localhost/path?search').search).toEqual('?search');
   expect(parseUrl('https://localhost/path?search#hash').hash).toEqual('#hash');
 });
+
+test('formatMonth', () => {
+  document.documentElement.lang = 'en-US';
+  expect(formatMonth(0)).toEqual('Jan');
+  expect(formatMonth(4)).toEqual('May');
+  document.documentElement.lang = 'es-ES';
+  expect(formatMonth(5)).toEqual('jun');
+  expect(formatMonth(6)).toEqual('jul');
+});
+
+test('formatDay', () => {
+  document.documentElement.lang = 'fr-FR';
+  expect(formatDay(1)).toEqual('lun.');
+  expect(formatDay(5)).toEqual('ven.');
+  document.documentElement.lang = 'pl-PL';
+  expect(formatDay(1)).toEqual('pon.');
+  expect(formatDay(5)).toEqual('pt.');
+});

From 2d011915d1051fad2055966277f0ce98d601f5af Mon Sep 17 00:00:00 2001
From: Yarden Shoham <hrsi88@gmail.com>
Date: Mon, 24 Oct 2022 19:40:28 +0000
Subject: [PATCH 04/12] Destructure

---
 web_src/js/components/ActivityHeatmap.vue | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/web_src/js/components/ActivityHeatmap.vue b/web_src/js/components/ActivityHeatmap.vue
index 79c63d589adf1..983187bea61d8 100644
--- a/web_src/js/components/ActivityHeatmap.vue
+++ b/web_src/js/components/ActivityHeatmap.vue
@@ -18,6 +18,8 @@
 import {CalendarHeatmap} from 'vue3-calendar-heatmap';
 import {formatMonth, formatDay, getCurrentLocale} from '../utils.js';
 
+const {i18n} = window.config;
+
 export default {
   name: 'ActivityHeatmap',
   components: {CalendarHeatmap},
@@ -40,12 +42,12 @@ export default {
     locale: {
       months: new Array(12).fill().map((_, idx) => formatMonth(idx)),
       days: new Array(7).fill().map((_, idx) => formatDay(idx)),
-      contributions: window.config.i18n.contributions.toLocaleLowerCase(getCurrentLocale()),
-      no_contributions: window.config.i18n.no_contributions,
-      contributions_in_the_last_12_months: window.config.i18n.contributions_in_the_last_12_months.toLocaleLowerCase(getCurrentLocale()),
-      on: window.config.i18n.on.toLocaleLowerCase(getCurrentLocale()),
-      less: window.config.i18n.less,
-      more: window.config.i18n.more,
+      contributions: i18n.contributions.toLocaleLowerCase(getCurrentLocale()),
+      no_contributions: i18n.no_contributions,
+      contributions_in_the_last_12_months: i18n.contributions_in_the_last_12_months.toLocaleLowerCase(getCurrentLocale()),
+      on: i18n.on.toLocaleLowerCase(getCurrentLocale()),
+      less: i18n.less,
+      more: i18n.more,
     },
   }),
   computed: {

From eba5ff3e58e547902366ba93e807a4d27503296f Mon Sep 17 00:00:00 2001
From: Yarden Shoham <hrsi88@gmail.com>
Date: Mon, 24 Oct 2022 19:42:16 +0000
Subject: [PATCH 05/12] Drop line

---
 options/locale/locale_en-US.ini | 1 -
 1 file changed, 1 deletion(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 11fb1381e4f51..8b8ca52552b02 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -30,7 +30,6 @@ on = On
 less = Less
 more = More
 
-
 username = Username
 email = Email Address
 password = Password

From d1a8a921faf2278c1c749e33ea2b06560a8bb6e9 Mon Sep 17 00:00:00 2001
From: Yarden Shoham <hrsi88@gmail.com>
Date: Tue, 25 Oct 2022 19:20:04 +0000
Subject: [PATCH 06/12] Rename `format` --> `translate`

---
 web_src/js/components/ActivityHeatmap.vue |  6 +--
 web_src/js/utils.js                       | 14 +++---
 web_src/js/utils.test.js                  | 54 +++++++++++------------
 3 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/web_src/js/components/ActivityHeatmap.vue b/web_src/js/components/ActivityHeatmap.vue
index 983187bea61d8..3de708a6532ba 100644
--- a/web_src/js/components/ActivityHeatmap.vue
+++ b/web_src/js/components/ActivityHeatmap.vue
@@ -16,7 +16,7 @@
 </template>
 <script>
 import {CalendarHeatmap} from 'vue3-calendar-heatmap';
-import {formatMonth, formatDay, getCurrentLocale} from '../utils.js';
+import {translateMonth, translateDay, getCurrentLocale} from '../utils.js';
 
 const {i18n} = window.config;
 
@@ -40,8 +40,8 @@ export default {
     ],
     endDate: new Date(),
     locale: {
-      months: new Array(12).fill().map((_, idx) => formatMonth(idx)),
-      days: new Array(7).fill().map((_, idx) => formatDay(idx)),
+      months: new Array(12).fill().map((_, idx) => translateMonth(idx)),
+      days: new Array(7).fill().map((_, idx) => translateDay(idx)),
       contributions: i18n.contributions.toLocaleLowerCase(getCurrentLocale()),
       no_contributions: i18n.no_contributions,
       contributions_in_the_last_12_months: i18n.contributions_in_the_last_12_months.toLocaleLowerCase(getCurrentLocale()),
diff --git a/web_src/js/utils.js b/web_src/js/utils.js
index f27218056a287..c2d74aecd5112 100644
--- a/web_src/js/utils.js
+++ b/web_src/js/utils.js
@@ -56,13 +56,13 @@ export function mqBinarySearch(feature, minValue, maxValue, step, unit) {
 export function parseIssueHref(href) {
   const path = (href || '').replace(/[#?].*$/, '');
   const [_, owner, repo, type, index] = /([^/]+)\/([^/]+)\/(issues|pulls)\/([0-9]+)/.exec(path) || [];
-  return {owner, repo, type, index};
+  return { owner, repo, type, index };
 }
 
 // pretty-print a number using locale-specific separators, e.g. 1200 -> 1,200
 export function prettyNumber(num, locale = 'en-US') {
   if (typeof num !== 'number') return '';
-  const {format} = new Intl.NumberFormat(locale);
+  const { format } = new Intl.NumberFormat(locale);
   return format(num);
 }
 
@@ -73,16 +73,16 @@ export function parseUrl(str) {
 
 // return current locale chosen by user
 export function getCurrentLocale() {
-  const {lang} = document.documentElement;
+  const { lang } = document.documentElement;
   return lang;
 }
 
 // given a month (0-11), returns it in the documents language
-export function formatMonth(month) {
-  return new Date(Date.UTC(2022, month, 12)).toLocaleString(getCurrentLocale(), {month: 'short'});
+export function translateMonth(month) {
+  return new Date(Date.UTC(2022, month, 12)).toLocaleString(getCurrentLocale(), { month: 'short' });
 }
 
 // given a weekday (0-6, Sunday to Saturday), returns it in the documents language
-export function formatDay(day) {
-  return new Date(Date.UTC(2022, 7, day)).toLocaleString(getCurrentLocale(), {weekday: 'short'});
+export function translateDay(day) {
+  return new Date(Date.UTC(2022, 7, day)).toLocaleString(getCurrentLocale(), { weekday: 'short' });
 }
diff --git a/web_src/js/utils.test.js b/web_src/js/utils.test.js
index ae1c83574f372..8411d90621c78 100644
--- a/web_src/js/utils.test.js
+++ b/web_src/js/utils.test.js
@@ -1,7 +1,7 @@
-import {expect, test} from 'vitest';
+import { expect, test } from 'vitest';
 import {
   basename, extname, isObject, uniq, stripTags, joinPaths, parseIssueHref,
-  prettyNumber, parseUrl, formatMonth, formatDay
+  prettyNumber, parseUrl, translateMonth, translateDay
 } from './utils.js';
 
 test('basename', () => {
@@ -70,21 +70,21 @@ test('stripTags', () => {
 });
 
 test('parseIssueHref', () => {
-  expect(parseIssueHref('/owner/repo/issues/1')).toEqual({owner: 'owner', repo: 'repo', type: 'issues', index: '1'});
-  expect(parseIssueHref('/owner/repo/pulls/1?query')).toEqual({owner: 'owner', repo: 'repo', type: 'pulls', index: '1'});
-  expect(parseIssueHref('/owner/repo/issues/1#hash')).toEqual({owner: 'owner', repo: 'repo', type: 'issues', index: '1'});
-  expect(parseIssueHref('/sub/owner/repo/issues/1')).toEqual({owner: 'owner', repo: 'repo', type: 'issues', index: '1'});
-  expect(parseIssueHref('/sub/sub2/owner/repo/pulls/1')).toEqual({owner: 'owner', repo: 'repo', type: 'pulls', index: '1'});
-  expect(parseIssueHref('/sub/sub2/owner/repo/issues/1?query')).toEqual({owner: 'owner', repo: 'repo', type: 'issues', index: '1'});
-  expect(parseIssueHref('/sub/sub2/owner/repo/issues/1#hash')).toEqual({owner: 'owner', repo: 'repo', type: 'issues', index: '1'});
-  expect(parseIssueHref('https://example.com/owner/repo/issues/1')).toEqual({owner: 'owner', repo: 'repo', type: 'issues', index: '1'});
-  expect(parseIssueHref('https://example.com/owner/repo/pulls/1?query')).toEqual({owner: 'owner', repo: 'repo', type: 'pulls', index: '1'});
-  expect(parseIssueHref('https://example.com/owner/repo/issues/1#hash')).toEqual({owner: 'owner', repo: 'repo', type: 'issues', index: '1'});
-  expect(parseIssueHref('https://example.com/sub/owner/repo/issues/1')).toEqual({owner: 'owner', repo: 'repo', type: 'issues', index: '1'});
-  expect(parseIssueHref('https://example.com/sub/sub2/owner/repo/pulls/1')).toEqual({owner: 'owner', repo: 'repo', type: 'pulls', index: '1'});
-  expect(parseIssueHref('https://example.com/sub/sub2/owner/repo/issues/1?query')).toEqual({owner: 'owner', repo: 'repo', type: 'issues', index: '1'});
-  expect(parseIssueHref('https://example.com/sub/sub2/owner/repo/issues/1#hash')).toEqual({owner: 'owner', repo: 'repo', type: 'issues', index: '1'});
-  expect(parseIssueHref('')).toEqual({owner: undefined, repo: undefined, type: undefined, index: undefined});
+  expect(parseIssueHref('/owner/repo/issues/1')).toEqual({ owner: 'owner', repo: 'repo', type: 'issues', index: '1' });
+  expect(parseIssueHref('/owner/repo/pulls/1?query')).toEqual({ owner: 'owner', repo: 'repo', type: 'pulls', index: '1' });
+  expect(parseIssueHref('/owner/repo/issues/1#hash')).toEqual({ owner: 'owner', repo: 'repo', type: 'issues', index: '1' });
+  expect(parseIssueHref('/sub/owner/repo/issues/1')).toEqual({ owner: 'owner', repo: 'repo', type: 'issues', index: '1' });
+  expect(parseIssueHref('/sub/sub2/owner/repo/pulls/1')).toEqual({ owner: 'owner', repo: 'repo', type: 'pulls', index: '1' });
+  expect(parseIssueHref('/sub/sub2/owner/repo/issues/1?query')).toEqual({ owner: 'owner', repo: 'repo', type: 'issues', index: '1' });
+  expect(parseIssueHref('/sub/sub2/owner/repo/issues/1#hash')).toEqual({ owner: 'owner', repo: 'repo', type: 'issues', index: '1' });
+  expect(parseIssueHref('https://example.com/owner/repo/issues/1')).toEqual({ owner: 'owner', repo: 'repo', type: 'issues', index: '1' });
+  expect(parseIssueHref('https://example.com/owner/repo/pulls/1?query')).toEqual({ owner: 'owner', repo: 'repo', type: 'pulls', index: '1' });
+  expect(parseIssueHref('https://example.com/owner/repo/issues/1#hash')).toEqual({ owner: 'owner', repo: 'repo', type: 'issues', index: '1' });
+  expect(parseIssueHref('https://example.com/sub/owner/repo/issues/1')).toEqual({ owner: 'owner', repo: 'repo', type: 'issues', index: '1' });
+  expect(parseIssueHref('https://example.com/sub/sub2/owner/repo/pulls/1')).toEqual({ owner: 'owner', repo: 'repo', type: 'pulls', index: '1' });
+  expect(parseIssueHref('https://example.com/sub/sub2/owner/repo/issues/1?query')).toEqual({ owner: 'owner', repo: 'repo', type: 'issues', index: '1' });
+  expect(parseIssueHref('https://example.com/sub/sub2/owner/repo/issues/1#hash')).toEqual({ owner: 'owner', repo: 'repo', type: 'issues', index: '1' });
+  expect(parseIssueHref('')).toEqual({ owner: undefined, repo: undefined, type: undefined, index: undefined });
 });
 
 test('prettyNumber', () => {
@@ -110,20 +110,20 @@ test('parseUrl', () => {
   expect(parseUrl('https://localhost/path?search#hash').hash).toEqual('#hash');
 });
 
-test('formatMonth', () => {
+test('translateMonth', () => {
   document.documentElement.lang = 'en-US';
-  expect(formatMonth(0)).toEqual('Jan');
-  expect(formatMonth(4)).toEqual('May');
+  expect(translateMonth(0)).toEqual('Jan');
+  expect(translateMonth(4)).toEqual('May');
   document.documentElement.lang = 'es-ES';
-  expect(formatMonth(5)).toEqual('jun');
-  expect(formatMonth(6)).toEqual('jul');
+  expect(translateMonth(5)).toEqual('jun');
+  expect(translateMonth(6)).toEqual('jul');
 });
 
-test('formatDay', () => {
+test('translateDay', () => {
   document.documentElement.lang = 'fr-FR';
-  expect(formatDay(1)).toEqual('lun.');
-  expect(formatDay(5)).toEqual('ven.');
+  expect(translateDay(1)).toEqual('lun.');
+  expect(translateDay(5)).toEqual('ven.');
   document.documentElement.lang = 'pl-PL';
-  expect(formatDay(1)).toEqual('pon.');
-  expect(formatDay(5)).toEqual('pt.');
+  expect(translateDay(1)).toEqual('pon.');
+  expect(translateDay(5)).toEqual('pt.');
 });

From fa30c0709e7c648c4408938de90dadc4e56305bc Mon Sep 17 00:00:00 2001
From: Yarden Shoham <hrsi88@gmail.com>
Date: Tue, 25 Oct 2022 20:08:05 +0000
Subject: [PATCH 07/12] Remove overhead

---
 templates/base/head_script.tmpl           |  6 -----
 templates/user/heatmap.tmpl               | 10 ++++++-
 web_src/js/components/ActivityHeatmap.vue | 17 +++---------
 web_src/js/features/heatmap.js            | 15 +++++++++--
 web_src/js/utils.js                       | 10 +++----
 web_src/js/utils.test.js                  | 32 +++++++++++------------
 6 files changed, 47 insertions(+), 43 deletions(-)

diff --git a/templates/base/head_script.tmpl b/templates/base/head_script.tmpl
index 54a075d37b7f0..c4ac18a86ee5e 100644
--- a/templates/base/head_script.tmpl
+++ b/templates/base/head_script.tmpl
@@ -41,12 +41,6 @@ If you introduce mistakes in it, Gitea JavaScript code wouldn't run correctly.
 			copy_error: '{{.locale.Tr "copy_error"}}',
 			error_occurred: '{{.locale.Tr "error.occurred"}}',
 			network_error: '{{.locale.Tr "error.network_error"}}',
-			contributions: '{{.locale.Tr "contributions"}}',
-			no_contributions: '{{.locale.Tr "no_contributions"}}',
-			contributions_in_the_last_12_months: '{{.locale.Tr "contributions_in_the_last_12_months"}}',
-			on: '{{.locale.Tr "on"}}',
-			less: '{{.locale.Tr "less"}}',
-			more: '{{.locale.Tr "more"}}',
 		},
 	};
 	{{/* in case some pages don't render the pageData, we make sure it is an object to prevent null access */}}
diff --git a/templates/user/heatmap.tmpl b/templates/user/heatmap.tmpl
index 9d58bc8fc5e51..03c7db60633b8 100644
--- a/templates/user/heatmap.tmpl
+++ b/templates/user/heatmap.tmpl
@@ -1,5 +1,13 @@
 {{if .HeatmapData}}
-	<div id="user-heatmap" data-heatmap-data="{{Json .HeatmapData}}">
+	<div id="user-heatmap"
+		data-locale-contributions="{{.locale.Tr "contributions"}}"
+		data-locale-no_contributions="{{.locale.Tr "no_contributions"}}"
+		data-locale-contributions_in_the_last_12_months="{{.locale.Tr "contributions_in_the_last_12_months"}}"
+		data-locale-on="{{.locale.Tr "on"}}"
+		data-locale-more="{{.locale.Tr "more"}}"
+		data-locale-less="{{.locale.Tr "less"}}"
+		data-heatmap-data="{{Json .HeatmapData}}"
+	>
 		<div slot="loading">
 			<div class="ui active centered inline indeterminate text loader" id="loading-heatmap">{{.locale.Tr "user.heatmap.loading"}}</div>
 		</div>
diff --git a/web_src/js/components/ActivityHeatmap.vue b/web_src/js/components/ActivityHeatmap.vue
index 3de708a6532ba..a9902bb3d4147 100644
--- a/web_src/js/components/ActivityHeatmap.vue
+++ b/web_src/js/components/ActivityHeatmap.vue
@@ -16,9 +16,6 @@
 </template>
 <script>
 import {CalendarHeatmap} from 'vue3-calendar-heatmap';
-import {translateMonth, translateDay, getCurrentLocale} from '../utils.js';
-
-const {i18n} = window.config;
 
 export default {
   name: 'ActivityHeatmap',
@@ -28,6 +25,10 @@ export default {
       type: Array,
       default: () => [],
     },
+    locale: {
+      type: Object,
+      default: () => {},
+    }
   },
   data: () => ({
     colorRange: [
@@ -39,16 +40,6 @@ export default {
       'var(--color-primary-dark-4)',
     ],
     endDate: new Date(),
-    locale: {
-      months: new Array(12).fill().map((_, idx) => translateMonth(idx)),
-      days: new Array(7).fill().map((_, idx) => translateDay(idx)),
-      contributions: i18n.contributions.toLocaleLowerCase(getCurrentLocale()),
-      no_contributions: i18n.no_contributions,
-      contributions_in_the_last_12_months: i18n.contributions_in_the_last_12_months.toLocaleLowerCase(getCurrentLocale()),
-      on: i18n.on.toLocaleLowerCase(getCurrentLocale()),
-      less: i18n.less,
-      more: i18n.more,
-    },
   }),
   computed: {
     sum() {
diff --git a/web_src/js/features/heatmap.js b/web_src/js/features/heatmap.js
index 6e6202e86607e..a50223f01cc8c 100644
--- a/web_src/js/features/heatmap.js
+++ b/web_src/js/features/heatmap.js
@@ -1,6 +1,6 @@
 import {createApp} from 'vue';
 import ActivityHeatmap from '../components/ActivityHeatmap.vue';
-
+import {translateMonth, translateDay, getCurrentLocale} from '../utils.js';
 export default function initHeatmap() {
   const el = document.getElementById('user-heatmap');
   if (!el) return;
@@ -17,7 +17,18 @@ export default function initHeatmap() {
       return {date: new Date(v), count: heatmap[v]};
     });
 
-    const View = createApp(ActivityHeatmap, {values});
+    const locale = {
+      months: new Array(12).fill().map((_, idx) => translateMonth(idx)),
+      days: new Array(7).fill().map((_, idx) => translateDay(idx)),
+      contributions: el.getAttribute('data-locale-contributions').toLocaleLowerCase(getCurrentLocale()),
+      no_contributions: el.getAttribute('data-locale-no_contributions'),
+      contributions_in_the_last_12_months: el.getAttribute('data-locale-contributions_in_the_last_12_months').toLocaleLowerCase(getCurrentLocale()),
+      on: el.getAttribute('data-locale-on').toLocaleLowerCase(getCurrentLocale()),
+      less: el.getAttribute('data-locale-less'),
+      more: el.getAttribute('data-locale-more'),
+    };
+
+    const View = createApp(ActivityHeatmap, {values, locale});
 
     View.mount(el);
   } catch (err) {
diff --git a/web_src/js/utils.js b/web_src/js/utils.js
index c2d74aecd5112..34c9098ca50ec 100644
--- a/web_src/js/utils.js
+++ b/web_src/js/utils.js
@@ -56,13 +56,13 @@ export function mqBinarySearch(feature, minValue, maxValue, step, unit) {
 export function parseIssueHref(href) {
   const path = (href || '').replace(/[#?].*$/, '');
   const [_, owner, repo, type, index] = /([^/]+)\/([^/]+)\/(issues|pulls)\/([0-9]+)/.exec(path) || [];
-  return { owner, repo, type, index };
+  return {owner, repo, type, index};
 }
 
 // pretty-print a number using locale-specific separators, e.g. 1200 -> 1,200
 export function prettyNumber(num, locale = 'en-US') {
   if (typeof num !== 'number') return '';
-  const { format } = new Intl.NumberFormat(locale);
+  const {format} = new Intl.NumberFormat(locale);
   return format(num);
 }
 
@@ -73,16 +73,16 @@ export function parseUrl(str) {
 
 // return current locale chosen by user
 export function getCurrentLocale() {
-  const { lang } = document.documentElement;
+  const {lang} = document.documentElement;
   return lang;
 }
 
 // given a month (0-11), returns it in the documents language
 export function translateMonth(month) {
-  return new Date(Date.UTC(2022, month, 12)).toLocaleString(getCurrentLocale(), { month: 'short' });
+  return new Date(Date.UTC(2022, month, 12)).toLocaleString(getCurrentLocale(), {month: 'short'});
 }
 
 // given a weekday (0-6, Sunday to Saturday), returns it in the documents language
 export function translateDay(day) {
-  return new Date(Date.UTC(2022, 7, day)).toLocaleString(getCurrentLocale(), { weekday: 'short' });
+  return new Date(Date.UTC(2022, 7, day)).toLocaleString(getCurrentLocale(), {weekday: 'short'});
 }
diff --git a/web_src/js/utils.test.js b/web_src/js/utils.test.js
index 8411d90621c78..481013eee0887 100644
--- a/web_src/js/utils.test.js
+++ b/web_src/js/utils.test.js
@@ -1,4 +1,4 @@
-import { expect, test } from 'vitest';
+import {expect, test} from 'vitest';
 import {
   basename, extname, isObject, uniq, stripTags, joinPaths, parseIssueHref,
   prettyNumber, parseUrl, translateMonth, translateDay
@@ -70,21 +70,21 @@ test('stripTags', () => {
 });
 
 test('parseIssueHref', () => {
-  expect(parseIssueHref('/owner/repo/issues/1')).toEqual({ owner: 'owner', repo: 'repo', type: 'issues', index: '1' });
-  expect(parseIssueHref('/owner/repo/pulls/1?query')).toEqual({ owner: 'owner', repo: 'repo', type: 'pulls', index: '1' });
-  expect(parseIssueHref('/owner/repo/issues/1#hash')).toEqual({ owner: 'owner', repo: 'repo', type: 'issues', index: '1' });
-  expect(parseIssueHref('/sub/owner/repo/issues/1')).toEqual({ owner: 'owner', repo: 'repo', type: 'issues', index: '1' });
-  expect(parseIssueHref('/sub/sub2/owner/repo/pulls/1')).toEqual({ owner: 'owner', repo: 'repo', type: 'pulls', index: '1' });
-  expect(parseIssueHref('/sub/sub2/owner/repo/issues/1?query')).toEqual({ owner: 'owner', repo: 'repo', type: 'issues', index: '1' });
-  expect(parseIssueHref('/sub/sub2/owner/repo/issues/1#hash')).toEqual({ owner: 'owner', repo: 'repo', type: 'issues', index: '1' });
-  expect(parseIssueHref('https://example.com/owner/repo/issues/1')).toEqual({ owner: 'owner', repo: 'repo', type: 'issues', index: '1' });
-  expect(parseIssueHref('https://example.com/owner/repo/pulls/1?query')).toEqual({ owner: 'owner', repo: 'repo', type: 'pulls', index: '1' });
-  expect(parseIssueHref('https://example.com/owner/repo/issues/1#hash')).toEqual({ owner: 'owner', repo: 'repo', type: 'issues', index: '1' });
-  expect(parseIssueHref('https://example.com/sub/owner/repo/issues/1')).toEqual({ owner: 'owner', repo: 'repo', type: 'issues', index: '1' });
-  expect(parseIssueHref('https://example.com/sub/sub2/owner/repo/pulls/1')).toEqual({ owner: 'owner', repo: 'repo', type: 'pulls', index: '1' });
-  expect(parseIssueHref('https://example.com/sub/sub2/owner/repo/issues/1?query')).toEqual({ owner: 'owner', repo: 'repo', type: 'issues', index: '1' });
-  expect(parseIssueHref('https://example.com/sub/sub2/owner/repo/issues/1#hash')).toEqual({ owner: 'owner', repo: 'repo', type: 'issues', index: '1' });
-  expect(parseIssueHref('')).toEqual({ owner: undefined, repo: undefined, type: undefined, index: undefined });
+  expect(parseIssueHref('/owner/repo/issues/1')).toEqual({owner: 'owner', repo: 'repo', type: 'issues', index: '1'});
+  expect(parseIssueHref('/owner/repo/pulls/1?query')).toEqual({owner: 'owner', repo: 'repo', type: 'pulls', index: '1'});
+  expect(parseIssueHref('/owner/repo/issues/1#hash')).toEqual({owner: 'owner', repo: 'repo', type: 'issues', index: '1'});
+  expect(parseIssueHref('/sub/owner/repo/issues/1')).toEqual({owner: 'owner', repo: 'repo', type: 'issues', index: '1'});
+  expect(parseIssueHref('/sub/sub2/owner/repo/pulls/1')).toEqual({owner: 'owner', repo: 'repo', type: 'pulls', index: '1'});
+  expect(parseIssueHref('/sub/sub2/owner/repo/issues/1?query')).toEqual({owner: 'owner', repo: 'repo', type: 'issues', index: '1'});
+  expect(parseIssueHref('/sub/sub2/owner/repo/issues/1#hash')).toEqual({owner: 'owner', repo: 'repo', type: 'issues', index: '1'});
+  expect(parseIssueHref('https://example.com/owner/repo/issues/1')).toEqual({owner: 'owner', repo: 'repo', type: 'issues', index: '1'});
+  expect(parseIssueHref('https://example.com/owner/repo/pulls/1?query')).toEqual({owner: 'owner', repo: 'repo', type: 'pulls', index: '1'});
+  expect(parseIssueHref('https://example.com/owner/repo/issues/1#hash')).toEqual({owner: 'owner', repo: 'repo', type: 'issues', index: '1'});
+  expect(parseIssueHref('https://example.com/sub/owner/repo/issues/1')).toEqual({owner: 'owner', repo: 'repo', type: 'issues', index: '1'});
+  expect(parseIssueHref('https://example.com/sub/sub2/owner/repo/pulls/1')).toEqual({owner: 'owner', repo: 'repo', type: 'pulls', index: '1'});
+  expect(parseIssueHref('https://example.com/sub/sub2/owner/repo/issues/1?query')).toEqual({owner: 'owner', repo: 'repo', type: 'issues', index: '1'});
+  expect(parseIssueHref('https://example.com/sub/sub2/owner/repo/issues/1#hash')).toEqual({owner: 'owner', repo: 'repo', type: 'issues', index: '1'});
+  expect(parseIssueHref('')).toEqual({owner: undefined, repo: undefined, type: undefined, index: undefined});
 });
 
 test('prettyNumber', () => {

From d2d50813fbe19c34b2d50998c18824f2892b0341 Mon Sep 17 00:00:00 2001
From: Yarden Shoham <hrsi88@gmail.com>
Date: Tue, 25 Oct 2022 23:53:30 +0300
Subject: [PATCH 08/12] Update web_src/js/utils.js

Co-authored-by: Gusted <williamzijl7@hotmail.com>
---
 web_src/js/utils.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/web_src/js/utils.js b/web_src/js/utils.js
index 34c9098ca50ec..899c6a39a5492 100644
--- a/web_src/js/utils.js
+++ b/web_src/js/utils.js
@@ -73,8 +73,7 @@ export function parseUrl(str) {
 
 // return current locale chosen by user
 export function getCurrentLocale() {
-  const {lang} = document.documentElement;
-  return lang;
+  return document.documentElement.lang;
 }
 
 // given a month (0-11), returns it in the documents language

From afaa7311b8d317e1df9f30f0b6643ab13cf4a2dc Mon Sep 17 00:00:00 2001
From: Yarden Shoham <hrsi88@gmail.com>
Date: Wed, 26 Oct 2022 17:49:09 +0300
Subject: [PATCH 09/12] Update web_src/js/utils.test.js

Co-authored-by: silverwind <me@silverwind.io>
---
 web_src/js/utils.test.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/web_src/js/utils.test.js b/web_src/js/utils.test.js
index 481013eee0887..0567a5c64af93 100644
--- a/web_src/js/utils.test.js
+++ b/web_src/js/utils.test.js
@@ -111,19 +111,23 @@ test('parseUrl', () => {
 });
 
 test('translateMonth', () => {
+  const originalLang = document.documentElement.lang;
   document.documentElement.lang = 'en-US';
   expect(translateMonth(0)).toEqual('Jan');
   expect(translateMonth(4)).toEqual('May');
   document.documentElement.lang = 'es-ES';
   expect(translateMonth(5)).toEqual('jun');
   expect(translateMonth(6)).toEqual('jul');
+  document.documentElement.lang = originalLang;
 });
 
 test('translateDay', () => {
+  const originalLang = document.documentElement.lang;
   document.documentElement.lang = 'fr-FR';
   expect(translateDay(1)).toEqual('lun.');
   expect(translateDay(5)).toEqual('ven.');
   document.documentElement.lang = 'pl-PL';
   expect(translateDay(1)).toEqual('pon.');
   expect(translateDay(5)).toEqual('pt.');
+  document.documentElement.lang = originalLang;
 });

From d44a4229c78c46a9df17b111544156915fcc23d2 Mon Sep 17 00:00:00 2001
From: Yarden Shoham <hrsi88@gmail.com>
Date: Wed, 26 Oct 2022 14:54:57 +0000
Subject: [PATCH 10/12] Revert locale attempt

---
 options/locale/locale_en-US.ini           |  6 ------
 templates/user/heatmap.tmpl               | 10 +---------
 web_src/js/components/ActivityHeatmap.vue |  2 +-
 web_src/js/features/heatmap.js            | 10 +++-------
 4 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 8b8ca52552b02..1566dfc97d422 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -23,12 +23,6 @@ enable_javascript = This website works better with JavaScript.
 toc = Table of Contents
 licenses = Licenses
 return_to_gitea = Return to Gitea
-contributions = Contributions
-no_contributions = No contributions
-contributions_in_the_last_12_months = Contributions in the last 12 months
-on = On
-less = Less
-more = More
 
 username = Username
 email = Email Address
diff --git a/templates/user/heatmap.tmpl b/templates/user/heatmap.tmpl
index 03c7db60633b8..9d58bc8fc5e51 100644
--- a/templates/user/heatmap.tmpl
+++ b/templates/user/heatmap.tmpl
@@ -1,13 +1,5 @@
 {{if .HeatmapData}}
-	<div id="user-heatmap"
-		data-locale-contributions="{{.locale.Tr "contributions"}}"
-		data-locale-no_contributions="{{.locale.Tr "no_contributions"}}"
-		data-locale-contributions_in_the_last_12_months="{{.locale.Tr "contributions_in_the_last_12_months"}}"
-		data-locale-on="{{.locale.Tr "on"}}"
-		data-locale-more="{{.locale.Tr "more"}}"
-		data-locale-less="{{.locale.Tr "less"}}"
-		data-heatmap-data="{{Json .HeatmapData}}"
-	>
+	<div id="user-heatmap" data-heatmap-data="{{Json .HeatmapData}}">
 		<div slot="loading">
 			<div class="ui active centered inline indeterminate text loader" id="loading-heatmap">{{.locale.Tr "user.heatmap.loading"}}</div>
 		</div>
diff --git a/web_src/js/components/ActivityHeatmap.vue b/web_src/js/components/ActivityHeatmap.vue
index a9902bb3d4147..df7e0beb000c0 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 }} {{ locale.contributions_in_the_last_12_months }}
+      {{ sum }} contributions in the last 12 months
     </div>
     <calendar-heatmap
       :locale="locale"
diff --git a/web_src/js/features/heatmap.js b/web_src/js/features/heatmap.js
index a50223f01cc8c..368ddd0d77f10 100644
--- a/web_src/js/features/heatmap.js
+++ b/web_src/js/features/heatmap.js
@@ -1,6 +1,6 @@
 import {createApp} from 'vue';
 import ActivityHeatmap from '../components/ActivityHeatmap.vue';
-import {translateMonth, translateDay, getCurrentLocale} from '../utils.js';
+import {translateMonth, translateDay} from '../utils.js';
 export default function initHeatmap() {
   const el = document.getElementById('user-heatmap');
   if (!el) return;
@@ -20,12 +20,8 @@ export default function initHeatmap() {
     const locale = {
       months: new Array(12).fill().map((_, idx) => translateMonth(idx)),
       days: new Array(7).fill().map((_, idx) => translateDay(idx)),
-      contributions: el.getAttribute('data-locale-contributions').toLocaleLowerCase(getCurrentLocale()),
-      no_contributions: el.getAttribute('data-locale-no_contributions'),
-      contributions_in_the_last_12_months: el.getAttribute('data-locale-contributions_in_the_last_12_months').toLocaleLowerCase(getCurrentLocale()),
-      on: el.getAttribute('data-locale-on').toLocaleLowerCase(getCurrentLocale()),
-      less: el.getAttribute('data-locale-less'),
-      more: el.getAttribute('data-locale-more'),
+      contributions: 'contributions',
+      no_contributions: 'No contributions',
     };
 
     const View = createApp(ActivityHeatmap, {values, locale});

From 55b2f28ed96c54d2ae35ef9680032235d941d80b Mon Sep 17 00:00:00 2001
From: Yarden Shoham <hrsi88@gmail.com>
Date: Wed, 26 Oct 2022 16:32:55 +0000
Subject: [PATCH 11/12] Lint

---
 web_src/js/utils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web_src/js/utils.js b/web_src/js/utils.js
index 899c6a39a5492..9b8bf925a9ee6 100644
--- a/web_src/js/utils.js
+++ b/web_src/js/utils.js
@@ -72,7 +72,7 @@ export function parseUrl(str) {
 }
 
 // return current locale chosen by user
-export function getCurrentLocale() {
+function getCurrentLocale() {
   return document.documentElement.lang;
 }
 

From caaee20bf348b192c4e521f7bce94e633bf546be Mon Sep 17 00:00:00 2001
From: Yarden Shoham <hrsi88@gmail.com>
Date: Thu, 27 Oct 2022 21:21:26 +0000
Subject: [PATCH 12/12] Trigger build