diff --git a/app/i18n/locales/ar.json b/app/i18n/locales/ar.json index 88ff6ca0ef..b4fe1ef0e2 100644 --- a/app/i18n/locales/ar.json +++ b/app/i18n/locales/ar.json @@ -1,6 +1,5 @@ { "1_person_reacted": "تفاعل شخص واحد", - "A_meaningful_name_for_the_discussion_room": "اسم معبر لغرفة النقاش", "Accessibility_statement": "بيان الوصول", "Actions": "الإجراءات", "Activity": "النشاط", diff --git a/app/i18n/locales/bn-IN.json b/app/i18n/locales/bn-IN.json index b3afc7af11..d1a8dcb709 100644 --- a/app/i18n/locales/bn-IN.json +++ b/app/i18n/locales/bn-IN.json @@ -2,7 +2,6 @@ "__count__empty_room_will_be_removed_automatically": "{{count}} খালি রুম স্বয়ংক্রিয়ভাবে মুছে ফেলা হবে।", "__count__empty_rooms_will_be_removed_automatically": "{{count}} খালি রুম স্বয়ংক্রিয়ভাবে মুছে ফেলা হবে।", "1_person_reacted": "1 জন ব্যক্তি প্রতিক্রিয়া দিয়েছে", - "A_meaningful_name_for_the_discussion_room": "আলোচনা কক্ষের জন্য একটি অর্থপূর্ণ নাম", "A_new_owner_will_be_assigned_automatically_to__count__room": "{{count}} রুমে নতুন মালিক স্বয়ংক্রিয়ভাবে নির্ধারণ করা হবে।", "A_new_owner_will_be_assigned_automatically_to__count__rooms": "{{count}} রুমে নতুন মালিক স্বয়ংক্রিয়ভাবে নির্ধারণ করা হবে।", "accept": "গ্রহণ করুন", diff --git a/app/i18n/locales/cs.json b/app/i18n/locales/cs.json index 3bc17bacb6..49defbf9f2 100644 --- a/app/i18n/locales/cs.json +++ b/app/i18n/locales/cs.json @@ -2,7 +2,6 @@ "__count__empty_room_will_be_removed_automatically": "{{count}} prázdná místnost bude smazána.", "__count__empty_rooms_will_be_removed_automatically": "{{count}} prázdných místností bude smazáno.", "1_person_reacted": "1 osoba reagovala", - "A_meaningful_name_for_the_discussion_room": "Smysluplný název pro diskusní místnost", "A_new_owner_will_be_assigned_automatically_to__count__room": "K {{count}} místnosti bude automaticky přiřazen nový vlastník.", "A_new_owner_will_be_assigned_automatically_to__count__rooms": "K {{count}} místnostem bude automaticky přiřazen nový vlastník.", "accept": "Akceptovat", diff --git a/app/i18n/locales/de.json b/app/i18n/locales/de.json index e5d98cdf39..87669652b9 100644 --- a/app/i18n/locales/de.json +++ b/app/i18n/locales/de.json @@ -2,7 +2,6 @@ "__count__empty_room_will_be_removed_automatically": "{{count}} leerer Raum wird gelöscht.", "__count__empty_rooms_will_be_removed_automatically": "{{count}} leere Räume werden gelöscht.", "1_person_reacted": "1 Person hat reagiert", - "A_meaningful_name_for_the_discussion_room": "Ein aussagekräftiger Name für den Unterhaltungs-Room", "A_new_owner_will_be_assigned_automatically_to__count__room": "Ein neuer Besitzer wird automatisch zu {{count}} Raum zugeordnet.", "A_new_owner_will_be_assigned_automatically_to__count__rooms": "Ein neuer Besitzer wird automatisch zu {{count}} Räumen zugeordnet.", "accept": "Annehmen", diff --git a/app/i18n/locales/en.json b/app/i18n/locales/en.json index 01a4e60d21..429e710ea1 100644 --- a/app/i18n/locales/en.json +++ b/app/i18n/locales/en.json @@ -2,7 +2,6 @@ "__count__empty_room_will_be_removed_automatically": "{{count}} empty room will be deleted.", "__count__empty_rooms_will_be_removed_automatically": "{{count}} empty rooms will be deleted.", "1_person_reacted": "1 person reacted", - "A_meaningful_name_for_the_discussion_room": "A meaningful name for the discussion room", "A_new_owner_will_be_assigned_automatically_to__count__room": "A new owner will be assigned automatically to {{count}} room.", "A_new_owner_will_be_assigned_automatically_to__count__rooms": "A new owner will be assigned automatically to {{count}} rooms.", "accept": "Accept", diff --git a/app/i18n/locales/fi.json b/app/i18n/locales/fi.json index 0a20a66e2a..06ff1b5525 100644 --- a/app/i18n/locales/fi.json +++ b/app/i18n/locales/fi.json @@ -2,7 +2,6 @@ "__count__empty_room_will_be_removed_automatically": "{{count}} tyhjä huone poistetaan.", "__count__empty_rooms_will_be_removed_automatically": "{{count}} tyhjää huonetta poistetaan.", "1_person_reacted": "1 henkilö reagoi", - "A_meaningful_name_for_the_discussion_room": "Mielekäs nimi keskusteluhuoneelle", "A_new_owner_will_be_assigned_automatically_to__count__room": "Uusi omistaja liitetään automaattisesti {{count}} huoneeseen.", "A_new_owner_will_be_assigned_automatically_to__count__rooms": "Uusi omistaja liitetään automaattisesti {{count}} huoneeseen.", "Accessibility_statement": "Saavutettavuusilmoitus", diff --git a/app/i18n/locales/fr.json b/app/i18n/locales/fr.json index 7081d30c6b..e489630c54 100644 --- a/app/i18n/locales/fr.json +++ b/app/i18n/locales/fr.json @@ -1,6 +1,5 @@ { "1_person_reacted": "1 personne a réagi", - "A_meaningful_name_for_the_discussion_room": "Un nom significatif pour le salon de discussion", "Accessibility_statement": "Déclaration d'accessibilité", "Actions": "Actions", "Activity": "Activité", diff --git a/app/i18n/locales/hi-IN.json b/app/i18n/locales/hi-IN.json index aef108ac32..a3be957927 100644 --- a/app/i18n/locales/hi-IN.json +++ b/app/i18n/locales/hi-IN.json @@ -2,7 +2,6 @@ "__count__empty_room_will_be_removed_automatically": "{{count}} खाली कमरा स्वच्छता से हटा दिया जाएगा।", "__count__empty_rooms_will_be_removed_automatically": "{{count}} खाली कमरे स्वच्छता से हटा दिए जाएंगे।", "1_person_reacted": "1 व्यक्ति ने प्रतिक्रिया दी", - "A_meaningful_name_for_the_discussion_room": "चर्चा कमरे के लिए एक सार्थक नाम", "A_new_owner_will_be_assigned_automatically_to__count__room": "{{count}} कमरे को स्वच्छता से नया मालिक सौंपा जाएगा।", "A_new_owner_will_be_assigned_automatically_to__count__rooms": "{{count}} कमरों को स्वच्छता से नया मालिक सौंपा जाएगा।", "accept": "स्वीकार करें", diff --git a/app/i18n/locales/hu.json b/app/i18n/locales/hu.json index faf819d605..7e68babe36 100644 --- a/app/i18n/locales/hu.json +++ b/app/i18n/locales/hu.json @@ -2,7 +2,6 @@ "__count__empty_room_will_be_removed_automatically": "{{count}} üres szoba lesz törölve.", "__count__empty_rooms_will_be_removed_automatically": "{{count}} üres szoba lesz törölve.", "1_person_reacted": "1 személy reagált", - "A_meaningful_name_for_the_discussion_room": "Egy értelmes név a megbeszélés szobájának", "A_new_owner_will_be_assigned_automatically_to__count__room": "Az új tulajdonos automatikus hozzárendelésre kerül {{count}} szobához.", "A_new_owner_will_be_assigned_automatically_to__count__rooms": "Az új tulajdonos automatikus hozzárendelésre kerül {{count}} szobához.", "accept": "Elfogadom", diff --git a/app/i18n/locales/it.json b/app/i18n/locales/it.json index dd44c347fa..b6e0ae38b6 100644 --- a/app/i18n/locales/it.json +++ b/app/i18n/locales/it.json @@ -2,7 +2,6 @@ "__count__empty_room_will_be_removed_automatically": "{{count}} stanza vuota verrà eliminata.", "__count__empty_rooms_will_be_removed_automatically": "{{count}} stanze vuote verranno eliminate.", "1_person_reacted": "1 persona ha reagito", - "A_meaningful_name_for_the_discussion_room": "Un nome significativo per il canale di discussione", "A_new_owner_will_be_assigned_automatically_to__count__room": "Un nuovo proprietario verrà assegnato automaticamente alla stanza {{count}}.", "A_new_owner_will_be_assigned_automatically_to__count__rooms": "Un nuovo proprietario verrà assegnato automaticamente a {{count}} stanze.", "Accessibility_statement": "Dichiarazione di accessibilità", diff --git a/app/i18n/locales/ja.json b/app/i18n/locales/ja.json index b60a161478..a38aa6c207 100644 --- a/app/i18n/locales/ja.json +++ b/app/i18n/locales/ja.json @@ -1,6 +1,5 @@ { "1_person_reacted": "1人がリアクション", - "A_meaningful_name_for_the_discussion_room": "ディスカッションルームわかりやすい名前", "Accessibility_statement": "アクセシビリティ声明", "Actions": "アクション", "Activity": "アクティビティ順", diff --git a/app/i18n/locales/nl.json b/app/i18n/locales/nl.json index 3c6b26a6c0..1aeb2aea83 100644 --- a/app/i18n/locales/nl.json +++ b/app/i18n/locales/nl.json @@ -1,6 +1,5 @@ { "1_person_reacted": "1 persoon heeft gereageerd", - "A_meaningful_name_for_the_discussion_room": "Een betekenisvolle naam voor de discussieruimte", "Accessibility_statement": "Toegankelijkheidsverklaring", "Actions": "Acties", "Activity": "Activiteit", diff --git a/app/i18n/locales/pt-BR.json b/app/i18n/locales/pt-BR.json index c028ad36a0..ec903857ca 100644 --- a/app/i18n/locales/pt-BR.json +++ b/app/i18n/locales/pt-BR.json @@ -2,7 +2,6 @@ "__count__empty_room_will_be_removed_automatically": "{{count}} sala vazia será excluída.", "__count__empty_rooms_will_be_removed_automatically": "{{count}} salas vazias serão excluídas.", "1_person_reacted": "1 pessoa reagiu", - "A_meaningful_name_for_the_discussion_room": "Um nome significativo para o canal de discussão", "A_new_owner_will_be_assigned_automatically_to__count__room": "Um novo proprietário será atribuído automaticamente a {{count}} sala.", "A_new_owner_will_be_assigned_automatically_to__count__rooms": "Um novo proprietário será atribuído automaticamente a {{count}} salas.", "accept": "Aceitar", diff --git a/app/i18n/locales/pt-PT.json b/app/i18n/locales/pt-PT.json index 10092677c5..c67819a3f7 100644 --- a/app/i18n/locales/pt-PT.json +++ b/app/i18n/locales/pt-PT.json @@ -1,6 +1,5 @@ { "1_person_reacted": "1 pessoa reagiu", - "A_meaningful_name_for_the_discussion_room": "Um nome significativo para a sala de discussão", "Accessibility_statement": "Declaração de acessibilidade", "Actions": "Acções", "Activity": "Actividade", diff --git a/app/i18n/locales/ru.json b/app/i18n/locales/ru.json index 2cfd39cce1..3963473d70 100644 --- a/app/i18n/locales/ru.json +++ b/app/i18n/locales/ru.json @@ -2,7 +2,6 @@ "__count__empty_room_will_be_removed_automatically": "{{count}} пустых чатов будет удалено.", "__count__empty_rooms_will_be_removed_automatically": "{{count}} пустых чатов будет удалено.", "1_person_reacted": "1 человек отреагировал", - "A_meaningful_name_for_the_discussion_room": "Осмысленное имя для обсуждения", "A_new_owner_will_be_assigned_automatically_to__count__room": "Новый владелец будет автоматически назначен на {{count}} чатов.", "A_new_owner_will_be_assigned_automatically_to__count__rooms": "Новый владелец будет автоматически назначен на {{count}} чатов.", "Accessibility_statement": "Заявление о доступности", diff --git a/app/i18n/locales/sl-SI.json b/app/i18n/locales/sl-SI.json index eb977ef911..747e38b738 100644 --- a/app/i18n/locales/sl-SI.json +++ b/app/i18n/locales/sl-SI.json @@ -2,7 +2,6 @@ "__count__empty_room_will_be_removed_automatically": "{{count}} prazna soba bo izbrisana.", "__count__empty_rooms_will_be_removed_automatically": "{{count}} praznih sob bo izbrisanih.", "1_person_reacted": "1 oseba se je odzvala", - "A_meaningful_name_for_the_discussion_room": "Pomenljivo ime za pogovorno sobo", "A_new_owner_will_be_assigned_automatically_to__count__room": "Novi lastnik bo samodejno dodeljen {{count}} sobi.", "A_new_owner_will_be_assigned_automatically_to__count__rooms": "Novi lastnik bo samodejno dodeljen {{count}} sobam.", "Accessibility_statement": "Izjava o dostopnosti", diff --git a/app/i18n/locales/sv.json b/app/i18n/locales/sv.json index d2bd0cfde8..f9199a6a26 100644 --- a/app/i18n/locales/sv.json +++ b/app/i18n/locales/sv.json @@ -2,7 +2,6 @@ "__count__empty_room_will_be_removed_automatically": "{{count}} tomt rum tas bort.", "__count__empty_rooms_will_be_removed_automatically": "{{count}} tomma rum tas bort.", "1_person_reacted": "1 person reagerade", - "A_meaningful_name_for_the_discussion_room": "Ett beskrivande namn på diskussionsrummet", "A_new_owner_will_be_assigned_automatically_to__count__room": "En ny ägare utses automatiskt för {{count}} rum.", "A_new_owner_will_be_assigned_automatically_to__count__rooms": "En ny ägare utses automatiskt för {{count}} rum.", "Accessibility_statement": "Tillgänglighetsredogörelse", diff --git a/app/i18n/locales/ta-IN.json b/app/i18n/locales/ta-IN.json index 0dec3e7cd5..e6402de14e 100644 --- a/app/i18n/locales/ta-IN.json +++ b/app/i18n/locales/ta-IN.json @@ -2,7 +2,6 @@ "__count__empty_room_will_be_removed_automatically": "{{count}} காலிக அறை தானாக நீக்கப்படும்.", "__count__empty_rooms_will_be_removed_automatically": "{{count}} காலிக அறைகள் தானாக நீக்கப்படும்.", "1_person_reacted": "1 பேர் பின்னால் பதில் செய்துள்ளனர்", - "A_meaningful_name_for_the_discussion_room": "கலந்துரை அறைக்கு ஒரு அர்த்தமுள்ள பெயர்", "A_new_owner_will_be_assigned_automatically_to__count__room": "{{count}} அறைக்கு புதிய உரிமையாளர் தானாகவே முடிந்துவிடப்படும்.", "A_new_owner_will_be_assigned_automatically_to__count__rooms": "{{count}} அறைகளுக்கு புதிய உரிமையாளர் தானாகவே முடிந்துவிடப்படும்.", "accept": "ஏற்றுக்கொள்", diff --git a/app/i18n/locales/te-IN.json b/app/i18n/locales/te-IN.json index 732998651f..70d0947be5 100644 --- a/app/i18n/locales/te-IN.json +++ b/app/i18n/locales/te-IN.json @@ -2,7 +2,6 @@ "__count__empty_room_will_be_removed_automatically": "{{count}} ఖాళీ కొరకు స్వయంగా తొలగిపోతాయి.", "__count__empty_rooms_will_be_removed_automatically": "{{count}} ఖాళీ కొరకులు స్వయంగా తొలగిపోతాయి.", "1_person_reacted": "1 వ్యక్తి ప్రతిక్రియించింది", - "A_meaningful_name_for_the_discussion_room": "చర్చా కొరకు ఒక అర్థపూర్ణమైన పేరు", "A_new_owner_will_be_assigned_automatically_to__count__room": "కొత్త యజమాని స్వయంగా నియమించబడుతుంది {{count}} అంగడాయినందు.", "A_new_owner_will_be_assigned_automatically_to__count__rooms": "కొత్త యజమాని స్వయంగా నియమించబడుతుంది {{count}} అంగడులకు.", "accept": "అంగీకరించు", diff --git a/app/i18n/locales/tr.json b/app/i18n/locales/tr.json index 62fd7d137d..b2e36b3fc9 100644 --- a/app/i18n/locales/tr.json +++ b/app/i18n/locales/tr.json @@ -1,6 +1,5 @@ { "1_person_reacted": "1 kişi tepki verdi.", - "A_meaningful_name_for_the_discussion_room": "Tartışma odası için anlamlı bir isim", "Accessibility_statement": "Erişilebilirlik beyanı", "Actions": "İşlemler", "Activity": "Etkinlik", diff --git a/app/i18n/locales/zh-CN.json b/app/i18n/locales/zh-CN.json index ccf33a6154..8cafbabcb3 100644 --- a/app/i18n/locales/zh-CN.json +++ b/app/i18n/locales/zh-CN.json @@ -1,6 +1,5 @@ { "1_person_reacted": "1 人回复了", - "A_meaningful_name_for_the_discussion_room": "取一个有意义的讨论区的名称", "Accessibility_statement": "无障碍声明", "Actions": "操作", "Activity": "按活动时间排列", diff --git a/app/i18n/locales/zh-TW.json b/app/i18n/locales/zh-TW.json index 73b322e1b1..36e2ccbd3b 100644 --- a/app/i18n/locales/zh-TW.json +++ b/app/i18n/locales/zh-TW.json @@ -1,6 +1,5 @@ { "1_person_reacted": "1 人回覆了", - "A_meaningful_name_for_the_discussion_room": "取一個有意義的討論區名稱", "Accessibility_statement": "无障碍声明", "Actions": "操作", "Activity": "以活動時間排序", diff --git a/app/views/CreateDiscussionView/SelectChannel.tsx b/app/views/CreateDiscussionView/SelectChannel.tsx index b0f879792e..44c0fe1176 100644 --- a/app/views/CreateDiscussionView/SelectChannel.tsx +++ b/app/views/CreateDiscussionView/SelectChannel.tsx @@ -18,8 +18,7 @@ const SelectChannel = ({ onChannelSelect, initial, blockUnauthenticatedAccess, - serverVersion, - required + serverVersion }: ICreateDiscussionViewSelectChannel): React.ReactElement => { const [channels, setChannels] = useState([]); const { colors } = useTheme(); @@ -56,10 +55,10 @@ const SelectChannel = ({ }); return ( - + {I18n.t('Parent_channel_or_group')}{' '} - {required && ({I18n.t('Required')})} + ({I18n.t('Required')}) getChannels('')} - placeholder={{ text: `${I18n.t('Select_a_Channel')}` }} + placeholder={{ text: I18n.t('Select_a_Channel') }} /> ); diff --git a/app/views/CreateDiscussionView/SelectUsers.tsx b/app/views/CreateDiscussionView/SelectUsers.tsx index 4243ffb293..95665978d3 100644 --- a/app/views/CreateDiscussionView/SelectUsers.tsx +++ b/app/views/CreateDiscussionView/SelectUsers.tsx @@ -69,7 +69,7 @@ const SelectUsers = ({ text: { text: getRoomTitle(user) }, imageUrl: getAvatar(user) }))} - placeholder={{ text: `${I18n.t('Select_Users')}` }} + placeholder={{ text: I18n.t('Select_Users') }} context={BlockContext.FORM} multiselect /> diff --git a/app/views/CreateDiscussionView/index.tsx b/app/views/CreateDiscussionView/index.tsx index 2ac0f7de8c..507cbcbc78 100644 --- a/app/views/CreateDiscussionView/index.tsx +++ b/app/views/CreateDiscussionView/index.tsx @@ -143,7 +143,15 @@ class CreateDiscussionView extends React.Component{I18n.t('Discussion_Desc')} + diff --git a/app/views/CreateDiscussionView/styles.ts b/app/views/CreateDiscussionView/styles.ts index 4e49ba27f1..4779251300 100644 --- a/app/views/CreateDiscussionView/styles.ts +++ b/app/views/CreateDiscussionView/styles.ts @@ -17,7 +17,7 @@ export default StyleSheet.create({ ...sharedStyles.textSemibold }, inputStyle: { - marginBottom: 16 + marginBottom: 0 }, description: { lineHeight: 24,