Skip to content

Commit

Permalink
regression: add missing translations on MenuV2 replace (#29777)
Browse files Browse the repository at this point in the history
  • Loading branch information
juliajforesti authored and ggazzo committed Jul 11, 2023
1 parent 9b2679d commit 14c7e3c
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 10 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
import { useAtLeastOnePermission, usePermission } from '@rocket.chat/ui-contexts';
import { useAtLeastOnePermission, usePermission, useTranslation } from '@rocket.chat/ui-contexts';

import { AccountBox } from '../../../../../app/ui-utils/client';
import type { IAppAccountBoxItem, AccountBoxItem } from '../../../../../app/ui-utils/client/lib/AccountBox';
Expand Down Expand Up @@ -39,6 +39,7 @@ const ADMIN_PERMISSIONS = [
];

export const useAdministrationMenu = () => {
const t = useTranslation();
const getAccountBoxItems = useMutableCallback(() => AccountBox.getItems());
const accountBoxItems = useReactiveValue(getAccountBoxItems);

Expand Down Expand Up @@ -66,9 +67,9 @@ export const useAdministrationMenu = () => {
const auditItems = useAuditItems({ showAudit: hasAuditPermission, showAuditLog: hasAuditLogPermission });

const sections = [
{ title: 'Administration', items: administrationItems, permission: showAdmin },
{ title: 'Apps', items: appItems, permission: showApps },
{ title: 'Audit', items: auditItems, permission: showAudit },
{ title: t('Administration'), items: administrationItems, permission: showAdmin },
{ title: t('Apps'), items: appItems, permission: showApps },
{ title: t('Audit'), items: auditItems, permission: showAudit },
];

return sections.filter(({ permission }) => permission);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useAtLeastOnePermission, useSetting } from '@rocket.chat/ui-contexts';
import { useAtLeastOnePermission, useSetting, useTranslation } from '@rocket.chat/ui-contexts';

import { useIsEnterprise } from '../../../../hooks/useIsEnterprise';
import { useCreateRoomItems } from './useCreateRoomItems';
Expand All @@ -7,6 +7,7 @@ import { useMatrixFederationItems } from './useMatrixFederationItems.tsx';
const CREATE_ROOM_PERMISSIONS = ['create-c', 'create-p', 'create-d', 'start-discussion', 'start-discussion-other-user'];

export const useCreateRoom = () => {
const t = useTranslation();
const showCreate = useAtLeastOnePermission(CREATE_ROOM_PERMISSIONS);

const { data } = useIsEnterprise();
Expand All @@ -16,8 +17,8 @@ export const useCreateRoom = () => {
const matrixFederationSearchItems = useMatrixFederationItems({ isMatrixEnabled });

const sections = [
{ title: 'Create_new', items: createRoomItems, permission: showCreate },
{ title: 'Explore', items: matrixFederationSearchItems, permission: showCreate && isMatrixEnabled },
{ title: t('Create_new'), items: createRoomItems, permission: showCreate },
{ title: t('Explore'), items: matrixFederationSearchItems, permission: showCreate && isMatrixEnabled },
];

return sections.filter((section) => section.permission);
Expand Down
10 changes: 7 additions & 3 deletions apps/meteor/client/sidebar/header/actions/hooks/useSortMenu.tsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,20 @@
import { useTranslation } from '@rocket.chat/ui-contexts';

import { useGroupingListItems } from './useGroupingListItems';
import { useSortModeItems } from './useSortModeItems';
import { useViewModeItems } from './useViewModeItems';

export const useSortMenu = () => {
const t = useTranslation();

const viewModeItems = useViewModeItems();
const sortModeItems = useSortModeItems();
const groupingListItems = useGroupingListItems();

const sections = [
{ title: 'Display', items: viewModeItems },
{ title: 'Sort_By', items: sortModeItems },
{ title: 'Group_by', items: groupingListItems },
{ title: t('Display'), items: viewModeItems },
{ title: t('Sort_By'), items: sortModeItems },
{ title: t('Group_by'), items: groupingListItems },
];

return sections;
Expand Down

0 comments on commit 14c7e3c

Please sign in to comment.