浏览代码

fix: Add different text when disablePolls is enabled/disabled (#9900)

* Add different text when disablePolls is enabled/disabled #9890

* Add different text when disablePolls is enabled/disabled v2 #9890
master
dimitardelchev93 3 年前
父节点
当前提交
11a86a9383
没有帐户链接到提交者的电子邮件
共有 60 个文件被更改,包括 209 次插入78 次删除
  1. 4
    2
      lang/main-af.json
  2. 3
    1
      lang/main-ar.json
  3. 3
    1
      lang/main-be.json
  4. 3
    1
      lang/main-bg.json
  5. 3
    1
      lang/main-ca.json
  6. 3
    1
      lang/main-cs.json
  7. 3
    1
      lang/main-da.json
  8. 3
    1
      lang/main-de.json
  9. 3
    1
      lang/main-el.json
  10. 3
    1
      lang/main-enGB.json
  11. 3
    1
      lang/main-eo.json
  12. 3
    1
      lang/main-es.json
  13. 3
    1
      lang/main-esUS.json
  14. 3
    1
      lang/main-et.json
  15. 3
    1
      lang/main-eu.json
  16. 3
    1
      lang/main-fa.json
  17. 4
    2
      lang/main-fi.json
  18. 8
    6
      lang/main-fr.json
  19. 3
    1
      lang/main-frCA.json
  20. 3
    1
      lang/main-gl.json
  21. 3
    1
      lang/main-he.json
  22. 3
    1
      lang/main-hi.json
  23. 4
    2
      lang/main-hr.json
  24. 3
    1
      lang/main-hu.json
  25. 4
    2
      lang/main-hy.json
  26. 3
    1
      lang/main-id.json
  27. 3
    1
      lang/main-is.json
  28. 3
    1
      lang/main-it.json
  29. 3
    1
      lang/main-ja.json
  30. 3
    1
      lang/main-kab.json
  31. 3
    1
      lang/main-ko.json
  32. 3
    1
      lang/main-lt.json
  33. 3
    1
      lang/main-lv.json
  34. 3
    1
      lang/main-ml.json
  35. 3
    1
      lang/main-mn.json
  36. 3
    1
      lang/main-mr.json
  37. 3
    1
      lang/main-nb.json
  38. 3
    1
      lang/main-nl.json
  39. 3
    1
      lang/main-oc.json
  40. 3
    1
      lang/main-pl.json
  41. 3
    1
      lang/main-pt.json
  42. 3
    1
      lang/main-ptBR.json
  43. 3
    1
      lang/main-ro.json
  44. 3
    1
      lang/main-ru.json
  45. 3
    1
      lang/main-sc.json
  46. 3
    1
      lang/main-sk.json
  47. 3
    1
      lang/main-sl.json
  48. 3
    1
      lang/main-sq.json
  49. 3
    1
      lang/main-sv.json
  50. 3
    1
      lang/main-te.json
  51. 4
    3
      lang/main-tr.json
  52. 3
    1
      lang/main-uk.json
  53. 3
    1
      lang/main-vi.json
  54. 3
    1
      lang/main-zhCN.json
  55. 3
    1
      lang/main-zhTW.json
  56. 4
    2
      lang/main.json
  57. 8
    3
      react/features/chat/components/web/Chat.js
  58. 8
    3
      react/features/chat/components/web/ChatDialog.js
  59. 7
    2
      react/features/chat/components/web/ChatDialogHeader.js
  60. 7
    2
      react/features/chat/components/web/DisplayNameForm.js

+ 4
- 2
lang/main-af.json 查看文件

@@ -49,9 +49,11 @@
49 49
         "messagebox": "",
50 50
         "nickname": {
51 51
             "popover": "Kies ’n bynaam",
52
-            "title": ""
52
+            "title": "",
53
+            "titleWithPolls": ""
53 54
         },
54
-        "title": ""
55
+        "title": "",
56
+        "titleWithPolls": ""
55 57
     },
56 58
     "connectingOverlay": {
57 59
         "joiningRoom": ""

+ 3
- 1
lang/main-ar.json 查看文件

@@ -68,10 +68,12 @@
68 68
         "noMessagesMessage": "لا يوجد أي رسالة في الاجتماع بعد. ابدأ محادثة هنا.",
69 69
         "nickname": {
70 70
             "popover": "اختر لقبًا",
71
-            "title": "اكتب لقبًا لاعتماده في المحادثة"
71
+            "title": "اكتب لقبًا لاعتماده في المحادثة",
72
+            "titleWithPolls": "اكتب لقبًا لاعتماده في المحادثة"
72 73
         },
73 74
         "privateNotice": "أرسل رسالة خاصة إلى {{recipient}}",
74 75
         "title": "محادثة",
76
+        "titleWithPolls": "محادثة",
75 77
         "you": "أنت"
76 78
     },
77 79
     "chromeExtensionBanner": {

+ 3
- 1
lang/main-be.json 查看文件

@@ -53,10 +53,12 @@
53 53
         "noMessagesMessage": "У канферэнцыі пакуль няма ніякіх паведамленняў. Пачніце размову!",
54 54
         "nickname": {
55 55
             "popover": "Калі ласка, пазначце імя",
56
-            "title": "Калі ласка, увядзіце імя для выкарыстання чата"
56
+            "title": "Калі ласка, увядзіце імя для выкарыстання чата",
57
+            "titleWithPolls": "Калі ласка, увядзіце імя для выкарыстання чата"
57 58
         },
58 59
         "privateNotice": "Асабістае паведамленне карыстальнiку {{recipient}}",
59 60
         "title": "Чат",
61
+        "titleWithPolls": "Чат",
60 62
         "you": "Вы"
61 63
     },
62 64
     "chromeExtensionBanner": {

+ 3
- 1
lang/main-bg.json 查看文件

@@ -65,10 +65,12 @@
65 65
         "noMessagesMessage": "Все още няма съобщения в срещата. Започнете разговор тук!",
66 66
         "nickname": {
67 67
             "popover": "Избор на име",
68
-            "title": "Въведете име, за да обменяте съобщения"
68
+            "title": "Въведете име, за да обменяте съобщения",
69
+            "titleWithPolls": "Въведете име, за да обменяте съобщения"
69 70
         },
70 71
         "privateNotice": "Лично съобщение до {{recipient}}",
71 72
         "title": "Текстови съобщения",
73
+        "titleWithPolls": "Текстови съобщения",
72 74
         "you": "вие"
73 75
     },
74 76
     "chromeExtensionBanner": {

+ 3
- 1
lang/main-ca.json 查看文件

@@ -53,10 +53,12 @@
53 53
         "noMessagesMessage": "Encara no hi ha cap missatge en aquesta reunió. Comenceu una conversa aquí!",
54 54
         "nickname": {
55 55
             "popover": "Trieu un sobrenom",
56
-            "title": "Introduïu un sobrenom per a usar el xat"
56
+            "title": "Introduïu un sobrenom per a usar el xat",
57
+            "titleWithPolls": "Introduïu un sobrenom per a usar el xat"
57 58
         },
58 59
         "privateNotice": "Missatge privat per a {{recipient}}",
59 60
         "title": "Xat",
61
+        "titleWithPolls": "Xat",
60 62
         "you": "vós"
61 63
     },
