rnhmjoj
/
nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add 'and' to typing display

This commit is contained in:
Nicolas Werner 2019-07-28 18:13:16 +02:00
parent b28115eb37
commit 0398c846f6
11 changed files with 85 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
resources/langs/nheko_de.ts
View File

@ -494,15 +494,14 @@
</context>
<context>
<name>TypingDisplay</name>
<message>
<location filename="../../src/TypingDisplay.cpp" line="+46"/>
<source> is typing</source>
<translation> tippt</translation>
</message>
<message>
<location line="+2"/>
<source> are typing</source>
<translation> tippen</translation>
<message numerus="yes">
<location filename="../../src/TypingDisplay.cpp" line="+37"/>
<source>%1 and %2 are typing</source>
<comment>Multiple users are typing. First argument is a comma separated list of potentially multiple users. Second argument is the last user of that list. (If only one user is typing, %1 is empty. You should still use it in your string though to silence Qt warnings.)</comment>
<translation>
<numerusform>%1%2 tippt</numerusform>
<numerusform>%1 und %2 tippen</numerusform>
</translation>
</message>
</context>
<context>

17
resources/langs/nheko_el.ts
View File

@ -494,15 +494,14 @@
</context>
<context>
<name>TypingDisplay</name>
<message>
<location filename="../../src/TypingDisplay.cpp" line="+46"/>
<source> is typing</source>
<translation> πληκτρολογεί</translation>
</message>
<message>
<location line="+2"/>
<source> are typing</source>
<translation> πληκτρολογούν</translation>
<message numerus="yes">
<location filename="../../src/TypingDisplay.cpp" line="+37"/>
<source>%1 and %2 are typing</source>
<comment>Multiple users are typing. First argument is a comma separated list of potentially multiple users. Second argument is the last user of that list. (If only one user is typing, %1 is empty. You should still use it in your string though to silence Qt warnings.)</comment>
<translation type="unfinished">
<numerusform></numerusform>
<numerusform></numerusform>
</translation>
</message>
</context>
<context>

17
resources/langs/nheko_en.ts
View File

@ -494,15 +494,14 @@
</context>
<context>
<name>TypingDisplay</name>
<message>
<location filename="../../src/TypingDisplay.cpp" line="+46"/>
<source> is typing</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
<source> are typing</source>
<translation type="unfinished"></translation>
<message numerus="yes">
<location filename="../../src/TypingDisplay.cpp" line="+37"/>
<source>%1 and %2 are typing</source>
<comment>Multiple users are typing. First argument is a comma separated list of potentially multiple users. Second argument is the last user of that list. (If only one user is typing, %1 is empty. You should still use it in your string though to silence Qt warnings.)</comment>
<translation>
<numerusform>%1%2 is typing</numerusform>
<numerusform>%1 and %2 are typing</numerusform>
</translation>
</message>
</context>
<context>

17
resources/langs/nheko_fi.ts
View File

@ -494,15 +494,14 @@
</context>
<context>
<name>TypingDisplay</name>
<message>
<location filename="../../src/TypingDisplay.cpp" line="+46"/>
<source> is typing</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+2"/>
<source> are typing</source>
<translation type="unfinished"></translation>
<message numerus="yes">
<location filename="../../src/TypingDisplay.cpp" line="+37"/>
<source>%1 and %2 are typing</source>
<comment>Multiple users are typing. First argument is a comma separated list of potentially multiple users. Second argument is the last user of that list. (If only one user is typing, %1 is empty. You should still use it in your string though to silence Qt warnings.)</comment>
<translation type="unfinished">
<numerusform></numerusform>
<numerusform></numerusform>
</translation>
</message>
</context>
<context>

17
resources/langs/nheko_fr.ts
View File

@ -495,15 +495,14 @@
</context>
<context>
<name>TypingDisplay</name>
<message>
<location filename="../../src/TypingDisplay.cpp" line="+46"/>
<source> is typing</source>
<translation> est en train d&apos;écrire</translation>
</message>
<message>
<location line="+2"/>
<source> are typing</source>
<translation> sont en train d&apos;écrire</translation>
<message numerus="yes">
<location filename="../../src/TypingDisplay.cpp" line="+37"/>
<source>%1 and %2 are typing</source>
<comment>Multiple users are typing. First argument is a comma separated list of potentially multiple users. Second argument is the last user of that list. (If only one user is typing, %1 is empty. You should still use it in your string though to silence Qt warnings.)</comment>
<translation type="unfinished">
<numerusform></numerusform>
<numerusform></numerusform>
</translation>
</message>
</context>
<context>

17
resources/langs/nheko_nl.ts
View File

