Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions src/mumble/ACLEditor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -417,6 +417,24 @@ void ACLEditor::returnQuery(const MumbleProto::QueryUsers &mqu) {
qhNameCache.remove(tid);
}
}
// Warn once per unregistered user that was just looked up. An unregistered
// user is one whose name was queried but for which the server did not return
// a valid registration ID in this response batch.
Comment on lines +420 to +422
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The premise of this is bad: I don't want to read a message box for all unregistered users. A single user at a time would be ok. Imaging having to click through a dozen message boxes before being able to fix the problem.

Even worse, it looks like the ACLEditor might query users one at the time. Each time we receive an answer all unregistered ones produce message boxes.

for (int i = 0; i < mqu.names_size(); ++i) {
const QString name = u8(mqu.names(i));
const QString lname = name.toLower();
if (qhNameWait.contains(lname) && !qsWarnedUnregistered.contains(lname)) {
qsWarnedUnregistered.insert(lname);
QMessageBox::warning(
this,
tr("Mumble \u2014 Unregistered user"),
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This has to be one of the funniest lines of code ever to be submitted to any project ever

tr("The user \"%1\" is not registered on this server. "
"ACL entries for unregistered users are discarded by the server and will have no effect. "
"Please register this user before adding them to an ACL.")
.arg(name));
}
}