62 64
     "chromeExtensionBanner": {

+ 3
- 1
lang/main-cs.json 查看文件

@@ -67,11 +67,13 @@
67 67
         "messagebox": "Napište zprávu",
68 68
         "nickname": {
69 69
             "popover": "Zvolte si přezdívku",
70
-            "title": "Vložte přezdívku, abyste mohl/a používat zprávy"
70
+            "title": "Vložte přezdívku, abyste mohl/a používat zprávy",
71
+            "titleWithPolls": "Vložte přezdívku, abyste mohl/a používat zprávy"
71 72
         },
72 73
         "noMessagesMessage": "V setkání zatím nejsou žádné zprávy. Tady můžete začít konverzaci!",
73 74
         "privateNotice": "Soukromá zpráva pro {{recipient}}",
74 75
         "title": "Zprávy",
76
+        "titleWithPolls": "Zprávy",
75 77
         "you": "vy"
76 78
     },
77 79
     "chromeExtensionBanner": {

+ 3
- 1
lang/main-da.json 查看文件

@@ -54,10 +54,12 @@
54 54
         "noMessagesMessage": "Der er ikke nogen beskeder i mødet endnu. Skriv noget!",
55 55
         "nickname": {
56 56
             "popover": "Vælg dit navn/alias",
57
-            "title": "Indtast et navn/alias for at deltage i chatten"
57
+            "title": "Indtast et navn/alias for at deltage i chatten",
58
+            "titleWithPolls": "Indtast et navn/alias for at deltage i chatten"
58 59
         },
59 60
         "privateNotice": "Privat besked til {{recipient}}",
60 61
         "title": "Chat",
62
+        "titleWithPolls": "Chat",
61 63
         "you": "Dig"
62 64
     },
63 65
     "chromeExtensionBanner": {

+ 3
- 1
lang/main-de.json 查看文件

@@ -66,10 +66,12 @@
66 66
         "noMessagesMessage": "Es gibt noch keine Nachricht in dieser Konferenz. Starten Sie hier eine Unterhaltung!",
67 67
         "nickname": {
68 68
             "popover": "Wähle einen Alias",
69
-            "title": "Geben Sie einen Alias zum Chatten ein"
69
+            "title": "Geben Sie einen Alias zum Chatten ein",
70
+            "titleWithPolls": "Geben Sie einen Alias zum Chatten ein"
70 71
         },
71 72
         "privateNotice": "Private Nachricht an {{recipient}}",
72 73
         "title": "Chatten",
74
+        "titleWithPolls": "Chatten",
73 75
         "you": "Sie",
74 76
         "message": "Nachricht",
75 77
         "messageAccessibleTitle": "{{user}} sagt:",

+ 3
- 1
lang/main-el.json 查看文件

@@ -68,10 +68,12 @@
68 68
         "noMessagesMessage": "Δεν υπάρχουν μηνύματα στη συνάντηση ακόμα. Ξεκινήστε μια συζήτηση εδώ!",
69 69
         "nickname": {
70 70
             "popover": "Επιλέξτε ένα ψευδώνυμο",
71
-            "title": "Εισάγετε ένα ψευδώνυμο για τη χρήση της συνομιλίας"
71
+            "title": "Εισάγετε ένα ψευδώνυμο για τη χρήση της συνομιλίας",
72
+            "titleWithPolls": "Εισάγετε ένα ψευδώνυμο για τη χρήση της συνομιλίας"
72 73
         },
73 74
         "privateNotice": "Ιδιωτικό μηνύμα στον / στην {recipient}}",
74 75
         "title": "Συνομιλία",
76
+        "titleWithPolls": "Συνομιλία",
75 77
         "you": "Εσείς"
76 78
     },
77 79
     "chromeExtensionBanner": {

+ 3
- 1
lang/main-enGB.json 查看文件

@@ -50,9 +50,11 @@
50 50
         "messagebox": "Type a message",
51 51
         "nickname": {
52 52
             "popover": "Choose a nickname",
53
-            "title": "Enter a nickname to use chat"
53
+            "title": "Enter a nickname to use chat",
54
+            "titleWithPolls": "Enter a nickname to use chat"
54 55
         },
55 56
         "title": "Chat",
57
+        "titleWithPolls": "Chat",
56 58
         "you": "",
57 59
         "privateNotice": "",
58 60
         "noMessagesMessage": "",

+ 3
- 1
lang/main-eo.json 查看文件

@@ -53,10 +53,12 @@
53 53
         "noMessagesMessage": "Ankoraŭ ne estas mesaĝoj en la kunveno. Komencu konversation ĉi tie!",
54 54
         "nickname": {
55 55
             "popover": "Elektu kaŝnomon",
56
-            "title": "Elektu kaŝnomon por uzi la babilejon"
56
+            "title": "Elektu kaŝnomon por uzi la babilejon",
57
+            "titleWithPolls": "Elektu kaŝnomon por uzi la babilejon"
57 58
         },
58 59
         "privateNotice": "Privata mesaĝo al {{recipient}}",
59 60
         "title": "Babilejo",
61
+        "titleWithPolls": "Babilejo",
60 62
         "you": "vi"
61 63
     },
62 64
     "chromeExtensionBanner": {

+ 3
- 1
lang/main-es.json 查看文件

@@ -68,10 +68,12 @@
68 68
         "noMessagesMessage": "No hay mensajes en la reunión. ¡Inicie una conversación!",
69 69
         "nickname": {
70 70
             "popover": "Selecciona un apodo",
71
-            "title": "Introduce un apodo para usar el chat"
71
+            "title": "Introduce un apodo para usar el chat",
72
+            "titleWithPolls": "Introduce un apodo para usar el chat"
72 73
         },
73 74
         "privateNotice": "Mensaje privado para {{recipient}}",
74 75
         "title": "Chat",
76
+        "titleWithPolls": "Chat",
75 77
         "you": "usted"
76 78
     },
77 79
     "chromeExtensionBanner": {

+ 3
- 1
lang/main-esUS.json 查看文件

@@ -68,10 +68,12 @@
68 68
         "noMessagesMessage": "No hay mensajes en la reunión. ¡Inicie una conversación!",
69 69
         "nickname": {
70 70
             "popover": "Selecciona un apodo",
71
-            "title": "Introduce un apodo para usar el chat"
71
+            "title": "Introduce un apodo para usar el chat",
72
+            "titleWithPolls": "Introduce un apodo para usar el chat"
72 73
         },
73 74
         "privateNotice": "Mensaje privado para {{recipient}}",
74 75
         "title": "Chat",
76
+        "titleWithPolls": "Chat",
75 77
         "you": "usted"
76 78
     },
