various touchups

pull/775/head
Vincent 5 years ago
parent bd034df8db
commit 156f0d4127

@ -553,7 +553,7 @@
"message": "When including a non-image attachment, the limit is one attachment per message.",
"description": "An error popup when the user has attempted to add an attachment"
},
"cannotMixImageAdnNonImageAttachments": {
"cannotMixImageAndNonImageAttachments": {
"message": "You cannot mix non-image and image attachments in one message.",
"description": "An error popup when the user has attempted to add an attachment"
},

@ -553,7 +553,7 @@
"message": "When including a non-image attachment, the limit is one attachment per message.",
"description": "An error popup when the user has attempted to add an attachment"
},
"cannotMixImageAdnNonImageAttachments": {
"cannotMixImageAndNonImageAttachments": {
"message": "You cannot mix non-image and image attachments in one message.",
"description": "An error popup when the user has attempted to add an attachment"
},

@ -553,7 +553,7 @@
"message": "Quan inclogueu un adjunt que no sigui una imatge, el límit és un adjunt per missatge.",
"description": "An error popup when the user has attempted to add an attachment"
},
"cannotMixImageAdnNonImageAttachments": {
"cannotMixImageAndNonImageAttachments": {
"message": "No podeu barrejar adjunts d'imatge i de no imatge en un mateix missatge.",
"description": "An error popup when the user has attempted to add an attachment"
},

@ -553,7 +553,7 @@
"message": "When including a non-image attachment, the limit is one attachment per message.",
"description": "An error popup when the user has attempted to add an attachment"
},
"cannotMixImageAdnNonImageAttachments": {
"cannotMixImageAndNonImageAttachments": {
"message": "You cannot mix non-image and image attachments in one message.",
"description": "An error popup when the user has attempted to add an attachment"
},

@ -553,7 +553,7 @@
"message": "Når der indgår en vedhæftet fil uden billed, er grænsen en vedhæftet fil pr. besked.",
"description": "An error popup when the user has attempted to add an attachment"
},
"cannotMixImageAdnNonImageAttachments": {
"cannotMixImageAndNonImageAttachments": {
"message": "Du kan ikke blande ikke-billed og billedvedhæftninger i en besked.",
"description": "An error popup when the user has attempted to add an attachment"
},

@ -553,7 +553,7 @@
"message": "Mehrere Anhänge je Nachricht sind ausschließlich bei Bildern erlaubt.",
"description": "An error popup when the user has attempted to add an attachment"
},
"cannotMixImageAdnNonImageAttachments": {
"cannotMixImageAndNonImageAttachments": {
"message": "Du kannst Bilder nicht gemeinsam mit anderen Anhängen in einer Nachricht kombinieren.",
"description": "An error popup when the user has attempted to add an attachment"
},

@ -553,7 +553,7 @@
"message": "Για συνημμένα αρχεία που δεν είναι εικόνες, το όριο είναι ένα αρχείο ανά μήνυμα.",
"description": "An error popup when the user has attempted to add an attachment"
},
"cannotMixImageAdnNonImageAttachments": {
"cannotMixImageAndNonImageAttachments": {
"message": "Δεν είναι δυνατό να συνάψετε εικόνες μαζί με αρχεία άλλου τύπου στο ίδιο μήνυμα.",
"description": "An error popup when the user has attempted to add an attachment"
},

@ -650,7 +650,7 @@
"description":
"An error popup when the user has attempted to add an attachment"
},
"cannotMixImageAdnNonImageAttachments": {
"cannotMixImageAndNonImageAttachments": {
"message": "You cannot mix non-image and image attachments in one message.",
"description":
"An error popup when the user has attempted to add an attachment"
@ -1119,12 +1119,12 @@
"message": "Show members"
},
"resetSession": {
"message": "Reset session",
"message": "Reset Session",
"description":
"This is a menu item for resetting the session, using the imperative case, as in a command."
},
"showSafetyNumber": {
"message": "View safety number"
"message": "View Safety Number"
},
"viewAllMedia": {
"message": "View all media",
@ -1756,7 +1756,7 @@
"description": "Conversation menu option to enable disappearing messages"
},
"changeNickname": {
"message": "Change nickname",
"message": "Change Nickname",
"description": "Conversation menu option to change user nickname"
},
"clearNickname": {
@ -2088,10 +2088,10 @@
}
},
"blockUser": {
"message": "Block user"
"message": "Block User"
},
"unblockUser": {
"message": "Unblock user"
"message": "Unblock User"
},
"settingsUnblockHeader": {
"message": "Blocked Users",

@ -553,7 +553,7 @@
"message": "Kiam oni enmetas nebildan kunsendaĵon, limo estas po unu kunsendaĵo mesaĝe.",
"description": "An error popup when the user has attempted to add an attachment"
},
"cannotMixImageAdnNonImageAttachments": {
"cannotMixImageAndNonImageAttachments": {
"message": "Vi ne povas kunmeti nebildajn kaj bildajn kunsendaĵojn en unu mesaĝo.",
"description": "An error popup when the user has attempted to add an attachment"
},

@ -553,7 +553,7 @@
"message": "Al incluír un adjunto que no es una imagen, el límite es un adjunto por mensaje.",
"description": "An error popup when the user has attempted to add an attachment"
},
"cannotMixImageAdnNonImageAttachments": {
"cannotMixImageAndNonImageAttachments": {
"message": "No se pueden combinar adjuntos de otro tipo junto a imágenes.",
"description": "An error popup when the user has attempted to add an attachment"
},

@ -553,7 +553,7 @@
"message": "Mittepildilisi manuseid sõnumile lisades kehtiv ühe manuse piirang.",
"description": "An error popup when the user has attempted to add an attachment"
},
"cannotMixImageAdnNonImageAttachments": {
"cannotMixImageAndNonImageAttachments": {
"message": "Piltmanuseid ja teisi manuseid ei saa koos ühte sõnumisse panna.",
"description": "An error popup when the user has attempted to add an attachment"
},

@ -553,7 +553,7 @@
"message": "When including a non-image attachment, the limit is one attachment per message.",
"description": "An error popup when the user has attempted to add an attachment"
},
"cannotMixImageAdnNonImageAttachments": {
"cannotMixImageAndNonImageAttachments": {
"message": "You cannot mix non-image and image attachments in one message.",
"description": "An error popup when the user has attempted to add an attachment"
},

@ -553,7 +553,7 @@
"message": "Muille kuin kuvatiedostoille raja on yksi liitetiedosto per viesti.",
"description": "An error popup when the user has attempted to add an attachment"
},
"cannotMixImageAdnNonImageAttachments": {
"cannotMixImageAndNonImageAttachments": {
"message": "Kuvatiedostoa ja muun tyyppistä liitetiedostoa ei voi lisätä samaan viestiin.",
"description": "An error popup when the user has attempted to add an attachment"
},

@ -553,7 +553,7 @@
"message": "Pour un fichier joint qui nest pas une image, la limite est un fichier joint par message.",
"description": "An error popup when the user has attempted to add an attachment"
},
"cannotMixImageAdnNonImageAttachments": {
"cannotMixImageAndNonImageAttachments": {
"message": "Vous ne pouvez pas joindre à la fois image et non image dans le même message.",
"description": "An error popup when the user has attempted to add an attachment"
},

@ -553,7 +553,7 @@
"message": "בעת הכללת צרופת אי־תמונה, המגבלה היא צרופה אחת להודעה.",
"description": "An error popup when the user has attempted to add an attachment"
},
"cannotMixImageAdnNonImageAttachments": {
"cannotMixImageAndNonImageAttachments": {
"message": "אינך יכול לערבב צרופות של אי־תמונה ותמונה בהודעה אחת.",
"description": "An error popup when the user has attempted to add an attachment"
},

@ -553,7 +553,7 @@
"message": "When including a non-image attachment, the limit is one attachment per message.",
"description": "An error popup when the user has attempted to add an attachment"
},
"cannotMixImageAdnNonImageAttachments": {
"cannotMixImageAndNonImageAttachments": {
"message": "You cannot mix non-image and image attachments in one message.",
"description": "An error popup when the user has attempted to add an attachment"
},

@ -553,7 +553,7 @@
"message": "When including a non-image attachment, the limit is one attachment per message.",
"description": "An error popup when the user has attempted to add an attachment"
},
"cannotMixImageAdnNonImageAttachments": {
"cannotMixImageAndNonImageAttachments": {
"message": "You cannot mix non-image and image attachments in one message.",
"description": "An error popup when the user has attempted to add an attachment"
},

@ -553,7 +553,7 @@
"message": "Nem-kép csatolmány esetén üzenetenként egy melléklet csatolható.",
"description": "An error popup when the user has attempted to add an attachment"
},
"cannotMixImageAdnNonImageAttachments": {
"cannotMixImageAndNonImageAttachments": {
"message": "Nem keverheted a nem-kép és kép típusú csatolmányokat üzeneten belül.",
"description": "An error popup when the user has attempted to add an attachment"
},

@ -553,7 +553,7 @@
"message": "Ketika menyertakan lampiran bukan gambar, batasnya adalah satu lampiran per pesan.",
"description": "An error popup when the user has attempted to add an attachment"
},
"cannotMixImageAdnNonImageAttachments": {
"cannotMixImageAndNonImageAttachments": {
"message": "Anda tidak bisa mencampur lampiran gambar dan bukan gambar dalam satu pesan.",
"description": "An error popup when the user has attempted to add an attachment"
},

@ -553,7 +553,7 @@
"message": "Quando includi un allegato che non è un'immagine, il limite è un solo allegato per messaggio.",
"description": "An error popup when the user has attempted to add an attachment"
},
"cannotMixImageAdnNonImageAttachments": {
"cannotMixImageAndNonImageAttachments": {
"message": "Non puoi allegare insieme immagini ad altri file in un messaggio.",
"description": "An error popup when the user has attempted to add an attachment"
},

@ -553,7 +553,7 @@
"message": "When including a non-image attachment, the limit is one attachment per message.",
"description": "An error popup when the user has attempted to add an attachment"
},
"cannotMixImageAdnNonImageAttachments": {
"cannotMixImageAndNonImageAttachments": {
"message": "You cannot mix non-image and image attachments in one message.",
"description": "An error popup when the user has attempted to add an attachment"
},

@ -553,7 +553,7 @@
"message": "ពេលបញ្ចូលឯកសារភ្ជាប់មិន-រូបភាពមួយ ការកំណត់គឺឯកសារភ្ជាប់មួយ សម្រាប់សារមួយ។",
"description": "An error popup when the user has attempted to add an attachment"
},
"cannotMixImageAdnNonImageAttachments": {
"cannotMixImageAndNonImageAttachments": {
"message": "អ្នកមិនអាចលាយឡំឯកសារភ្ជាប់ មិន-រូបភាព និងរូបភាព ក្នុងសារតែមួយទេ។",
"description": "An error popup when the user has attempted to add an attachment"
},

@ -553,7 +553,7 @@
"message": "When including a non-image attachment, the limit is one attachment per message.",
"description": "An error popup when the user has attempted to add an attachment"
},
"cannotMixImageAdnNonImageAttachments": {
"cannotMixImageAndNonImageAttachments": {
"message": "You cannot mix non-image and image attachments in one message.",
"description": "An error popup when the user has attempted to add an attachment"
},

@ -553,7 +553,7 @@
"message": "When including a non-image attachment, the limit is one attachment per message.",
"description": "An error popup when the user has attempted to add an attachment"
},
"cannotMixImageAdnNonImageAttachments": {
"cannotMixImageAndNonImageAttachments": {
"message": "You cannot mix non-image and image attachments in one message.",
"description": "An error popup when the user has attempted to add an attachment"
},

@ -553,7 +553,7 @@
"message": "Įtraukiant ne paveikslų priedus, vienoje žinutėje galimas tik vienas priedas.",
"description": "An error popup when the user has attempted to add an attachment"
},
"cannotMixImageAdnNonImageAttachments": {
"cannotMixImageAndNonImageAttachments": {
"message": "Negalite vienoje žinutėje maišyti paveikslų ir ne paveikslų priedus.",
"description": "An error popup when the user has attempted to add an attachment"
},

@ -553,7 +553,7 @@
"message": "When including a non-image attachment, the limit is one attachment per message.",
"description": "An error popup when the user has attempted to add an attachment"
},
"cannotMixImageAdnNonImageAttachments": {
"cannotMixImageAndNonImageAttachments": {
"message": "You cannot mix non-image and image attachments in one message.",
"description": "An error popup when the user has attempted to add an attachment"
},

@ -553,7 +553,7 @@
"message": "Når du inkluderer et vedlegg som ikke er et bilde, er begrensningen ett vedlegg per melding.",
"description": "An error popup when the user has attempted to add an attachment"
},
"cannotMixImageAdnNonImageAttachments": {
"cannotMixImageAndNonImageAttachments": {
"message": "Du kan ikke blande vedlegg som er bilder med vedlegg som ikke er bilder i samme melding.",
"description": "An error popup when the user has attempted to add an attachment"
},

@ -553,7 +553,7 @@
"message": "Wanneer je een bijlage insluit die geen afbeelding is, is de limiet één bijlage per bericht.",
"description": "An error popup when the user has attempted to add an attachment"
},
"cannotMixImageAdnNonImageAttachments": {
"cannotMixImageAndNonImageAttachments": {
"message": "Je kunt geen combinatie van afbeeldingen en niet-afbeeldingen insluiten als bijlagen van één bericht.",
"description": "An error popup when the user has attempted to add an attachment"
},

@ -553,7 +553,7 @@
"message": "Når du inkluderer eit vedlegg som ikkje er eit bilde, er grensa eitt vedlegg per melding.",
"description": "An error popup when the user has attempted to add an attachment"
},
"cannotMixImageAdnNonImageAttachments": {
"cannotMixImageAndNonImageAttachments": {
"message": "Du kan ikkje blanda vedlegg som er bilde med vedlegg som ikkje er bilde i same melding.",
"description": "An error popup when the user has attempted to add an attachment"
},

@ -553,7 +553,7 @@
"message": "Når du inkluderer et vedlegg som ikke er et bilde, er begrensningen ett vedlegg per melding.",
"description": "An error popup when the user has attempted to add an attachment"
},
"cannotMixImageAdnNonImageAttachments": {
"cannotMixImageAndNonImageAttachments": {
"message": "Du kan ikke blande vedlegg som er bilder med vedlegg som ikke er bilder i samme melding.",
"description": "An error popup when the user has attempted to add an attachment"
},

@ -553,7 +553,7 @@
"message": "W przypadku dołączenia załącznika innego niż obraz, limit wynosi jeden załącznik na wiadomość.",
"description": "An error popup when the user has attempted to add an attachment"
},
"cannotMixImageAdnNonImageAttachments": {
"cannotMixImageAndNonImageAttachments": {
"message": "Nie można łączyć obrazów z innymi załącznikami w jednej wiadomości.",
"description": "An error popup when the user has attempted to add an attachment"
},

@ -553,7 +553,7 @@
"message": "O limite para inclusão de anexos que não sejam imagens é de um por mensagem.",
"description": "An error popup when the user has attempted to add an attachment"
},
"cannotMixImageAdnNonImageAttachments": {
"cannotMixImageAndNonImageAttachments": {
"message": "Você não pode combinar imagens e anexos que não sejam imagens na mesma mensagem.",
"description": "An error popup when the user has attempted to add an attachment"
},

@ -553,7 +553,7 @@
"message": "Se o anexo não for uma imagem, apenas pode enviar um anexo por mensagem.",
"description": "An error popup when the user has attempted to add an attachment"
},
"cannotMixImageAdnNonImageAttachments": {
"cannotMixImageAndNonImageAttachments": {
"message": "Não pode misturar imagens com outro tipo de anexos numa só mensagem.",
"description": "An error popup when the user has attempted to add an attachment"
},

@ -553,7 +553,7 @@
"message": "When including a non-image attachment, the limit is one attachment per message.",
"description": "An error popup when the user has attempted to add an attachment"
},
"cannotMixImageAdnNonImageAttachments": {
"cannotMixImageAndNonImageAttachments": {
"message": "You cannot mix non-image and image attachments in one message.",
"description": "An error popup when the user has attempted to add an attachment"
},

@ -553,7 +553,7 @@
"message": "При включении в сообщение вложений, не относящихся к изображениям, ограничение составляет по одному вложению на сообщение.",
"description": "An error popup when the user has attempted to add an attachment"
},
"cannotMixImageAdnNonImageAttachments": {
"cannotMixImageAndNonImageAttachments": {
"message": "Нельзя смешивать вложения, не относящиеся к изображениям, с изображениями в одном сообщении.",
"description": "An error popup when the user has attempted to add an attachment"
},

@ -553,7 +553,7 @@
"message": "When including a non-image attachment, the limit is one attachment per message.",
"description": "An error popup when the user has attempted to add an attachment"
},
"cannotMixImageAdnNonImageAttachments": {
"cannotMixImageAndNonImageAttachments": {
"message": "V jednej správe nemôže byť súčasne príloha s obrázkom a príloha bez obrázku.",
"description": "An error popup when the user has attempted to add an attachment"
},

@ -553,7 +553,7 @@
"message": "Neslikovne datoteke so omejene na eno priponko na sporočilo.",
"description": "An error popup when the user has attempted to add an attachment"
},
"cannotMixImageAdnNonImageAttachments": {
"cannotMixImageAndNonImageAttachments": {
"message": "V istem sporočilu ne morete kombinirati neslikovnih in slikovnih priponk.",
"description": "An error popup when the user has attempted to add an attachment"
},

@ -553,7 +553,7 @@
"message": "Kur përfshihet një bashkëngjitje që sështë figurë, kufiri është një bashkëngjitje për mesazh.",
"description": "An error popup when the user has attempted to add an attachment"
},
"cannotMixImageAdnNonImageAttachments": {
"cannotMixImageAndNonImageAttachments": {
"message": "Smund të përzieni brenda të njëjtit mesazh bashkëngjitje figurë dhe jo figurë.",
"description": "An error popup when the user has attempted to add an attachment"
},

@ -553,7 +553,7 @@
"message": "When including a non-image attachment, the limit is one attachment per message.",
"description": "An error popup when the user has attempted to add an attachment"
},
"cannotMixImageAdnNonImageAttachments": {
"cannotMixImageAndNonImageAttachments": {
"message": "You cannot mix non-image and image attachments in one message.",
"description": "An error popup when the user has attempted to add an attachment"
},

@ -553,7 +553,7 @@
"message": "När man inkluderar bilagor som inte är bilder, är begränsningen en bilaga per meddelande.",
"description": "An error popup when the user has attempted to add an attachment"
},
"cannotMixImageAdnNonImageAttachments": {
"cannotMixImageAndNonImageAttachments": {
"message": "Du kan inte blanda bilagor som både är, och inte är, bilder i ett meddelande.",
"description": "An error popup when the user has attempted to add an attachment"
},

@ -553,7 +553,7 @@
"message": "When including a non-image attachment, the limit is one attachment per message.",
"description": "An error popup when the user has attempted to add an attachment"
},
"cannotMixImageAdnNonImageAttachments": {
"cannotMixImageAndNonImageAttachments": {
"message": "You cannot mix non-image and image attachments in one message.",
"description": "An error popup when the user has attempted to add an attachment"
},

@ -553,7 +553,7 @@
"message": "Görüntü olmayan eklentiler içerildiğinde, ileti başı eklenti sınırı birdir.",
"description": "An error popup when the user has attempted to add an attachment"
},
"cannotMixImageAdnNonImageAttachments": {
"cannotMixImageAndNonImageAttachments": {
"message": "Görüntü ve görüntü olmayan eklentileri tek iletide birleştiremezsiniz.",
"description": "An error popup when the user has attempted to add an attachment"
},

@ -553,7 +553,7 @@
"message": "When including a non-image attachment, the limit is one attachment per message.",
"description": "An error popup when the user has attempted to add an attachment"
},
"cannotMixImageAdnNonImageAttachments": {
"cannotMixImageAndNonImageAttachments": {
"message": "You cannot mix non-image and image attachments in one message.",
"description": "An error popup when the user has attempted to add an attachment"
},

@ -553,7 +553,7 @@
"message": "When including a non-image attachment, the limit is one attachment per message.",
"description": "An error popup when the user has attempted to add an attachment"
},
"cannotMixImageAdnNonImageAttachments": {
"cannotMixImageAndNonImageAttachments": {
"message": "You cannot mix non-image and image attachments in one message.",
"description": "An error popup when the user has attempted to add an attachment"
},

@ -553,7 +553,7 @@
"message": "每条消息只能添加一个非图片的附件。",
"description": "An error popup when the user has attempted to add an attachment"
},
"cannotMixImageAdnNonImageAttachments": {
"cannotMixImageAndNonImageAttachments": {
"message": "在一条消息中,可以同时添加一张图片和一个非图片附件。",
"description": "An error popup when the user has attempted to add an attachment"
},

@ -553,7 +553,7 @@
"message": "當包含的附檔不是圖片,每個訊息限制只能有一個附檔。",
"description": "An error popup when the user has attempted to add an attachment"
},
"cannotMixImageAdnNonImageAttachments": {
"cannotMixImageAndNonImageAttachments": {
"message": "你無法在一個訊息中,同時附上非圖片及圖片檔案。",
"description": "An error popup when the user has attempted to add an attachment"
},

@ -215,9 +215,9 @@
showCannotMixError() {
window.pushToast({
title: i18n('cannotMixImageAdnNonImageAttachments'),
title: i18n('cannotMixImageAndNonImageAttachments'),
type: 'error',
id: 'cannotMixImageAdnNonImageAttachments',
id: 'cannotMixImageAndNonImageAttachments',
});
},
@ -238,7 +238,6 @@
},
// Housekeeping
addAttachment(attachment) {
if (attachment.isVoiceNote && this.attachments.length > 0) {
throw new Error('A voice note cannot be sent with other attachments');

@ -1137,7 +1137,8 @@ label {
background-color: $session-shade-1;
padding: $session-margin-lg;
border-bottom: 2px solid $session-shade-5;
margin-bottom: 20px;
border-bottom: 1px solid $session-shade-5;
&.inline {
display: flex;
@ -1156,6 +1157,7 @@ label {
}
&__description {
font-family: "SF Pro Text";
font-size: $session-font-sm;
font-weight: 100;
@include session-color-subtle($session-color-white);

@ -58,6 +58,7 @@ export class LeftPaneMessageSection extends React.Component<Props, any> {
this.updateSearchBound = this.updateSearch.bind(this);
this.handleToggleOverlay = this.handleToggleOverlay.bind(this);
this.handleCloseOnboarding = this.handleCloseOnboarding.bind(this);
this.handleJoinPublicChat = this.handleJoinPublicChat.bind(this);
this.handleOnPasteSessionID = this.handleOnPasteSessionID.bind(this);
this.handleMessageButtonClick = this.handleMessageButtonClick.bind(this);
this.debouncedSearch = debounce(this.search.bind(this), 20);
@ -240,6 +241,7 @@ export class LeftPaneMessageSection extends React.Component<Props, any> {
text={window.i18n('joinPublicChat')}
buttonType={SessionButtonType.BrandOutline}
buttonColor={SessionButtonColor.Green}
onClick={this.handleJoinPublicChat}
/>
<SessionButton
text={window.i18n('noThankyou')}
@ -259,6 +261,10 @@ export class LeftPaneMessageSection extends React.Component<Props, any> {
});
}
public handleJoinPublicChat() {
return;
}
public updateSearch(searchTerm: string) {
const { updateSearchTerm, clearSearch } = this.props;

Loading…
Cancel
Save