@ -494,15 +494,14 @@
</context>
<context>
<name>TypingDisplay</name>
<message>
<location filename="../../src/TypingDisplay.cpp" line="+46"/>
<source> is typing</source>
<translation> is aan het typen</translation>
</message>
<message>
<location line="+2"/>
<source> are typing</source>
<translation> zijn aan het typen</translation>
<message numerus="yes">
<location filename="../../src/TypingDisplay.cpp" line="+37"/>
<source>%1 and %2 are typing</source>
<comment>Multiple users are typing. First argument is a comma separated list of potentially multiple users. Second argument is the last user of that list. (If only one user is typing, %1 is empty. You should still use it in your string though to silence Qt warnings.)</comment>
<translation type="unfinished">
<numerusform></numerusform>
<numerusform></numerusform>
</translation>
</message>
</context>
<context>

18
resources/langs/nheko_pl.ts
View File

@ -494,15 +494,15 @@
</context>
<context>
<name>TypingDisplay</name>
<message>
<location filename="../../src/TypingDisplay.cpp" line="+46"/>
<source> is typing</source>
<translation> pisze</translation>
</message>
<message>
<location line="+2"/>
<source> are typing</source>
<translation> piszą</translation>
<message numerus="yes">
<location filename="../../src/TypingDisplay.cpp" line="+37"/>
<source>%1 and %2 are typing</source>
<comment>Multiple users are typing. First argument is a comma separated list of potentially multiple users. Second argument is the last user of that list. (If only one user is typing, %1 is empty. You should still use it in your string though to silence Qt warnings.)</comment>
<translation type="unfinished">
<numerusform></numerusform>
<numerusform></numerusform>
<numerusform></numerusform>
</translation>
</message>
</context>
<context>

18
resources/langs/nheko_ru.ts
View File

@ -494,15 +494,15 @@
</context>
<context>
<name>TypingDisplay</name>
<message>
<location filename="../../src/TypingDisplay.cpp" line="+46"/>
<source> is typing</source>
<translation> печатает</translation>
</message>
<message>
<location line="+2"/>
<source> are typing</source>
<translation> печатают</translation>
<message numerus="yes">
<location filename="../../src/TypingDisplay.cpp" line="+37"/>
<source>%1 and %2 are typing</source>
<comment>Multiple users are typing. First argument is a comma separated list of potentially multiple users. Second argument is the last user of that list. (If only one user is typing, %1 is empty. You should still use it in your string though to silence Qt warnings.)</comment>
<translation type="unfinished">
<numerusform></numerusform>
<numerusform></numerusform>
<numerusform></numerusform>
</translation>
</message>
</context>
<context>

16
resources/langs/nheko_zh_CN.ts
View File

@ -494,15 +494,13 @@
</context>
<context>
<name>TypingDisplay</name>
<message>
<location filename="../../src/TypingDisplay.cpp" line="+46"/>
<source> is typing</source>
<translation> 正在打字</translation>
</message>
<message>
<location line="+2"/>
<source> are typing</source>
<translation> 正在打字</translation>
<message numerus="yes">
<location filename="../../src/TypingDisplay.cpp" line="+37"/>
<source>%1 and %2 are typing</source>
<comment>Multiple users are typing. First argument is a comma separated list of potentially multiple users. Second argument is the last user of that list. (If only one user is typing, %1 is empty. You should still use it in your string though to silence Qt warnings.)</comment>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
</context>
<context>

17
src/TypingDisplay.cpp
View File

@ -33,6 +33,14 @@ TypingDisplay::setUsers(const QStringList &uid)
text_.clear();
QString temp = text_ +=
tr("%1 and %2 are typing",
"Multiple users are typing. First argument is a comma separated list of potentially "
"multiple users. Second argument is the last user of that list. (If only one user is "
"typing, %1 is empty. You should still use it in your string though to silence Qt "
"warnings.)",
uid.size());
if (uid.isEmpty()) {
hide();
update();
@ -40,12 +48,9 @@ TypingDisplay::setUsers(const QStringList &uid)
return;
}
text_ = uid.join(", ");
if (uid.size() == 1)
text_ += tr(" is typing");
else if (uid.size() > 1)
text_ += tr(" are typing");
QStringList uidWithoutLast = uid;
uidWithoutLast.pop_back();
text_ = temp.arg(uidWithoutLast.join(", ")).arg(uid.back());
show();
update();

2
src/timeline/TimelineItem.h
View File

@ -277,7 +277,7 @@ private:
QFutureWatcher<QString> *colorGenerating_;
QString event_id_;
mtx::events::MessageType message_type_ = mtx::events::MessageType::Unknown;
mtx::events::MessageType message_type_ = mtx::events::MessageType::Unknown;
QString room_id_;
DescInfo descriptionMsg_;