77 79
     "chromeExtensionBanner": {

+ 3
- 1
lang/main-et.json 查看文件

@@ -53,10 +53,12 @@
53 53
         "noMessagesMessage": "Kirjavahetust pole veel alustatud. Alusta kirjavahetust siin!",
54 54
         "nickname": {
55 55
             "popover": "Sisesta nimi",
56
-            "title": "Sisesta nimi, et kõnega alustada"
56
+            "title": "Sisesta nimi, et kõnega alustada",
57
+            "titleWithPolls": "Sisesta nimi, et kõnega alustada"
57 58
         },
58 59
         "privateNotice": "Privaatsõnum kasutajale {{recipient}}",
59 60
         "title": "Kõne",
61
+        "titleWithPolls": "Kõne",
60 62
         "you": "you"
61 63
     },
62 64
     "chromeExtensionBanner": {

+ 3
- 1
lang/main-eu.json 查看文件

@@ -64,10 +64,12 @@
64 64
         "noMessagesMessage": "Bileran oraindik mezurik ez dago. Hasi elkarrizketa hemen!",
65 65
         "nickname": {
66 66
             "popover": "Aukeratu goitizena",
67
-            "title": "Sartu goitizena txata erabiltzeko"
67
+            "title": "Sartu goitizena txata erabiltzeko",
68
+            "titleWithPolls": "Sartu goitizena txata erabiltzeko"
68 69
         },
69 70
         "privateNotice": "Mezu pribatua {{recipient}}(e)ri",
70 71
         "title": "Txata",
72
+        "titleWithPolls": "Txata",
71 73
         "you": "zu",
72 74
         "message": "Mezua",
73 75
         "messageAccessibleTitle": "{{user}} partaideak zera dio:",

+ 3
- 1
lang/main-fa.json 查看文件

@@ -68,10 +68,12 @@
68 68
         "noMessagesMessage": "هیچ گفتگویی در جلسه وجود ندارد، گفتگو را شما آعاز کنید!",
69 69
         "nickname": {
70 70
             "popover": "نام نمایشی خود را وارد نمایید",
71
-            "title": "نام نمایشی خود را در گفتگو وارد نمایید"
71
+            "title": "نام نمایشی خود را در گفتگو وارد نمایید",
72
+            "titleWithPolls": "نام نمایشی خود را در گفتگو وارد نمایید"
72 73
         },
73 74
         "privateNotice": "پیام خصوصی به {{recipient}}",
74 75
         "title": "گفتگو",
76
+        "titleWithPolls": "گفتگو",
75 77
         "you": "شما"
76 78
     },
77 79
     "chromeExtensionBanner": {

+ 4
- 2
lang/main-fi.json 查看文件

@@ -49,9 +49,11 @@
49 49
         "messagebox": "Kirjoita viesti",
50 50
         "nickname": {
51 51
             "popover": "Valitse lempinimi",
52
-            "title": "Anna chatissä käytettävä lempinimi"
52
+            "title": "Anna chatissä käytettävä lempinimi",
53
+            "titleWithPolls": "Anna chatissä käytettävä lempinimi"
53 54
         },
54
-        "title": "Chatti"
55
+        "title": "Chatti",
56
+        "titleWithPolls": "Chatti"
55 57
     },
56 58
     "connectingOverlay": {
57 59
         "joiningRoom": "Yhdistetään kokoukseen…"

+ 8
- 6
lang/main-fr.json 查看文件

@@ -66,7 +66,8 @@
66 66
     "noMessagesMessage": "Il n'y a pas encore de messages dans cette réunion. Démarrez une conversation ici !",
67 67
     "nickname": {
68 68
       "popover": "Choisissez un pseudonyme",
69
-      "title": "Entrez un pseudonyme pour utiliser le chat et les sondages"
69
+      "title": "Entrez un pseudonyme pour utiliser le chat",
70
+      "titleWithPolls": "Entrez un pseudonyme pour utiliser le chat et les sondages"
70 71
     },
71 72
     "privateNotice": "Message privé à {{recipient}}",
72 73
     "message": "Message",
@@ -74,11 +75,12 @@
74 75
     "messageAccessibleTitleMe": "Je dis: ",
75 76
     "smileysPanel": "Panneaux des Émojis",
76 77
     "tabs": {
77
-            "chat": "Chat",
78
-            "polls": "Sondages"
79
-        },
80
-        "title": "Chat et Sondages",
81
-        "you": "vous"
78
+      "chat": "Chat",
79
+      "polls": "Sondages"
80
+    },
81
+    "title": "Chat",
82
+    "titleWithPolls": "Chat et Sondages",
83
+    "you": "vous"
82 84
   },
83 85
   "chromeExtensionBanner": {
84 86
     "installExtensionText": "Installer l'extension pour l'intégration de Google Calendar et Office 365",

+ 3
- 1
lang/main-frCA.json 查看文件

@@ -53,10 +53,12 @@
53 53
         "noMessagesMessage": "Il n'y a pas encore de messages dans cette réunion. Démarrez une conversation ici !",
54 54
         "nickname": {
55 55
             "popover": "Choisissez un nom d'affichage",
56
-            "title": "Entrer un nom d'affichage pour utiliser le clavardage"
56
+            "title": "Entrer un nom d'affichage pour utiliser le clavardage",
57
+            "titleWithPolls": "Entrer un nom d'affichage pour utiliser le clavardage"
57 58
         },
58 59
         "privateNotice": "Message privé à {{recipient}}",
59 60
         "title": "Clavardage",
61
+        "titleWithPolls": "Clavardage",
60 62
         "you": "vous"
61 63
     },
62 64
     "connectingOverlay": {

+ 3
- 1
lang/main-gl.json 查看文件

@@ -53,10 +53,12 @@
53 53
         "noMessagesMessage": "Aínda non hai mensaxes na reunión. Comece unha conversación aquí!",
54 54
         "nickname": {
55 55
             "popover": "Escolla un alcume",
56
-            "title": "Escriba un alcume para utilizar no chat"
56
+            "title": "Escriba un alcume para utilizar no chat",
57
+            "titleWithPolls": "Escriba un alcume para utilizar no chat"
57 58
         },
58 59
         "privateNotice": "Mensaxe privada para {{recipient}}",
59 60
         "title": "Chat",
61
+        "titleWithPolls": "Chat",
60 62
         "you": "vostede"
61 63
     },
62 64
     "chromeExtensionBanner": {

+ 3
- 1
lang/main-he.json 查看文件

@@ -53,10 +53,12 @@
53 53
         "noMessagesMessage": "אין עדיין הודעות בפגישה. התחל שיחה כאן!",
54 54
         "nickname": {
55 55
             "popover": "בחר שם משתמש",
56
-            "title": "נא להזין שם משתמש בכדי להשתמש בצ'אט"
56
+            "title": "נא להזין שם משתמש בכדי להשתמש בצ'אט",
57
+            "titleWithPolls": "נא להזין שם משתמש בכדי להשתמש בצ'אט"
57 58
         },
58 59
         "privateNotice": "הודעה פרטית אל {{recipient}}",
59 60
         "title": "צ'אט",
61
+        "titleWithPolls": "צ'אט",
60 62
         "you": "אתה"
61 63
     },
