Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Localizations for texts in Notifications #4690

Merged
merged 2 commits into from
Feb 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions src/Components/Notifications/NoticeBoard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,13 @@ import PageTitle from "../Common/PageTitle";
import { Card, CardContent } from "@material-ui/core";
import Loading from "../Common/Loading";
import { formatDate } from "../../Utils/utils";
import { useTranslation } from "react-i18next";

export const NoticeBoard: any = () => {
const dispatch: any = useDispatch();
const [isLoading, setIsLoading] = useState(true);
const [data, setData] = useState<any[]>([]);
const { t } = useTranslation();

useEffect(() => {
setIsLoading(true);
Expand Down Expand Up @@ -43,7 +45,7 @@ export const NoticeBoard: any = () => {
</span>
</div>
<div className="text-xs text-gray-900">
On: {formatDate(item.created_date)}
{t("on")}: {formatDate(item.created_date)}
</div>
</div>
</CardContent>
Expand All @@ -56,7 +58,7 @@ export const NoticeBoard: any = () => {
<Card key="no-notice" className="my-4 rounded-lg">
<CardContent>
<div className="text-xl text-center semibold">
No notices for you.
{t("no_notices_for_you")}
</div>
</CardContent>
</Card>
Expand All @@ -66,7 +68,11 @@ export const NoticeBoard: any = () => {
if (isLoading) return <Loading />;
return (
<div className="px-6">
<PageTitle title="Notice Board" hideBack={true} breadcrumbs={false} />
<PageTitle
title={t("Notice Board")}
hideBack={true}
breadcrumbs={false}
/>
<div>{notices}</div>
</div>
);
Expand Down
31 changes: 17 additions & 14 deletions src/Components/Notifications/NotificationsList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import {
import SlideOver from "../../CAREUI/interactive/SlideOver";
import ButtonV2 from "../Common/components/ButtonV2";
import SelectMenuV2 from "../Form/SelectMenuV2";
import { useTranslation } from "react-i18next";

const RESULT_LIMIT = 14;

Expand All @@ -41,6 +42,7 @@ const NotificationTile = ({
const dispatch: any = useDispatch();
const [result, setResult] = useState(notification);
const [isMarkingAsRead, setIsMarkingAsRead] = useState(false);
const { t } = useTranslation();

const handleMarkAsRead = async () => {
setIsMarkingAsRead(true);
Expand Down Expand Up @@ -124,15 +126,15 @@ const NotificationTile = ({
: "care-l-envelope-check"
}
/>
<span className="text-xs">Mark as Read</span>
<span className="text-xs">{t("mark_as_read")}</span>
</ButtonV2>
<ButtonV2
border
ghost
className="font-semibold px-2 py-1 bg-white hover:bg-secondary-300 flex-shrink-0"
>
<CareIcon className="care-l-envelope-open" />
<span className="text-xs">Open</span>
<span className="text-xs">{t("open")}</span>
</ButtonV2>
</div>
</div>
Expand Down Expand Up @@ -164,6 +166,7 @@ export default function NotificationsList({
const [isMarkingAllAsRead, setIsMarkingAllAsRead] = useState(false);
const [isSubscribed, setIsSubscribed] = useState("");
const [isSubscribing, setIsSubscribing] = useState(false);
const { t } = useTranslation();

useEffect(() => {
function handleKeyDown(event: KeyboardEvent) {
Expand Down Expand Up @@ -208,21 +211,21 @@ export default function NotificationsList({
return (
<>
<CareIcon className="care-l-bell" />
<span className="text-xs">Subscribe</span>
<span className="text-xs">{t("subscribe")}</span>
</>
);
} else if (status === "SubscribedOnAnotherDevice") {
return (
<>
<CareIcon className="care-l-bell" />
<span className="text-xs">Subscribe on this device</span>
<span className="text-xs">{t("subscribe_on_this_device")}</span>
</>
);
} else {
return (
<>
<CareIcon className="care-l-bell-slash" />
<span className="text-xs">Unsubscribe</span>
<span className="text-xs">{t("unsubscribe")}</span>
</>
);
}
Expand Down Expand Up @@ -254,12 +257,12 @@ export default function NotificationsList({
})
.catch(function (_e) {
Error({
msg: "Unsubscribe failed.",
msg: t("unsubscribe_failed"),
});
});
})
.catch(function (_e) {
Error({ msg: "Subscription Error" });
Error({ msg: t("subscription_error") });
});
})
.catch(function (_e) {
Expand Down Expand Up @@ -376,7 +379,7 @@ export default function NotificationsList({
border
onClick={() => setOffset((prev) => prev + RESULT_LIMIT)}
>
{isLoading ? "Loading..." : "Load More"}
{isLoading ? t("loading") : t("load_more")}
</ButtonV2>
</div>
)}
Expand All @@ -385,7 +388,7 @@ export default function NotificationsList({
} else if (data && data.length === 0) {
manageResults = (
<div className="px-4 pt-3 lg:px-8">
<h5> No Results Found </h5>
<h5> {t("no_results_found")} </h5>
</div>
);
}
Expand All @@ -395,7 +398,7 @@ export default function NotificationsList({
return (
<>
<Item
text="Notifications"
text={t("Notifications")}
do={() => setOpen(!open)}
icon={<CareIcon className="care-l-bell h-5" />}
badgeCount={unreadCount}
Expand All @@ -404,7 +407,7 @@ export default function NotificationsList({
open={open}
setOpen={setOpen}
slideFrom="right"
title="Notifications"
title={t("Notifications")}
dialogClass="md:w-[400px]"
onCloseClick={onClickCB}
>
Expand All @@ -421,7 +424,7 @@ export default function NotificationsList({
}}
>
<CareIcon className="care-l-sync" />
<span className="text-xs">Reload</span>
<span className="text-xs">{t("reload")}</span>
</ButtonV2>
<ButtonV2
onClick={handleSubscribeClick}
Expand All @@ -445,13 +448,13 @@ export default function NotificationsList({
: "care-l-envelope-check"
}
/>
<span className="text-xs">Mark all as Read</span>
<span className="text-xs">{t("mark_all_as_read")}</span>
</ButtonV2>
</div>

<SelectMenuV2
className="mb-2"
placeholder="Filter by category"
placeholder={t("filter_by_category")}
options={NOTIFICATION_EVENTS}
value={eventFilter}
optionLabel={(o) => o.text}
Expand Down
4 changes: 3 additions & 1 deletion src/Locale/en/Common.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,7 @@
"Apply": "Apply",
"Clear Filters": "Clear Filters",
"powered_by": "Powered By",
"care": "CARE"
"care": "CARE",
"on": "On",
"open": "Open"
}
17 changes: 17 additions & 0 deletions src/Locale/en/Notifications.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"no_notices_for_you": "No notices for you.",
"mark_as_read": "Mark as Read",
"subscribe": "Subscribe",
"subscribe_on_this_device": "Subscribe on this device",
"filter_by_category": "Filter by category",
"mark_all_as_read": "Mark all as Read",
"reload": "Reload",
"Notifications": "Notifications",
"no_results_found": "No Results Found",
"load_more": "Load More",
"subscription_error": "Subscription Error",
"unsubscribe_failed": "Unsubscribe failed.",
"unsubscribe": "Unsubscribe",
"escape": "Escape",
"loading": "Loading..."
}
2 changes: 2 additions & 0 deletions src/Locale/en/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@ import Auth from "./Auth.json";
import Common from "./Common.json";
import Entities from "./Entities.json";
import Facility from "./Facility.json";
import Notifications from "./Notifications.json";

export default {
...Auth,
...Common,
...Entities,
...Facility,
...Notifications,
};