refillGroupInherit();
refillGroupRemove();
refillGroupAdd();
Expand Down
1 change: 1 addition & 0 deletions src/mumble/ACLEditor.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ class ACLEditor : public QDialog, public Ui::ACLEditor {
QHash< int, QString > qhNameCache;
QHash< QString, int > qhIDCache;
QHash< QString, int > qhNameWait;
QSet< QString > qsWarnedUnregistered;
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use std containers wherever possible in newly introduced code


int iUnknown;

Expand Down
8 changes: 8 additions & 0 deletions src/mumble/mumble_ar.ts
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You have either asked a LLM to generate the translation files or squashed the translation commits into your feature commit. Both is unacceptable.

Original file line number Diff line number Diff line change
Expand Up @@ -470,6 +470,14 @@ This value allows you to set the maximum number of users allowed in the channel.
<source>List of available permissions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Mumble — Unregistered user</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>The user &quot;%1&quot; is not registered on this server. ACL entries for unregistered users are discarded by the server and will have no effect. Please register this user before adding them to an ACL.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ALSAAudioInput</name>
Expand Down
8 changes: 8 additions & 0 deletions src/mumble/mumble_bg.ts
Original file line number Diff line number Diff line change
Expand Up @@ -471,6 +471,14 @@ This value allows you to set the maximum number of users allowed in the channel.
<source>List of available permissions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Mumble — Unregistered user</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>The user &quot;%1&quot; is not registered on this server. ACL entries for unregistered users are discarded by the server and will have no effect. Please register this user before adding them to an ACL.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ALSAAudioInput</name>
Expand Down
8 changes: 8 additions & 0 deletions src/mumble/mumble_br.ts
Original file line number Diff line number Diff line change
Expand Up @@ -470,6 +470,14 @@ This value allows you to set the maximum number of users allowed in the channel.
<source>List of available permissions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Mumble — Unregistered user</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>The user &quot;%1&quot; is not registered on this server. ACL entries for unregistered users are discarded by the server and will have no effect. Please register this user before adding them to an ACL.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ALSAAudioInput</name>
Expand Down
8 changes: 8 additions & 0 deletions src/mumble/mumble_ca.ts
Original file line number Diff line number Diff line change
Expand Up @@ -478,6 +478,14 @@ Aquest valor us permet establir el nombre màxim d&apos;usuaris permesos al cana
<source>List of available permissions</source>
<translation>Llista de permisos disponibles</translation>
</message>
<message>
<source>Mumble — Unregistered user</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>The user &quot;%1&quot; is not registered on this server. ACL entries for unregistered users are discarded by the server and will have no effect. Please register this user before adding them to an ACL.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ALSAAudioInput</name>
Expand Down
8 changes: 8 additions & 0 deletions src/mumble/mumble_cs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -478,6 +478,14 @@ Tato hodnota Vám umožňuje nastavit maximální počet povolených uživatelů
<source>List of available permissions</source>
<translation>Seznam dostupných oprávnění</translation>
</message>
<message>
<source>Mumble — Unregistered user</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>The user &quot;%1&quot; is not registered on this server. ACL entries for unregistered users are discarded by the server and will have no effect. Please register this user before adding them to an ACL.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ALSAAudioInput</name>
Expand Down
8 changes: 8 additions & 0 deletions src/mumble/mumble_cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -471,6 +471,14 @@ This value allows you to set the maximum number of users allowed in the channel.
<source>List of available permissions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Mumble — Unregistered user</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>The user &quot;%1&quot; is not registered on this server. ACL entries for unregistered users are discarded by the server and will have no effect. Please register this user before adding them to an ACL.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ALSAAudioInput</name>
Expand Down
8 changes: 8 additions & 0 deletions src/mumble/mumble_da.ts
Original file line number Diff line number Diff line change
Expand Up @@ -478,6 +478,14 @@ Denne værdi tillader dig at indstille det maksimale antal brugere tilladt på k
<source>List of available permissions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Mumble — Unregistered user</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>The user &quot;%1&quot; is not registered on this server. ACL entries for unregistered users are discarded by the server and will have no effect. Please register this user before adding them to an ACL.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ALSAAudioInput</name>
Expand Down
8 changes: 8 additions & 0 deletions src/mumble/mumble_de.ts
Original file line number Diff line number Diff line change
Expand Up @@ -478,6 +478,14 @@ Dieser Wert erlaubt das Einstellen der maximal im Kanal erlaubten Benutzeranzahl
<source>List of available permissions</source>
<translation>Liste der verfügbaren Berechtigungen</translation>
</message>
<message>
<source>Mumble — Unregistered user</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>The user &quot;%1&quot; is not registered on this server. ACL entries for unregistered users are discarded by the server and will have no effect. Please register this user before adding them to an ACL.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ALSAAudioInput</name>
Expand Down
8 changes: 8 additions & 0 deletions src/mumble/mumble_el.ts
Original file line number Diff line number Diff line change
Expand Up @@ -478,6 +478,14 @@ This value allows you to set the maximum number of users allowed in the channel.
<source>List of available permissions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Mumble — Unregistered user</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>The user &quot;%1&quot; is not registered on this server. ACL entries for unregistered users are discarded by the server and will have no effect. Please register this user before adding them to an ACL.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ALSAAudioInput</name>
Expand Down
8 changes: 8 additions & 0 deletions src/mumble/mumble_en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -470,6 +470,14 @@ This value allows you to set the maximum number of users allowed in the channel.
<source>List of available permissions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Mumble — Unregistered user</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>The user &quot;%1&quot; is not registered on this server. ACL entries for unregistered users are discarded by the server and will have no effect. Please register this user before adding them to an ACL.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ALSAAudioInput</name>
Expand Down
8 changes: 8 additions & 0 deletions src/mumble/mumble_en_GB.ts
Original file line number Diff line number Diff line change
Expand Up @@ -478,6 +478,14 @@ This value allows you to set the maximum number of users allowed in the channel.
<source>List of available permissions</source>
<translation>List of available permissions</translation>
</message>
<message>
<source>Mumble — Unregistered user</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>The user &quot;%1&quot; is not registered on this server. ACL entries for unregistered users are discarded by the server and will have no effect. Please register this user before adding them to an ACL.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ALSAAudioInput</name>
Expand Down
8 changes: 8 additions & 0 deletions src/mumble/mumble_eo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -478,6 +478,14 @@ This value allows you to set the maximum number of users allowed in the channel.
<source>List of available permissions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Mumble — Unregistered user</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>The user &quot;%1&quot; is not registered on this server. ACL entries for unregistered users are discarded by the server and will have no effect. Please register this user before adding them to an ACL.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ALSAAudioInput</name>
Expand Down
8 changes: 8 additions & 0 deletions src/mumble/mumble_es.ts
Original file line number Diff line number Diff line change
Expand Up @@ -478,6 +478,14 @@ Este valor permite fijar el número máximo de usuarios permitidos en el canal.
<source>List of available permissions</source>
<translation>Lista de permisos disponibles</translation>
</message>
<message>
<source>Mumble — Unregistered user</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>The user &quot;%1&quot; is not registered on this server. ACL entries for unregistered users are discarded by the server and will have no effect. Please register this user before adding them to an ACL.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ALSAAudioInput</name>
Expand Down
8 changes: 8 additions & 0 deletions src/mumble/mumble_et.ts
Original file line number Diff line number Diff line change
Expand Up @@ -471,6 +471,14 @@ This value allows you to set the maximum number of users allowed in the channel.
<source>List of available permissions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Mumble — Unregistered user</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>The user &quot;%1&quot; is not registered on this server. ACL entries for unregistered users are discarded by the server and will have no effect. Please register this user before adding them to an ACL.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ALSAAudioInput</name>
Expand Down
8 changes: 8 additions & 0 deletions src/mumble/mumble_eu.ts
Original file line number Diff line number Diff line change
Expand Up @@ -479,6 +479,14 @@ This value allows you to set the maximum number of users allowed in the channel.
<source>List of available permissions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Mumble — Unregistered user</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>The user &quot;%1&quot; is not registered on this server. ACL entries for unregistered users are discarded by the server and will have no effect. Please register this user before adding them to an ACL.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ALSAAudioInput</name>
Expand Down
8 changes: 8 additions & 0 deletions src/mumble/mumble_fa_IR.ts
Original file line number Diff line number Diff line change
Expand Up @@ -472,6 +472,14 @@ This value allows you to set the maximum number of users allowed in the channel.
<source>List of available permissions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Mumble — Unregistered user</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>The user &quot;%1&quot; is not registered on this server. ACL entries for unregistered users are discarded by the server and will have no effect. Please register this user before adding them to an ACL.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ALSAAudioInput</name>
Expand Down
8 changes: 8 additions & 0 deletions src/mumble/mumble_fi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -478,6 +478,14 @@ Tämän numeron ollessa suurempi kuin nolla kanava sallii enintään numeron suu
<source>List of available permissions</source>
<translation>Käytettävissä olevat oikeudet</translation>
</message>
<message>
<source>Mumble — Unregistered user</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>The user &quot;%1&quot; is not registered on this server. ACL entries for unregistered users are discarded by the server and will have no effect. Please register this user before adding them to an ACL.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ALSAAudioInput</name>
Expand Down
8 changes: 8 additions & 0 deletions src/mumble/mumble_fr.ts
Original file line number Diff line number Diff line change
Expand Up @@ -478,6 +478,14 @@ Cette valeur vous permet de définir un nombre maximum d&apos;utilisateurs autor
<source>List of available permissions</source>
<translation>Liste des permissions disponibles</translation>
</message>
<message>
<source>Mumble — Unregistered user</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>The user &quot;%1&quot; is not registered on this server. ACL entries for unregistered users are discarded by the server and will have no effect. Please register this user before adding them to an ACL.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ALSAAudioInput</name>
Expand Down
8 changes: 8 additions & 0 deletions src/mumble/mumble_gl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -472,6 +472,14 @@ This value allows you to set the maximum number of users allowed in the channel.
<source>List of available permissions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Mumble — Unregistered user</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>The user &quot;%1&quot; is not registered on this server. ACL entries for unregistered users are discarded by the server and will have no effect. Please register this user before adding them to an ACL.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ALSAAudioInput</name>
Expand Down
8 changes: 8 additions & 0 deletions src/mumble/mumble_he.ts
Original file line number Diff line number Diff line change
Expand Up @@ -479,6 +479,14 @@ This value allows you to set the maximum number of users allowed in the channel.
<source>List of available permissions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Mumble — Unregistered user</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>The user &quot;%1&quot; is not registered on this server. ACL entries for unregistered users are discarded by the server and will have no effect. Please register this user before adding them to an ACL.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ALSAAudioInput</name>
Expand Down
8 changes: 8 additions & 0 deletions src/mumble/mumble_hi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -472,6 +472,14 @@ Contains the list of members inherited by the current channel. Uncheck &lt;i&gt;
<source>List of available permissions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Mumble — Unregistered user</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>The user &quot;%1&quot; is not registered on this server. ACL entries for unregistered users are discarded by the server and will have no effect. Please register this user before adding them to an ACL.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ALSAAudioInput</name>
Expand Down
8 changes: 8 additions & 0 deletions src/mumble/mumble_hu.ts
Original file line number Diff line number Diff line change
Expand Up @@ -474,6 +474,14 @@ This value allows you to set the maximum number of users allowed in the channel.
<source>List of available permissions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Mumble — Unregistered user</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>The user &quot;%1&quot; is not registered on this server. ACL entries for unregistered users are discarded by the server and will have no effect. Please register this user before adding them to an ACL.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ALSAAudioInput</name>
Expand Down
8 changes: 8 additions & 0 deletions src/mumble/mumble_it.ts
Original file line number Diff line number Diff line change
Expand Up @@ -478,6 +478,14 @@ Questo valore ti permette di impostare il numero massimo di utenti consentiti ne
<source>List of available permissions</source>
<translation>Lista dei permessi disponibili</translation>
</message>
<message>
<source>Mumble — Unregistered user</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>The user &quot;%1&quot; is not registered on this server. ACL entries for unregistered users are discarded by the server and will have no effect. Please register this user before adding them to an ACL.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ALSAAudioInput</name>
Expand Down
8 changes: 8 additions & 0 deletions src/mumble/mumble_ja.ts
Original file line number Diff line number Diff line change
Expand Up @@ -479,6 +479,14 @@ This value allows you to set the maximum number of users allowed in the channel.
<source>List of available permissions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Mumble — Unregistered user</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>The user &quot;%1&quot; is not registered on this server. ACL entries for unregistered users are discarded by the server and will have no effect. Please register this user before adding them to an ACL.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ALSAAudioInput</name>
Expand Down
Loading