62 64
     "chromeExtensionBanner": {

+ 3
- 1
lang/main-hi.json 查看文件

@@ -70,10 +70,12 @@
70 70
         "noMessagesMessage": "अभी तक मीटिंग में कोई संदेश नहीं आया है। वार्तालाप प्रारंभ करें!",
71 71
         "nickname": {
72 72
             "popover": "एक उपनाम चुनें",
73
-            "title": "चैट का उपयोग करने के लिए एक उपनाम दर्ज करें"
73
+            "title": "चैट का उपयोग करने के लिए एक उपनाम दर्ज करें",
74
+            "titleWithPolls": "चैट का उपयोग करने के लिए एक उपनाम दर्ज करें"
74 75
         },
75 76
         "privateNotice": "{{recipient}} के लिए निजी संदेश",
76 77
         "title": "चैट",
78
+        "titleWithPolls": "चैट",
77 79
         "you": "आप"
78 80
     },
79 81
     "chromeExtensionBanner": {

+ 4
- 2
lang/main-hr.json 查看文件

@@ -49,9 +49,11 @@
49 49
         "messagebox": "",
50 50
         "nickname": {
51 51
             "popover": "Odaberite nadimak",
52
-            "title": "Unesite nadimak za čavrljanje"
52
+            "title": "Unesite nadimak za čavrljanje",
53
+            "titleWithPolls": "Unesite nadimak za čavrljanje"
53 54
         },
54
-        "title": "Čavrljanje"
55
+        "title": "Čavrljanje",
56
+        "titleWithPolls": "Čavrljanje"
55 57
     },
56 58
     "connectingOverlay": {
57 59
         "joiningRoom": ""

+ 3
- 1
lang/main-hu.json 查看文件

@@ -53,10 +53,12 @@
53 53
         "noMessagesMessage": "A találkozón még nincsenek üzenetek. Itt kezdhet beszélgetést!",
54 54
         "nickname": {
55 55
             "popover": "Becenév kiválasztása",
56
-            "title": "Adjon meg egy becenevet a csevegés számára"
56
+            "title": "Adjon meg egy becenevet a csevegés számára",
57
+            "titleWithPolls": "Adjon meg egy becenevet a csevegés számára"
57 58
         },
58 59
         "privateNotice": "Privát üzenet a felhasználónak: {{recipient}}",
59 60
         "title": "Csevegés",
61
+        "titleWithPolls": "Csevegés",
60 62
         "you": "neked"
61 63
     },
62 64
     "connectingOverlay": {

+ 4
- 2
lang/main-hy.json 查看文件

@@ -49,9 +49,11 @@
49 49
         "messagebox": "",
50 50
         "nickname": {
51 51
             "popover": "Ընտրեք մականուն",
52
-            "title": ""
52
+            "title": "",
53
+            "titleWithPolls": ""
53 54
         },
54
-        "title": ""
55
+        "title": "",
56
+        "titleWithPolls": ""
55 57
     },
56 58
     "connectingOverlay": {
57 59
         "joiningRoom": ""

+ 3
- 1
lang/main-id.json 查看文件

@@ -53,10 +53,12 @@
53 53
         "noMessagesMessage": "There are no messages in the meeting yet. Start a conversation here!",
54 54
         "nickname": {
55 55
             "popover": "Choose a nickname",
56
-            "title": "Enter a nickname to use chat"
56
+            "title": "Enter a nickname to use chat",
57
+            "titleWithPolls": "Enter a nickname to use chat"
57 58
         },
58 59
         "privateNotice": "Private message to {{recipient}}",
59 60
         "title": "Chat",
61
+        "titleWithPolls": "Chat",
60 62
         "you": "you"
61 63
     },
62 64
     "chromeExtensionBanner": {

+ 3
- 1
lang/main-is.json 查看文件

@@ -53,10 +53,12 @@
53 53
         "noMessagesMessage": "Það eru ennþá engin skilaboð á fundinum. Byrjaðu umræðuna hér!",
54 54
         "nickname": {
55 55
             "popover": "Veldu gælunafn",
56
-            "title": "Settu inn gælunafn/stuttnefni til að nota við spjall"
56
+            "title": "Settu inn gælunafn/stuttnefni til að nota við spjall",
57
+            "titleWithPolls": "Settu inn gælunafn/stuttnefni til að nota við spjall"
57 58
         },
58 59
         "privateNotice": "Einkaskilaboð til {{recipient}}",
59 60
         "title": "Spjall",
61
+        "titleWithPolls": "Spjall",
60 62
         "you": "þú"
61 63
     },
62 64
     "chromeExtensionBanner": {

+ 3
- 1
lang/main-it.json 查看文件

@@ -70,10 +70,12 @@
70 70
         "noMessagesMessage": "Non ci sono ancora messaggi nella riunione. Comincia una conversazione, qui!",
71 71
         "nickname": {
72 72
             "popover": "Scegli un nickname",
73
-            "title": "Inserire un nickname per utilizzare la conversazione"
73
+            "title": "Inserire un nickname per utilizzare la conversazione",
74
+            "titleWithPolls": "Inserire un nickname per utilizzare la conversazione"
74 75
         },
75 76
         "privateNotice": "Messaggio privato per {{recipient}}",
76 77
         "title": "Conversazione",
78
+        "titleWithPolls": "Conversazione",
77 79
         "you": "tu"
78 80
     },
79 81
     "chromeExtensionBanner": {

+ 3
- 1
lang/main-ja.json 查看文件

@@ -72,10 +72,12 @@
72 72
         "noMessagesMessage": "このミーティングにはまだメッセージがありません。会話を開始してください!",
73 73
         "nickname": {
74 74
             "popover": "ニックネームを入力",
75
-            "title": "チャットで使用するニックネームを入力してください"
75
+            "title": "チャットで使用するニックネームを入力してください",
76
+            "titleWithPolls": "チャットで使用するニックネームを入力してください"
76 77
         },
77 78
         "privateNotice": "{{recipient}} へのプライベートメッセージ",
78 79
         "title": "チャット",
80
+        "titleWithPolls": "チャット",
79 81
         "you": "あなた"
80 82
     },
