Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Commit 86abf8b

Browse files
authored
Merge pull request #1996 from matrix-org/dbkr/unlabs_replies
Take replies out of labs!
2 parents 0e8b4ac + e5a509b commit 86abf8b

File tree

22 files changed

+8
-34
lines changed

22 files changed

+8
-34
lines changed

src/components/views/context_menus/MessageContextMenu.js

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -253,13 +253,11 @@ module.exports = React.createClass({
253253
</div>
254254
);
255255

256-
if (SettingsStore.isFeatureEnabled("feature_rich_quoting")) {
257-
replyButton = (
258-
<div className="mx_MessageContextMenu_field" onClick={this.onReplyClick}>
259-
{ _t('Reply') }
260-
</div>
261-
);
262-
}
256+
replyButton = (
257+
<div className="mx_MessageContextMenu_field" onClick={this.onReplyClick}>
258+
{ _t('Reply') }
259+
</div>
260+
);
263261

264262
if (this.state.canPin) {
265263
pinButton = (

src/components/views/elements/ReplyThread.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ export default class ReplyThread extends React.Component {
160160
}
161161

162162
static makeThread(parentEv, onWidgetLoad, ref) {
163-
if (!SettingsStore.isFeatureEnabled("feature_rich_quoting") || !ReplyThread.getParentEventId(parentEv)) {
163+
if (!ReplyThread.getParentEventId(parentEv)) {
164164
return <div />;
165165
}
166166
return <ReplyThread parentEv={parentEv} onWidgetLoad={onWidgetLoad} ref={ref} />;

src/components/views/messages/TextualBody.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -423,8 +423,7 @@ module.exports = React.createClass({
423423
const mxEvent = this.props.mxEvent;
424424
const content = mxEvent.getContent();
425425

426-
const stripReply = SettingsStore.isFeatureEnabled("feature_rich_quoting") &&
427-
ReplyThread.getParentEventId(mxEvent);
426+
const stripReply = ReplyThread.getParentEventId(mxEvent);
428427
let body = HtmlUtils.bodyToHtml(content, this.props.highlights, {
429428
disableBigEmoji: SettingsStore.getValue('TextualBody.disableBigEmoji'),
430429
// Part of Replies fallback support

src/components/views/rooms/MessageComposerInput.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1181,7 +1181,7 @@ export default class MessageComposerInput extends React.Component {
11811181
return (
11821182
<div className="mx_MessageComposer_input_wrapper">
11831183
<div className="mx_MessageComposer_autocomplete_wrapper">
1184-
{ SettingsStore.isFeatureEnabled("feature_rich_quoting") && <ReplyPreview /> }
1184+
<ReplyPreview />
11851185
<Autocomplete
11861186
ref={(e) => this.autocomplete = e}
11871187
room={this.props.room}

src/i18n/strings/bg.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,6 @@
203203
"Not a valid Riot keyfile": "Невалиден файл с ключ за Riot",
204204
"Authentication check failed: incorrect password?": "Неуспешна автентикация: неправилна парола?",
205205
"Failed to join room": "Неуспешно присъединяване към стаята",
206-
"Message Replies": "Отговори на съобщението",
207206
"Message Pinning": "Функция за закачане на съобщения",
208207
"Disable Emoji suggestions while typing": "Изключване на предложенията за емотиконите при писане",
209208
"Use compact timeline layout": "Използване на компактно оформление за списъка със съобщения",

src/i18n/strings/ca.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,6 @@
209209
"Not a valid Riot keyfile": "El fitxer no és un fitxer de claus de Riot valid",
210210
"Authentication check failed: incorrect password?": "Ha fallat l'autenticació: heu introduït correctament la contrasenya?",
211211
"Failed to join room": "No s'ha pogut entrar a la sala",
212-
"Message Replies": "Respostes del missatge",
213212
"Message Pinning": "Fixació de missatges",
214213
"Disable Emoji suggestions while typing": "Desactiva els suggeriments d'Emoji mentre s'escriu",
215214
"Use compact timeline layout": "Utilitza el disseny compacte de la línia de temps",

src/i18n/strings/de_DE.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -946,7 +946,6 @@
946946
"Your homeserver's URL": "Die URL deines Homeservers",
947947
"Your identity server's URL": "Die URL deines Identitätsservers",
948948
"%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s",
949-
"Message Replies": "Antworten auf Nachrichten",
950949
"You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "Du wirst nicht in der Lage sein, die Änderung zurückzusetzen, da du dich degradierst. Wenn du der letze Nutzer mit Berechtigungen bist, wird es unmöglich sein die Privilegien zurückzubekommen.",
951950
"Community IDs cannot not be empty.": "Community-IDs können nicht leer sein.",
952951
"<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Geräte anzeigen</showDevicesText>, <sendAnywayText>trotzdem senden</sendAnywayText> oder <cancelText>abbrechen</cancelText>.",

src/i18n/strings/en_EN.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,6 @@
186186
"Not a valid Riot keyfile": "Not a valid Riot keyfile",
187187
"Authentication check failed: incorrect password?": "Authentication check failed: incorrect password?",
188188
"Failed to join room": "Failed to join room",
189-
"Message Replies": "Message Replies",
190189
"Message Pinning": "Message Pinning",
191190
"Disable Emoji suggestions while typing": "Disable Emoji suggestions while typing",
192191
"Use compact timeline layout": "Use compact timeline layout",

src/i18n/strings/eu.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -932,7 +932,6 @@
932932
"%(count)s of your messages have not been sent.|one": "Zure mezua ez da bidali.",
933933
"%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Birbidali guztiak</resendText> edo <cancelText>baztertu guztiak</cancelText> orain. Mezuak banaka birbidali edo baztertu ditzakezu ere.",
934934
"%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Birbidali mezua</resendText> edo <cancelText>baztertu mezua</cancelText> orain.",
935-
"Message Replies": "Mezuei erantzunak",
936935
"Send an encrypted reply…": "Bidali zifratutako erantzun bat…",
937936
"Send a reply (unencrypted)…": "Bidali erantzun bat (zifratu gabea)…",
938937
"Send an encrypted message…": "Bidali zifratutako mezu bat…",

src/i18n/strings/fr.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -932,7 +932,6 @@
932932
"%(count)s of your messages have not been sent.|one": "Votre message n'a pas été envoyé.",
933933
"%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Tout renvoyer</resendText> ou <cancelText>tout annuler</cancelText> maintenant. Vous pouvez aussi choisir des messages individuels à renvoyer ou annuler.",
934934
"%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Renvoyer le message</resendText> ou <cancelText>annuler le message</cancelText> maintenant.",
935-
"Message Replies": "Réponses",
936935
"Send an encrypted reply…": "Envoyer une réponse chiffrée…",
937936
"Send a reply (unencrypted)…": "Envoyer une réponse (non chiffrée)…",
938937
"Send an encrypted message…": "Envoyer un message chiffré…",

0 commit comments

Comments
 (0)