fix: Fixed translation

Author: CrawlerCode

README.md

@@ -25,8 +25,8 @@
 - Update done ratio
 - Round timer to nearest 15 min
 - Search for issue (press `CTRL` + `K` or `CTRL` + `F`)
-- Remember and forgot issue (not assigned to you)
-- Favorite and unfavorite issue
+- Remember and forget issue (not assigned to you)
+- Pin and unpin issue
 - View time entries overview
 - Dark & light mode (system default)
 

src/components/issues/CreateTimeEntryModal.tsx

@@ -55,7 +55,7 @@ const CreateTimeEntryModal = ({ issue, time, onClose, onSuccess }: PropTypes) =>
 
   return (
     <>
-      <Modal title="Add time spent" onClose={onClose}>
+      <Modal title="Add spent time" onClose={onClose}>
         <Formik
           innerRef={formik}
           initialValues={{

src/components/issues/Issue.tsx

@@ -14,21 +14,21 @@ import IssueTimer, { IssueTimerData, TimerActions, TimerRef } from "./IssueTimer
 
 export type IssueActions = {
   onRemember: () => void;
-  onForgot: () => void;
-  onFavorite: () => void;
-  onUnfavorite: () => void;
+  onForget: () => void;
+  onPin: () => void;
+  onUnpin: () => void;
 };
 
 type PropTypes = {
   issue: TIssue;
   timerData: IssueTimerData;
   assignedToMe: boolean;
-  favorite: boolean;
-  remember: boolean;
+  pinned: boolean;
+  remembered: boolean;
 } & Omit<TimerActions, "onDoneTimer"> &
   IssueActions;
 
-const Issue = ({ issue, timerData, assignedToMe, favorite, remember, onStart, onPause, onStop, onOverrideTime, onRemember, onForgot, onFavorite, onUnfavorite }: PropTypes) => {
+const Issue = ({ issue, timerData, assignedToMe, pinned, remembered, onStart, onPause, onStop, onOverrideTime, onRemember, onForget, onPin, onUnpin }: PropTypes) => {
   const { settings } = useSettings();
 
   const timerRef = useRef<TimerRef>(null);
@@ -76,30 +76,30 @@ const Issue = ({ issue, timerData, assignedToMe, favorite, remember, onStart, on
           ],
           [
             {
-              name: "Favorite issue",
+              name: "Pin issue",
               icon: <FontAwesomeIcon icon={faStar} />,
-              disabled: favorite,
-              onClick: onFavorite,
+              disabled: pinned,
+              onClick: onPin,
             },
             {
-              name: "Unfavorite issue",
+              name: "Unpin issue",
               icon: <FontAwesomeIcon icon={faStarRegular} />,
-              disabled: !favorite,
-              onClick: onUnfavorite,
+              disabled: !pinned,
+              onClick: onUnpin,
             },
           ],
           [
             {
               name: "Remember issue",
               icon: <FontAwesomeIcon icon={faBookmark} />,
-              disabled: assignedToMe || remember,
+              disabled: assignedToMe || remembered,
               onClick: onRemember,
             },
             {
-              name: "Forgot issue",
+              name: "Forget issue",
               icon: <FontAwesomeIcon icon={faBan} />,
-              disabled: assignedToMe || !remember,
-              onClick: onForgot,
+              disabled: assignedToMe || !remembered,
+              onClick: onForget,
             },
           ],
         ]}
@@ -131,8 +131,8 @@ const Issue = ({ issue, timerData, assignedToMe, favorite, remember, onStart, on
         >
           <h1
             className={clsx("mb-1 truncate", {
-              "me-4": (favorite && assignedToMe) || (!favorite && !assignedToMe),
-              "me-9": favorite && !assignedToMe,
+              "me-4": (pinned && assignedToMe) || (!pinned && !assignedToMe),
+              "me-9": pinned && !assignedToMe,
             })}
           >
             <a href={`${settings.redmineURL}/issues/${issue.id}`} target="_blank" tabIndex={-1} className="text-blue-500 hover:underline" data-tooltip-id={`tooltip-issue-${issue.id}`}>
@@ -154,7 +154,7 @@ const Issue = ({ issue, timerData, assignedToMe, favorite, remember, onStart, on
             </div>
           </div>
           <div className="absolute top-2 right-2 flex justify-end items-start gap-x-1">
-            {favorite && <FontAwesomeIcon icon={faStar} className="text-gray-300 dark:text-gray-600 focus:outline-none" tabIndex={-1} />}
+            {pinned && <FontAwesomeIcon icon={faStar} className="text-gray-300 dark:text-gray-600 focus:outline-none" tabIndex={-1} />}
             {!assignedToMe && (
               <>
                 <Tooltip id="tooltip-not-assigned-to-me" place="left" delayShow={700} content="Issue is not assigned to you" className="italic" />

src/components/issues/IssueTimer.tsx

@@ -104,7 +104,7 @@ const IssueTimer = forwardRef(({ issue, data: { active, time, start }, onStart,
       )}
       <Tooltip id="tooltip-stop-timer" place="top" delayShow={700} content="Click to stop timer" className="italic" />
       <FontAwesomeIcon icon={faStop} size="2x" className="text-red-500 cursor-pointer focus:outline-none" onClick={onStop} data-tooltip-id="tooltip-stop-timer" tabIndex={-1} />
-      <Tooltip id={`tooltip-done-timer-${issue.id}`} place="bottom" delayShow={700} content="Click to add time spend entry" className="z-10 italic" />
+      <Tooltip id={`tooltip-done-timer-${issue.id}`} place="bottom" delayShow={700} content="Click to add spent time" className="z-10 italic" />
       <FontAwesomeIcon
         icon={faCircleCheck}
         size="2x"

src/components/issues/IssuesList.tsx

@@ -5,8 +5,12 @@ import Issue from "./Issue";
 import { IssueTimerData } from "./IssueTimer";
 
 type IssueData = IssueTimerData & {
-  favorite: boolean;
-  remember: boolean;
+  pinned: boolean;
+  remembered: boolean;
+} & {
+  // TODO: remove me later
+  favorite?: boolean;
+  remember?: boolean;
 };
 
 export type IssuesData = {
@@ -60,17 +64,29 @@ const IssuesList = ({ account, issues, issuesData: { data: issuesData, setData:
               active: false,
               start: undefined,
               time: 0,
-              favorite: false,
-              remember: false,
+              pinned: false,
+              remembered: false,
             };
+            /**
+             * support old data schema
+             * TODO: remove me later
+             */
+            if (data.favorite) {
+              data.pinned = true;
+              delete data.favorite;
+            }
+            if (data.remember) {
+              data.remembered = true;
+              delete data.remember;
+            }
             return (
               <Issue
                 key={issue.id}
                 issue={issue}
                 timerData={{ active: data.active, start: data.start, time: data.time }}
                 assignedToMe={issue.assigned_to?.id === account?.id ?? false}
-                favorite={data.favorite}
-                remember={data.remember}
+                pinned={data.pinned}
+                remembered={data.remembered}
                 onStart={() => {
                   setIssuesData({
                     ...(settings.options.autoPauseOnSwitch
@@ -144,30 +160,30 @@ const IssuesList = ({ account, issues, issuesData: { data: issuesData, setData:
                     },
                   });
                 }}
-                onForgot={() => {
+                onForget={() => {
                   setIssuesData({
                     ...issuesData,
                     [issue.id]: {
                       ...data,
-                      remember: false,
+                      remembered: false,
                     },
                   });
                 }}
-                onFavorite={() => {
+                onPin={() => {
                   setIssuesData({
                     ...issuesData,
                     [issue.id]: {
                       ...data,
-                      favorite: true,
+                      remembered: true,
                     },
                   });
                 }}
-                onUnfavorite={() => {
+                onUnpin={() => {
                   setIssuesData({
                     ...issuesData,
                     [issue.id]: {
                       ...data,
-                      favorite: false,
+                      pinned: false,
                     },
                   });
                 }}

src/pages/IssuesPage.tsx

@@ -56,11 +56,12 @@ const IssuesPage = () => {
       {searching && <InputField ref={searchRef} icon={<FontAwesomeIcon icon={faSearch} />} placeholder="Search..." className="select-none mb-3" onChange={(e) => setSearch(e.target.value)} autoFocus autoComplete="off" />}
       <div className="flex flex-col gap-y-2">
         {myIssuesQuery.isLoading && <IssuesListSkeleton />}
+
         <IssuesList
           account={myIssuesQuery.account}
           issues={myIssuesQuery.data.sort((a, b) => {
-            const favA = issuesData.data[a.id]?.favorite;
-            const favB = issuesData.data[b.id]?.favorite;
+            const favA = issuesData.data[a.id]?.pinned || issuesData.data[a.id]?.favorite;
+            const favB = issuesData.data[b.id]?.pinned || issuesData.data[b.id]?.favorite;
             if (favA && favB) return new Date(a.updated_on).getTime() - new Date(a.updated_on).getTime();
             return favA ? -1 : 1;
           })}

src/pages/SettingsPage.tsx

@@ -48,7 +48,7 @@ const SettingsPage = () => {
                 <h2 className="text-lg font-semibold">Options:</h2>
                 <Field type="checkbox" name="options.autoPauseOnSwitch" title="Auto pause" description="Automatic pause timers when changing issue" as={CheckBox} />
                 <Field type="checkbox" name="options.extendedSearch" title="Extended search" description="Allows to search issues that are not assigned to you" as={CheckBox} />
-                <Field type="checkbox" name="options.roundTimeNearestQuarterHour" title="Round nearest 15 min" description="Round timer to nearest quarter hour" as={CheckBox} />
+                <Field type="checkbox" name="options.roundTimeNearestQuarterHour" title="Round to nearest 15 min" description="Round timer to nearest quarter hour" as={CheckBox} />
                 <button
                   type="button"
                   className={clsx(

src/pages/TimePage.tsx

@@ -14,7 +14,8 @@ const TimePage = () => {
     <>
       <div className="flex flex-col gap-y-2">
         {myTimeEntriesQuery.isLoading && <IssuesListSkeleton />}
-        <TimeEntryList entries={myTimeEntriesQuery.data} />
+
+        {!myTimeEntriesQuery.isLoading && <TimeEntryList entries={myTimeEntriesQuery.data} />}
 
         {myTimeEntriesQuery.isError && <Toast type="error" message="Failed to load data" allowClose={false} />}
       </div>