81 83
     "chromeExtensionBanner": {

+ 3
- 1
lang/main-kab.json 查看文件

@@ -63,9 +63,11 @@
63 63
         "messagebox": "Aru izen",
64 64
         "nickname": {
65 65
             "popover": "Fren meffer isem",
66
-            "title": "Sekcem meffer isem i useqdec n usqerdec"
66
+            "title": "Sekcem meffer isem i useqdec n usqerdec",
67
+            "titleWithPolls": "Sekcem meffer isem i useqdec n usqerdec"
67 68
         },
68 69
         "title": "Asqerdec",
70
+        "titleWithPolls": "Asqerdec",
69 71
         "noMessagesMessage": "Ulac iznan akka tura deg temlilit. Bdu adiwenni da!",
70 72
         "you": "kečč·kemm",
71 73
         "fieldPlaceHolder": "Aru izen-inek·inem da"

+ 3
- 1
lang/main-ko.json 查看文件

@@ -69,10 +69,12 @@
69 69
         "noMessagesMessage": "아직 회의에 메시지가 없습니다. 여기서 대화를 시작하세요!",
70 70
         "nickname": {
71 71
             "popover": "닉네임을 선택하세요",
72
-            "title": "채팅에서 사용할 닉네임을 입력하세요"
72
+            "title": "채팅에서 사용할 닉네임을 입력하세요",
73
+            "titleWithPolls": "채팅에서 사용할 닉네임을 입력하세요"
73 74
         },
74 75
         "privateNotice": "{{recipient}}에게 보내는 비공개 메시지",
75 76
         "title": "채팅",
77
+        "titleWithPolls": "채팅",
76 78
         "you": "당신"
77 79
     },
78 80
     "chromeExtensionBanner": {

+ 3
- 1
lang/main-lt.json 查看文件

@@ -53,10 +53,12 @@
53 53
         "noMessagesMessage": "Susitikime dar nėra pranešimų. Pradėkite pokalbį čia!",
54 54
         "nickname": {
55 55
             "popover": "Pridėkite slapyvardį",
56
-            "title": "Norėdami naudoti pokalbį, įveskite slapyvardį"
56
+            "title": "Norėdami naudoti pokalbį, įveskite slapyvardį",
57
+            "titleWithPolls": "Norėdami naudoti pokalbį, įveskite slapyvardį"
57 58
         },
58 59
         "privateNotice": "Asmeninis pranešimas {{gavėjui}}",
59 60
         "title": "Pokalbis",
61
+        "titleWithPolls": "Pokalbis",
60 62
         "you": "Jūs"
61 63
     },
62 64
     "chromeExtensionBanner": {

+ 3
- 1
lang/main-lv.json 查看文件

@@ -53,10 +53,12 @@
53 53
         "noMessagesMessage": "Sapulcē pagaidām nav nevienas ziņas. Uzsāciet saraksti!",
54 54
         "nickname": {
55 55
             "popover": "Izvēlieties vārdu",
56
-            "title": "Ierakstiet vārdu izmantošanai tērziņā"
56
+            "title": "Ierakstiet vārdu izmantošanai tērziņā",
57
+            "titleWithPolls": "Ierakstiet vārdu izmantošanai tērziņā"
57 58
         },
58 59
         "privateNotice": "Privāta ziņa/paziņojums lietotājam {{recipient}}",
59 60
         "title": "Tērzēšana",
61
+        "titleWithPolls": "Tērzēšana",
60 62
         "you": "mans vārds"
61 63
     },
62 64
     "chromeExtensionBanner": {

+ 3
- 1
lang/main-ml.json 查看文件

@@ -68,10 +68,12 @@
68 68
         "noMessagesMessage": "മീറ്റിംഗിൽ ഇതുവരെ മെസ്സേജുകളൊന്നുമില്ല. ഇവിടെ ഒരു സംഭാഷണം ആരംഭിക്കുക!",
69 69
         "nickname": {
70 70
             "popover": "ഒരു വിളിപ്പേര് തിരഞ്ഞെടുക്കുക",
71
-            "title": "ചാറ്റ് ഉപയോഗിക്കുന്നതിന് ഒരു വിളിപ്പേര് നൽകുക"
71
+            "title": "ചാറ്റ് ഉപയോഗിക്കുന്നതിന് ഒരു വിളിപ്പേര് നൽകുക",
72
+            "titleWithPolls": "ചാറ്റ് ഉപയോഗിക്കുന്നതിന് ഒരു വിളിപ്പേര് നൽകുക"
72 73
         },
73 74
         "privateNotice": " {{recipient}}-ലേക്കുള്ള സ്വകാര്യ സന്ദേശം",
74 75
         "title": "ചാറ്റ്",
76
+        "titleWithPolls": "ചാറ്റ്",
75 77
         "you": "നിങ്ങൾ"
76 78
     },
77 79
     "chromeExtensionBanner": {

+ 3
- 1
lang/main-mn.json 查看文件

@@ -53,10 +53,12 @@
53 53
         "noMessagesMessage": "Энэ хуралд ямар ч зурвас байхгүй. Эндээс зурвасаа эхлүүл!",
54 54
         "nickname": {
55 55
             "popover": "Нэр бичнэ үү",
56
-            "title": "Нэрээ оруулна уу"
56
+            "title": "Нэрээ оруулна уу",
57
+            "titleWithPolls": "Нэрээ оруулна уу"
57 58
         },
58 59
         "privateNotice": "Хувийн зурвас {{recipient}}",
59 60
         "title": "Чат",
61
+        "titleWithPolls": "Чат",
60 62
         "you": "чи"
61 63
     },
62 64
     "chromeExtensionBanner": {

+ 3
- 1
lang/main-mr.json 查看文件

@@ -53,10 +53,12 @@
53 53
         "noMessagesMessage": "अद्याप मीटिंगमध्ये कोणतेही संदेश नाहीत. येथे संभाषण सुरू करा!",
54 54
         "nickname": {
55 55
             "popover": "टोपणनाव निवडा",
56
-            "title": "चॅट वापरण्यासाठी टोपणनाव प्रविष्ट करा"
56
+            "title": "चॅट वापरण्यासाठी टोपणनाव प्रविष्ट करा",
57
+            "titleWithPolls": "चॅट वापरण्यासाठी टोपणनाव प्रविष्ट करा"
57 58
         },
58 59
         "privateNotice": "यांना खाजगी संदेश{{recipient}}",
59 60
         "title": "गप्पा",
61
+        "titleWithPolls": "गप्पा",
60 62
         "you": "आपण"
61 63
     },
62 64
     "chromeExtensionBanner": {

+ 3
- 1
lang/main-nb.json 查看文件

@@ -46,9 +46,11 @@
46 46
         "messagebox": "Skriv en melding",
47 47
         "nickname": {
48 48
             "popover": "Velg et kallenavn",
49
-            "title": ""
49
+            "title": "",
50
+            "titleWithPolls": ""
50 51
         },
51 52
         "title": "",
53
+        "titleWithPolls": "",
52 54
         "messageTo": "Privat melding til {{recipient}}",
53 55
         "fieldPlaceHolder": "Skriv inn din melding her"
54 56
     },

+ 3
- 1
lang/main-nl.json 查看文件

@@ -69,10 +69,12 @@
69 69
         "noMessagesMessage": "Er zijn nog geen berichten in de vergadering. Begin hier een gesprek!",
70 70
         "nickname": {
71 71
             "popover": "Kies een bijnaam",
72
-            "title": "Voer een bijnaam in om chat te gebruiken"
72
+            "title": "Voer een bijnaam in om chat te gebruiken",
73
+            "titleWithPolls": "Voer een bijnaam in om chat te gebruiken"
73 74
         },
74 75
         "privateNotice": "Privébericht aan {{recipient}}",
75 76
         "title": "Chat",
