Merge branch 'master' into name-id-switch

hackclub · Sep 26, 2024 · ced457d · ced457d
2 parents a2c013c + db89aee
commit ced457d
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 19 deletions.
diff --git a/views/mail/import_finished.tpl.html b/views/mail/import_finished.tpl.html
@@ -1,4 +1,4 @@
-<!doctype html>
+<!DOCTYPE html>
 <html lang="en">
     {{ template "head.tpl.html" . }}
 
@@ -127,13 +127,14 @@
                                                 >
                                                     You have requested to import
                                                     data from WakaTime to
-                                                    Wakapi. The import has now
-                                                    finished after {{ .Duration
-                                                    }} ({{ .NumHeartbeats }} new
+                                                    Hackatime. The import has
+                                                    now finished after {{
+                                                    .Duration }} ({{
+                                                    .NumHeartbeats }} new
                                                     heartbeats imported).<br /><br />You
                                                     should be able to see the
                                                     newly imported coding
-                                                    statistics in Wakapi.
+                                                    statistics in Hackatime.
                                                 </p>
                                                 <table
                                                     border="0"

diff --git a/views/mail/report.tpl.html b/views/mail/report.tpl.html
@@ -1,4 +1,4 @@
-<!doctype html>
+<!DOCTYPE html>
 <html lang="en">
     {{ template "head.tpl.html" . }}
 
@@ -522,9 +522,11 @@
                                                     If you do not want to
                                                     receive e-mail reports
                                                     anymore, please log in to
-                                                    Wakapi.dev and go to
-                                                    <i>Settings</i> to disable
-                                                    them.
+                                                    <a
+                                                        href="https://waka.hackclub.com"
+                                                        >Hackatime</a
+                                                    >
+                                                    to disable them.
                                                 </p>
                                             </td>
                                         </tr>

diff --git a/views/mail/wakatime_connection_failure.tpl.html b/views/mail/wakatime_connection_failure.tpl.html
@@ -1,4 +1,4 @@
-<!doctype html>
+<!DOCTYPE html>
 <html lang="en">
     {{ template "head.tpl.html" . }}
 
@@ -125,15 +125,16 @@
                                                         margin-bottom: 15px;
                                                     "
                                                 >
-                                                    You have configured Wakapi
-                                                    to relay your heartbeats to
-                                                    WakaTime's API. However,
-                                                    requests for the last {{
-                                                    .NumFailures }} heartbeats
-                                                    have failed. This is most
-                                                    likely an authentication
-                                                    issue. WakaTime connection
-                                                    is paused for now. To resume
+                                                    You have configured
+                                                    Hackatime to relay your
+                                                    heartbeats to WakaTime's
+                                                    API. However, requests for
+                                                    the last {{ .NumFailures }}
+                                                    heartbeats have failed. This
+                                                    is most likely an
+                                                    authentication issue.
+                                                    WakaTime connection is
+                                                    paused for now. To resume
                                                     it, please re-enter your
                                                     WakaTime API token under
                                                     <a