Skip to content

Commit

Permalink
Merge branch 'rm/350552' into 'master'
Browse files Browse the repository at this point in the history
adding correct translations when we want to transfer a thread

See merge request kchat/webapp!902
  • Loading branch information
antonbuks committed Aug 28, 2024
2 parents c696641 + dc80af1 commit e5e2fee
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
MessageTextOutlineIcon,
} from '@infomaniak/compass-icons/components';
import React, {useEffect, useRef} from 'react';
import {useIntl} from 'react-intl';
import {FormattedMessage, useIntl} from 'react-intl';
import {useSelector} from 'react-redux';
import {components} from 'react-select';
import type {IndicatorProps, OptionProps, SingleValueProps, ValueType, OptionTypeBase} from 'react-select';
Expand Down Expand Up @@ -291,7 +291,12 @@ function ForwardPostChannelSelect({onSelect, value, currentBodyHeight, validChan
provider.handlePretextChanged(inputValue, handleResults);
});
};

const message = (
<FormattedMessage
defaultMessage='iPhone Native Classic App'
id='forward_post_modal.selection'
/>
);
return (
<AsyncSelect
value={value}
Expand All @@ -301,7 +306,7 @@ function ForwardPostChannelSelect({onSelect, value, currentBodyHeight, validChan
components={{DropdownIndicator, Option, SingleValue}}
styles={baseStyles}
legend='Forward to'
placeholder='Select channel or people'
placeholder={message}
className='forward-post__select'
data-testid='forward-post-select'
/>
Expand Down
1 change: 1 addition & 0 deletions webapp/channels/src/i18n/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -3637,6 +3637,7 @@
"forward_post_modal.preview.footer_message": "Ursprünglich gepostet in ~{channel}",
"forward_post_modal.preview.title": "Nachrichten Vorschau",
"forward_post_modal.title": "Nachricht weiterleiten",
"forward_post_modal.selection": "Einen Kanal oder Personen auswählen",
"free.banner.downgraded": "Dein Arbeitsbereich hat jetzt Einschränkungen und einige Daten wurden archiviert",
"free.professional_feature.back": "Zurück",
"free.professional_feature.professional": "Professional Funktion",
Expand Down
1 change: 1 addition & 0 deletions webapp/channels/src/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -3726,6 +3726,7 @@
"forward_post_modal.preview.footer_message": "Originally posted in ~{channel}",
"forward_post_modal.preview.title": "Message preview",
"forward_post_modal.title": "Forward message",
"forward_post_modal.selection": "Selecting a channel or people",
"free.banner.downgraded": "Your workspace now has restrictions and some data has been archived",
"free.professional_feature.back": "Back",
"free.professional_feature.professional": "Professional feature",
Expand Down
1 change: 1 addition & 0 deletions webapp/channels/src/i18n/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -3270,6 +3270,7 @@
"forward_post_modal.notification.dm_or_gm": "Este mensaje es de una conversación privada y solo se puede compartir con {participants}",
"forward_post_modal.notification.private_channel": "Este mensaje es de un canal privado y solo se puede compartir con <strong>{channelName}</strong>",
"forward_post_modal.preview.footer_message": "Publicado originalmente en ~{channel}",
"forward_post_modal.selection": "Seleccionar un canal o personas",
"free.professional_feature.back": "Atrás",
"free.professional_feature.professional": "característica Professional",
"free.professional_feature.upgrade": "Actualizar",
Expand Down
1 change: 1 addition & 0 deletions webapp/channels/src/i18n/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -3236,6 +3236,7 @@
"forward_post_modal.preview.title": "Aperçu du message",
"forward_post_modal.title": "Transférer le message",
"forward_post_button.label": "Transférer",
"forward_post_modal.selection": "Sélectionner un canal ou des personnes",
"full_screen_modal.back": "Précédent",
"full_screen_modal.close": "Fermer",
"general_button.close": "Fermer",
Expand Down
1 change: 1 addition & 0 deletions webapp/channels/src/i18n/it.json
Original file line number Diff line number Diff line change
Expand Up @@ -2449,6 +2449,7 @@
"forward_post_modal.preview.title": "Anteprima del messaggio",
"forward_post_modal.title": "Inoltra messaggio",
"forward_post_button.label": "Inoltra",
"forward_post_modal.selection": "Selezione di un canale o di persone",
"full_screen_modal.back": "Indietro",
"full_screen_modal.close": "Chiudi",
"general_button.close": "Chiudi",
Expand Down

0 comments on commit e5e2fee

Please sign in to comment.