77
+        "titleWithPolls": "Chat",
76 78
         "you": "u"
77 79
     },
78 80
     "chromeExtensionBanner": {

+ 3
- 1
lang/main-oc.json 查看文件

@@ -71,12 +71,14 @@
71 71
         "messageTo": "Messatge privat per {{recipient}}",
72 72
         "nickname": {
73 73
             "popover": "Causissètz un escais",
74
-            "title": "Picatz un escais-nom per utilizar la messatjariá"
74
+            "title": "Picatz un escais-nom per utilizar la messatjariá",
75
+            "titleWithPolls": "Picatz un escais-nom per utilizar la messatjariá"
75 76
         },
76 77
         "noMessagesMessage": "I a pas cap de messatge dins la conferéncia pel moment. Començat una conversacion aquí !",
77 78
         "privateNotice": "Messatge privat per {{recipient}}",
78 79
         "smileysPanel": "Panèl d’Emoji",
79 80
         "title": "Messatjariá",
81
+        "titleWithPolls": "Messatjariá",
80 82
         "you": "vos"
81 83
     },
82 84
     "chromeExtensionBanner": {

+ 3
- 1
lang/main-pl.json 查看文件

@@ -66,7 +66,8 @@
66 66
         "noMessagesMessage": "Aktualnie brak wiadomości w tym spotkaniu. Rozpocznij konwersację!",
67 67
         "nickname": {
68 68
             "popover": "Wybierz swój nick",
69
-            "title": "Wpisz swoją nazwę, aby użyć rozmowy"
69
+            "title": "Wpisz swoją nazwę, aby użyć rozmowy",
70
+            "titleWithPolls": "Wpisz swoją nazwę, aby użyć rozmowy"
70 71
         },
71 72
         "privateNotice": "Prywatna wiadomość do {{recipient}}",
72 73
         "message": "Wiadomość",
@@ -78,6 +79,7 @@
78 79
             "polls": "Ankiety"
79 80
         },
80 81
         "title": "Rozmowa",
82
+        "titleWithPolls": "Rozmowa",
81 83
         "you": "Ty"
82 84
     },
83 85
     "chromeExtensionBanner": {

+ 3
- 1
lang/main-pt.json 查看文件

@@ -66,7 +66,8 @@
66 66
         "noMessagesMessage": "Ainda não há mensagens na reunião. Comece aqui uma conversa!",
67 67
         "nickname": {
68 68
             "popover": "Escolha um apelido",
69
-            "title": "Introduza um apelido para usar no chat e nas sondagens"
69
+            "title": "Introduza um apelido para usar no chat e nas sondagens",
70
+            "titleWithPolls": "Introduza um apelido para usar no chat e nas sondagens"
70 71
         },
71 72
         "privateNotice": "Mensagem privada para {{recipient}}",
72 73
         "message": "Mensagem",
@@ -78,6 +79,7 @@
78 79
             "polls": "Sondagens"
79 80
         },
80 81
         "title": "Chat e Sondagens",
82
+        "titleWithPolls": "Chat e Sondagens",
81 83
         "you": "você"
82 84
     },
83 85
     "chromeExtensionBanner": {

+ 3
- 1
lang/main-ptBR.json 查看文件

@@ -66,10 +66,12 @@
66 66
         "noMessagesMessage": "Não há mensagens na reunião ainda. Inicie uma conversa aqui!",
67 67
         "nickname": {
68 68
             "popover": "Escolha um apelido",
69
-            "title": "Digite um apelido para usar o bate-papo"
69
+            "title": "Digite um apelido para usar o bate-papo",
70
+            "titleWithPolls": "Digite um apelido para usar o bate-papo"
70 71
         },
71 72
         "privateNotice": "Mensagem privada para {{recipient}}",
72 73
         "title": "Bate-papo",
74
+        "titleWithPolls": "Bate-papo",
73 75
         "you": "você",
74 76
         "message": "Mensagem",
75 77
         "messageAccessibleTitle": "{{user}} disse:",

+ 3
- 1
lang/main-ro.json 查看文件

@@ -50,9 +50,11 @@
50 50
         "messagebox": "Scrieți mesajul",
51 51
         "nickname": {
52 52
             "popover": "Alegeți un pseudonim",
53
-            "title": "Introduceți un pseudonim pentru a conversa"
53
+            "title": "Introduceți un pseudonim pentru a conversa",
54
+            "titleWithPolls": "Introduceți un pseudonim pentru a conversa"
54 55
         },
55 56
         "title": "Apel video",
57
+        "titleWithPolls": "Apel video",
56 58
         "you": "",
57 59
         "privateNotice": "",
58 60
         "noMessagesMessage": "",

+ 3
- 1
lang/main-ru.json 查看文件

@@ -67,11 +67,13 @@
67 67
         "messagebox": "Введите сообщение",
68 68
         "nickname": {
69 69
             "popover": "Выберите имя",
70
-            "title": "Введите имя для использования чата"
70
+            "title": "Введите имя для использования чата",
71
+            "titleWithPolls": "Введите имя для использования чата"
71 72
         },
72 73
         "noMessagesMessage": "В конференции пока нет никаких сообщений. Начните разговор!",
73 74
         "privateNotice": "Личное сообщение пользователю {{recipient}}",
74 75
         "title": "Чат",
76
+        "titleWithPolls": "Чат",
75 77
         "you": "вы"
76 78
     },
77 79
     "chromeExtensionBanner": {

+ 3
- 1
lang/main-sc.json 查看文件

@@ -53,10 +53,12 @@
53 53
         "noMessagesMessage": "Perunu messàgiu ancora in sa riunione. Cumintza una tzarrada inoghe!",
54 54
         "nickname": {
55 55
             "popover": "Sèbera unu nòmine",
56
-            "title": "Inserta su nòmine pro impreare sa tzarrada"
56
+            "title": "Inserta su nòmine pro impreare sa tzarrada",
57
+            "titleWithPolls": "Inserta su nòmine pro impreare sa tzarrada"
57 58
         },
58 59
         "privateNotice": "Messàgiu privadu a {{recipient}}",
59 60
         "title": "Tzarrada",
61
+        "titleWithPolls": "Tzarrada",
60 62
         "you": "tue"
61 63
     },
62 64
     "chromeExtensionBanner": {

+ 3
- 1
lang/main-sk.json 查看文件

@@ -68,10 +68,12 @@
68 68
         "noMessagesMessage": "V tejto konferencii ešte nie je žiadna správa. Začnite tu vašu diskusiu!",
69 69
         "nickname": {
70 70
             "popover": "Zvoľte meno",
71
-            "title": "Zadajte vašu prezývku"
71
+            "title": "Zadajte vašu prezývku",
72
+            "titleWithPolls": "Zadajte vašu prezývku"
72 73
         },
73 74
         "privateNotice": "Súkromná správa pre {{recipient}}",
74 75
         "title": "Chat",
76
+        "titleWithPolls": "Chat",
75 77
         "you": "Vy"
76 78
     },
