Skip to content

Chore: also send thread to channel translations #27242

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.

Sign up for GitHub

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

Merged
kodiakhq merged 5 commits into from
Nov 17, 2022
Merged

Chore: also send thread to channel translations #27242

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ed3c40e
update translations
yash-rajpal Nov 11, 2022
fd9fb93
fix lint and remove comment
yash-rajpal Nov 11, 2022
ad01bce
update few translations
yash-rajpal Nov 14, 2022
ae11bd6
Merge branch 'develop' into chore/alsoSendThreadToChannel-translations
yash-rajpal Nov 16, 2022
f5c5154
Merge branch 'develop' into chore/alsoSendThreadToChannel-translations
yash-rajpal Nov 17, 2022
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
6 changes: 3 additions & 3 deletions apps/meteor/app/lib/server/startup/settings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,15 +431,15 @@ settingsRegistry.addGroup('Accounts', function () {
values: [
{
key: 'default',
i18nLabel: 'Default',
i18nLabel: 'Selected_first_reply_unselected_following_replies',
},
{
key: 'always',
i18nLabel: 'Always',
i18nLabel: 'Selected_by_default',
},
{
key: 'never',
i18nLabel: 'Never',
i18nLabel: 'Unselected_by_default',
},
],
public: true,
Expand Down
8 changes: 4 additions & 4 deletions apps/meteor/client/views/account/preferences/PreferencesMessagesSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Accordion, Field, Select, FieldGroup, ToggleSwitch, SelectOption } from '@rocket.chat/fuselage';
import { useUserPreference, useSetting, useTranslation, TranslationKey } from '@rocket.chat/ui-contexts';
import { useUserPreference, useSetting, useTranslation } from '@rocket.chat/ui-contexts';
import React, { ReactElement, useMemo } from 'react';

import { useForm } from '../../../hooks/useForm';
Expand Down Expand Up @@ -82,9 +82,9 @@ const PreferencesMessagesSection = ({ onChange, commitRef, ...props }: FormSecti

const alsoSendThreadMessageToChannelOptions = useMemo(
(): SelectOption[] => [
['default', t('Default')],
['always', t('Always' as TranslationKey)], // TO DO: add "Always" to en.json ui-contexts
['never', t('Never')],
['default', t('Selected_first_reply_unselected_following_replies')],
['always', t('Selected_by_default')],
['never', t('Unselected_by_default')],
],
[t],
);
Expand Down
3 changes: 3 additions & 0 deletions apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1532,6 +1532,7 @@
"Desktop_Notifications_Duration_Description": "Seconds to display desktop notification. This may affect OS X Notification Center. Enter 0 to use default browser settings and not affect OS X Notification Center.",
"Desktop_Notifications_Enabled": "Desktop Notifications are Enabled",
"Desktop_Notifications_Not_Enabled": "Desktop Notifications are Not Enabled",
"Unselected_by_default": "Unselected by default",
"Details": "Details",
"Device_Changes_Not_Available": "Device changes not available in this browser. For guaranteed availability, please use Rocket.Chat's official desktop app.",
"Device_Changes_Not_Available_Insecure_Context": "Device changes are only available on secure contexts (e.g. https://)",
Expand Down Expand Up @@ -4250,7 +4251,9 @@
"Select_user": "Select user",
"Select_users": "Select users",
"Selected_agents": "Selected agents",
"Selected_by_default": "Selected by default",
"Selected_departments": "Selected Departments",
"Selected_first_reply_unselected_following_replies": "Selected for first reply, unselected for following replies",
"Selected_monitors": "Selected Monitors",
"Selecting_users": "Selecting users",
"Send": "Send",
Expand Down