77 79
     "chromeExtensionBanner": {

+ 3
- 1
lang/main-sl.json 查看文件

@@ -52,11 +52,13 @@
52 52
         "messagebox": "Vnesite sporočilo",
53 53
         "nickname": {
54 54
             "popover": "Izberite svoje ime",
55
-            "title": "Vnesite ime, ki ga želite uporabljati na srečanju"
55
+            "title": "Vnesite ime, ki ga želite uporabljati na srečanju",
56
+            "titleWithPolls": "Vnesite ime, ki ga želite uporabljati na srečanju"
56 57
         },
57 58
         "noMessagesMessage": "There are no messages in the meeting yet. Start a conversation here!",
58 59
         "privateNotice": "Zasebno sporočilo za uporabnika {{recipient}}",
59 60
         "title": "Klepet",
61
+        "titleWithPolls": "Klepet",
60 62
         "you": "vi"
61 63
     },
62 64
     "chromeExtensionBanner": {

+ 3
- 1
lang/main-sq.json 查看文件

@@ -66,10 +66,12 @@
66 66
         "noMessagesMessage": "Ende s’ka mesazhe te takimi. Filloni një bisedë këtu!",
67 67
         "nickname": {
68 68
             "popover": "Zgjidhni një nofkë",
69
-            "title": "Që të përdorni fjalosjen, jepni një nofkë"
69
+            "title": "Që të përdorni fjalosjen, jepni një nofkë",
70
+            "titleWithPolls": "Që të përdorni fjalosjen, jepni një nofkë"
70 71
         },
71 72
         "privateNotice": "Mesazh privat për {{recipient}}",
72 73
         "title": "Fjalosje",
74
+        "titleWithPolls": "Fjalosje",
73 75
         "you": "ju",
74 76
         "message": "Mesazh",
75 77
         "messageAccessibleTitle": "{{user}} thotë:",

+ 3
- 1
lang/main-sv.json 查看文件

@@ -70,9 +70,11 @@
70 70
         "messagebox": "Skriv ett meddelande",
71 71
         "nickname": {
72 72
             "popover": "Välj ett namn",
73
-            "title": "Skriv in ett namn för att börja använda chatten"
73
+            "title": "Skriv in ett namn för att börja använda chatten",
74
+            "titleWithPolls": "Skriv in ett namn för att börja använda chatten"
74 75
         },
75 76
         "title": "Chatt",
77
+        "titleWithPolls": "Chatt",
76 78
         "you": "du",
77 79
         "privateNotice": "Privat meddelande till {{recipient}}",
78 80
         "noMessagesMessage": "Det finns ännu inga meddelanden i mötet. Påbörja en konversation!",

+ 3
- 1
lang/main-te.json 查看文件

@@ -70,10 +70,12 @@
70 70
         "noMessagesMessage": "ఈ సమావేశంలో ఇంకా సందేశాలేమీ లేవు. ఇక్కడ ఒక సంభాషణను మొదలుపెట్టండి!",
71 71
         "nickname": {
72 72
             "popover": "ఒక మారుపేరు ఎంచుకోండి",
73
-            "title": "సంభాషణను మొదలుపెట్టడానికి ఒక మారుపేరును ఇవ్వండి"
73
+            "title": "సంభాషణను మొదలుపెట్టడానికి ఒక మారుపేరును ఇవ్వండి",
74
+            "titleWithPolls": "సంభాషణను మొదలుపెట్టడానికి ఒక మారుపేరును ఇవ్వండి"
74 75
         },
75 76
         "privateNotice": "{{recipient}}‌కి అంతరంగిక సందేశం",
76 77
         "title": "సంభాషణ",
78
+        "titleWithPolls": "సంభాషణ",
77 79
         "you": "మీరు"
78 80
     },
79 81
     "chromeExtensionBanner": {

+ 4
- 3
lang/main-tr.json 查看文件

@@ -67,12 +67,13 @@
67 67
         "noMessagesMessage": "Toplantıda henüz mesaj yok. Burada bir konuşma başlatın!",
68 68
         "nickname": {
69 69
             "popover": "Bir takma ad seçin",
70
-            "title": "Sohbette kullanmak için bir takma ad girin"
70
+            "title": "Sohbette kullanmak için bir takma ad girin",
71
+            "titleWithPolls": "Sohbette kullanmak için bir takma ad girin"
71 72
         },
72
-	"privateNotice": "{{recipient}} için özel mesaj",
73
+	    "privateNotice": "{{recipient}} için özel mesaj",
73 74
         "title": "Sohbet",
75
+        "titleWithPolls": "Sohbet",
74 76
         "you": "sen"
75
-
76 77
     },
77 78
     "connectingOverlay": {
78 79
         "joiningRoom": "Toplantıya bağlanılıyor..."

+ 3
- 1
lang/main-uk.json 查看文件

@@ -67,10 +67,12 @@
67 67
         "noMessagesMessage": "У цій конференції відсутні повідомлення. Будь ласка, почніть розмову тут.",
68 68
         "nickname": {
69 69
             "popover": "Зазначте ім'я",
70
-            "title": "Зазначте ваше ім'я для чату"
70
+            "title": "Зазначте ваше ім'я для чату",
71
+            "titleWithPolls": "Зазначте ваше ім'я для чату"
71 72
         },
72 73
         "privateNotice": "Приватне повідомлення для {{recipient}}",
73 74
         "title": "Чат",
75
+        "titleWithPolls": "Чат",
74 76
         "you": "Ви"
75 77
     },
76 78
     "chromeExtensionBanner": {

+ 3
- 1
lang/main-vi.json 查看文件

@@ -53,9 +53,11 @@
53 53
         "messagebox": "Nhập nội dung tin nhắn",
54 54
         "nickname": {
55 55
             "popover": "Chọn tên",
56
-            "title": "Nhập tên của bạn để tán gẫu"
56
+            "title": "Nhập tên của bạn để tán gẫu",
57
+            "titleWithPolls": "Nhập tên của bạn để tán gẫu"
57 58
         },
58 59
         "title": "Tán gẫu",
60
+        "titleWithPolls": "Tán gẫu",
59 61
         "you": "bạn"
60 62
     },
61 63
     "connectingOverlay": {

+ 3
- 1
lang/main-zhCN.json 查看文件

@@ -68,10 +68,12 @@
68 68
         "noMessagesMessage": "会议中还没有消息,在这里开始谈话吧!",
69 69
         "nickname": {
70 70
             "popover": "选择一个昵称",
71
-            "title": "输入一个昵称用于聊天"
71
+            "title": "输入一个昵称用于聊天",
72
+            "titleWithPolls": "输入一个昵称用于聊天"
72 73
         },
73 74
         "privateNotice": "与 {{recipient}} 的私人聊天",
74 75
         "title": "话题",
76
+        "titleWithPolls": "话题",
75 77
         "you": "您"
76 78
     },
77 79
     "chromeExtensionBanner": {

+ 3
- 1
lang/main-zhTW.json 查看文件

@@ -66,10 +66,12 @@
66 66
         "noMessagesMessage": "此會議尚無訊息。在此開始對話交談!",
67 67
         "nickname": {
68 68
             "popover": "選擇名稱",
69
-            "title": "輸入名稱來使用交談"
69
+            "title": "輸入名稱來使用交談",
70
+            "titleWithPolls": "輸入名稱來使用交談"
70 71
         },
71 72
         "privateNotice": "私人訊息傳送至 {{recipient}}",
72 73
         "title": "對話",
74
+        "titleWithPolls": "對話",
73 75
         "you": "您",
74 76
         "message": "訊息",
75 77
         "messageAccessibleTitle": "{{user}} 說:",

+ 4
- 2
lang/main.json 查看文件

@@ -66,7 +66,8 @@
66 66
         "noMessagesMessage": "There are no messages in the meeting yet. Start a conversation here!",
67 67
         "nickname": {
68 68
             "popover": "Choose a nickname",
69
-            "title": "Enter a nickname to use chat and polls"
69
+            "title": "Enter a nickname to use chat",
70
+            "titleWithPolls": "Enter a nickname to use chat and polls"
70 71
         },
71 72
         "privateNotice": "Private message to {{recipient}}",
72 73
         "message": "Message",
@@ -77,7 +78,8 @@
77 78
             "chat": "Chat",
78 79
             "polls": "Polls"
79 80
         },
80
-        "title": "Chat and Polls",
81
+        "title": "Chat",
82
+        "titleWithPolls": "Chat and Polls",
81 83
         "you": "you"
82 84
     },
83 85
     "chromeExtensionBanner": {

+ 8
- 3
react/features/chat/components/web/Chat.js 查看文件

@@ -213,6 +213,7 @@ class Chat extends AbstractChat<Props> {
213 213
             <Header
214 214
                 className = 'chat-header'
215 215
                 id = 'chat-header'
216
+                isPollsEnabled = { this.props._isPollsEnabled }
216 217
                 onCancel = { this._onToggleChat } />
217 218
         );
218 219
     }
@@ -232,15 +233,19 @@ class Chat extends AbstractChat<Props> {
232 233
         if (_isOpen) {
233 234
             if (_isModal) {
234 235
                 ComponentToRender = (
235
-                    <ChatDialog>
236
-                        { _showNamePrompt ? <DisplayNameForm /> : this._renderChat() }
236
+                    <ChatDialog isPollsEnabled = { this.props._isPollsEnabled }>
237
+                        { _showNamePrompt
238
+                            ? <DisplayNameForm isPollsEnabled = { this.props._isPollsEnabled } />
239
+                            : this._renderChat() }
237 240
                     </ChatDialog>
238 241
                 );
239 242
             } else {
240 243
                 ComponentToRender = (
241 244
                     <>
242 245
                         { this._renderChatHeader() }
243
-                        { _showNamePrompt ? <DisplayNameForm /> : this._renderChat() }
246
+                        { _showNamePrompt
247
+                            ? <DisplayNameForm isPollsEnabled = { this.props._isPollsEnabled } />
248
+                            : this._renderChat() }
244 249
                     </>
245 250
                 );
246 251
             }

+ 8
- 3
react/features/chat/components/web/ChatDialog.js 查看文件

@@ -11,7 +11,12 @@ type Props = {
11 11
     /**
12 12
      * Children of the component.
13 13
      */
14
-    children: React$Node
14
+    children: React$Node,
15
+
16
+    /**
17
+     * Whether the polls feature is enabled or not.
18
+     */
19
+    isPollsEnabled: boolean
15 20
 }
16 21
 
17 22
 /**
@@ -19,7 +24,7 @@ type Props = {
19 24
  *
20 25
  * @returns {React$Element<any>}
21 26
  */
22
-function ChatDialog({ children }: Props) {
27
+function ChatDialog({ children, isPollsEnabled }: Props) {
23 28
     return (
24 29
         <Dialog
25 30
             customHeader = { Header }
@@ -27,7 +32,7 @@ function ChatDialog({ children }: Props) {
27 32
             disableFooter = { true }
28 33
             hideCancelButton = { true }
29 34
             submitDisabled = { true }
30
-            titleKey = 'chat.title'>
35
+            titleKey = { isPollsEnabled ? 'chat.titleWithPolls' : 'chat.title' } >
31 36
             <div className = 'chat-dialog'>
32 37
                 {children}
33 38
             </div>

+ 7
- 2
react/features/chat/components/web/ChatDialogHeader.js 查看文件

@@ -19,6 +19,11 @@ type Props = {
19 19
      */
20 20
     className: string,
21 21
 
22
+    /**
23
+     * Whether the polls feature is enabled or not.
24
+     */
25
+    isPollsEnabled: boolean,
26
+
22 27
     /**
23 28
      * Invoked to obtain translated strings.
24 29
      */
@@ -30,7 +35,7 @@ type Props = {
30 35
  *
31 36
  * @returns {React$Element<any>}
32 37
  */
33
-function Header({ onCancel, className, t }: Props) {
38
+function Header({ onCancel, className, isPollsEnabled, t }: Props) {
34 39
 
35 40
     const onKeyPressHandler = useCallback(e => {
36 41
         if (onCancel && (e.key === ' ' || e.key === 'Enter')) {
@@ -43,7 +48,7 @@ function Header({ onCancel, className, t }: Props) {
43 48
         <div
44 49
             className = { className || 'chat-dialog-header' }
45 50
             role = 'heading'>
46
-            { t('chat.title') }
51
+            { t(isPollsEnabled ? 'chat.titleWithPolls' : 'chat.title') }
47 52
             <Icon
48 53
                 ariaLabel = { t('toolbar.closeChat') }
49 54
                 onClick = { onCancel }

+ 7
- 2
react/features/chat/components/web/DisplayNameForm.js 查看文件

@@ -20,6 +20,11 @@ type Props = {
20 20
      */
21 21
     dispatch: Dispatch<any>,
22 22
 
23
+    /**
24
+     * Whether the polls feature is enabled or not.
25
+     */
26
+    isPollsEnabled: boolean,
27
+
23 28
     /**
24 29
      * Invoked to obtain translated strings.
25 30
      */
@@ -69,7 +74,7 @@ class DisplayNameForm extends Component<Props, State> {
69 74
      * @returns {ReactElement}
70 75
      */
71 76
     render() {
72
-        const { t } = this.props;
77
+        const { isPollsEnabled, t } = this.props;
73 78
 
74 79
         return (
75 80
             <div id = 'nickname'>
@@ -80,7 +85,7 @@ class DisplayNameForm extends Component<Props, State> {
80 85
                         autoFocus = { true }
81 86
                         compact = { true }
82 87
                         id = 'nickinput'
83
-                        label = { t('chat.nickname.title') }
88
+                        label = { t(isPollsEnabled ? 'chat.nickname.titleWithPolls' : 'chat.nickname.title') }
84 89
                         onChange = { this._onDisplayNameChange }
85 90
                         placeholder = { t('chat.nickname.popover') }
86 91
                         shouldFitContainer = { true }

正在加载...
取消
保存