adasauce
/
nheko
forked from mirror/nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

media->file in error message, when image upload fails

Browse Source
remotes/origin/0.7.0-dev
Nicolas Werner 5 years ago
parent 50c3d4ed3a
commit dbb8eecf29
13 changed files with 48 additions and 183 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 23
      resources/langs/nheko_de.ts
  2. 23
      resources/langs/nheko_el.ts
  3. 23
      resources/langs/nheko_en.ts
  4. 23
      resources/langs/nheko_fi.ts
  5. 23
      resources/langs/nheko_fr.ts
  6. 23
      resources/langs/nheko_nl.ts
  7. 27
      resources/langs/nheko_pl.ts
  8. 27
      resources/langs/nheko_ru.ts
  9. 27
      resources/langs/nheko_zh_CN.ts
  10. 2
      src/dialogs/MemberList.cpp
  11. 2
      src/dialogs/ReadReceipts.cpp
  12. 6
      src/dialogs/RoomSettings.cpp
  13. 2
      src/dialogs/UserProfile.cpp

23
resources/langs/nheko_de.ts
Unescape View File

@ -835,16 +835,11 @@ Medien-Größe: %2
<source>Close</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+11"/>
<source>ESC</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>dialogs::ReceiptItem</name>
<message>
<location line="-55"/>
<location line="-44"/>
<source>Today %1</source>
<translation type="unfinished"></translation>
</message>
@ -952,12 +947,7 @@ Medien-Größe: %2
</translation>
</message>
<message>
<location line="+71"/>
<source>ESC</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+69"/>
<location line="+140"/>
<source>Failed to enable encryption: %1</source>
<translation type="unfinished"></translation>
</message>
@ -973,12 +963,12 @@ Medien-Größe: %2
</message>
<message>
<location line="+12"/>
<source>The selected media is not an image</source>
<source>The selected file is not an image</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+5"/>
<source>Error while reading media: %1</source>
<source>Error while reading file: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
@ -1015,11 +1005,6 @@ Medien-Größe: %2
<source>Devices</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+39"/>
<source>ESC</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>emoji::Panel</name>

23
resources/langs/nheko_el.ts
Unescape View File

@ -833,16 +833,11 @@ Media size: %2
<source>Close</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+11"/>
<source>ESC</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>dialogs::ReceiptItem</name>
<message>
<location line="-55"/>
<location line="-44"/>
<source>Today %1</source>
<translation type="unfinished"></translation>
</message>
@ -950,12 +945,7 @@ Media size: %2
</translation>
</message>
<message>
<location line="+71"/>
<source>ESC</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+69"/>
<location line="+140"/>
<source>Failed to enable encryption: %1</source>
<translation type="unfinished"></translation>
</message>
@ -971,12 +961,12 @@ Media size: %2
</message>
<message>
<location line="+12"/>
<source>The selected media is not an image</source>
<source>The selected file is not an image</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+5"/>
<source>Error while reading media: %1</source>
<source>Error while reading file: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
@ -1013,11 +1003,6 @@ Media size: %2
<source>Devices</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+39"/>
<source>ESC</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>emoji::Panel</name>

23
resources/langs/nheko_en.ts
Unescape View File

@ -833,16 +833,11 @@ Media size: %2
<source>Close</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+11"/>
<source>ESC</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>dialogs::ReceiptItem</name>
<message>
<location line="-55"/>
<location line="-44"/>
<source>Today %1</source>
<translation type="unfinished"></translation>
</message>
@ -950,12 +945,7 @@ Media size: %2
</translation>
</message>
<message>
<location line="+71"/>
<source>ESC</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+69"/>
<location line="+140"/>
<source>Failed to enable encryption: %1</source>
<translation type="unfinished"></translation>
</message>
@ -971,12 +961,12 @@ Media size: %2
</message>
<message>
<location line="+12"/>
<source>The selected media is not an image</source>
<source>The selected file is not an image</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+5"/>
<source>Error while reading media: %1</source>
<source>Error while reading file: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
@ -1013,11 +1003,6 @@ Media size: %2
<source>Devices</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+39"/>
<source>ESC</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>emoji::Panel</name>

23
resources/langs/nheko_fi.ts
Unescape View File

@ -833,16 +833,11 @@ Media size: %2
<source>Close</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+11"/>
<source>ESC</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>dialogs::ReceiptItem</name>
<message>
<location line="-55"/>
<location line="-44"/>
<source>Today %1</source>
<translation type="unfinished"></translation>
</message>
@ -950,12 +945,7 @@ Media size: %2
</translation>
</message>
<message>
<location line="+71"/>
<source>ESC</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+69"/>
<location line="+140"/>
<source>Failed to enable encryption: %1</source>
<translation type="unfinished"></translation>
</message>
@ -971,12 +961,12 @@ Media size: %2
</message>
<message>
<location line="+12"/>
<source>The selected media is not an image</source>
<source>The selected file is not an image</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+5"/>
<source>Error while reading media: %1</source>
<source>Error while reading file: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
@ -1013,11 +1003,6 @@ Media size: %2
<source>Devices</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+39"/>
<source>ESC</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>emoji::Panel</name>

23
resources/langs/nheko_fr.ts
Unescape View File

@ -836,16 +836,11 @@ Taille du média : %2
<source>Close</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+11"/>
<source>ESC</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>dialogs::ReceiptItem</name>
<message>
<location line="-55"/>
<location line="-44"/>
<source>Today %1</source>
<translation type="unfinished"></translation>
</message>
@ -953,12 +948,7 @@ Taille du média : %2
</translation>
</message>
<message>
<location line="+71"/>
<source>ESC</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+69"/>
<location line="+140"/>
<source>Failed to enable encryption: %1</source>
<translation type="unfinished"></translation>
</message>
@ -974,12 +964,12 @@ Taille du média : %2
</message>
<message>
<location line="+12"/>
<source>The selected media is not an image</source>
<source>The selected file is not an image</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+5"/>
<source>Error while reading media: %1</source>
<source>Error while reading file: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
@ -1016,11 +1006,6 @@ Taille du média : %2
<source>Devices</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+39"/>
<source>ESC</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>emoji::Panel</name>

23
resources/langs/nheko_nl.ts
Unescape View File

@ -835,16 +835,11 @@ Mediagrootte: %2
<source>Close</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+11"/>
<source>ESC</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>dialogs::ReceiptItem</name>
<message>
<location line="-55"/>
<location line="-44"/>
<source>Today %1</source>
<translation type="unfinished"></translation>
</message>
@ -952,12 +947,7 @@ Mediagrootte: %2
</translation>
</message>
<message>
<location line="+71"/>
<source>ESC</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+69"/>
<location line="+140"/>
<source>Failed to enable encryption: %1</source>
<translation type="unfinished"></translation>
</message>
@ -973,12 +963,12 @@ Mediagrootte: %2
</message>
<message>
<location line="+12"/>
<source>The selected media is not an image</source>
<source>The selected file is not an image</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+5"/>
<source>Error while reading media: %1</source>
<source>Error while reading file: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
@ -1015,11 +1005,6 @@ Mediagrootte: %2
<source>Devices</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+39"/>
<source>ESC</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>emoji::Panel</name>

27
resources/langs/nheko_pl.ts
Unescape View File

@ -835,16 +835,11 @@ Rozmiar multimediów: %2
<source>Close</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+11"/>
<source>ESC</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>dialogs::ReceiptItem</name>
<message>
<location line="-55"/>
<location line="-44"/>
<source>Today %1</source>
<translation type="unfinished"></translation>
</message>
@ -955,12 +950,7 @@ Rozmiar multimediów: %2
</translation>
</message>
<message>
<location line="+71"/>
<source>ESC</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+69"/>
<location line="+140"/>
<source>Failed to enable encryption: %1</source>
<translation>Nie udało się włączyć szyfrowania: %1</translation>
</message>
@ -976,13 +966,13 @@ Rozmiar multimediów: %2
</message>
<message>
<location line="+12"/>
<source>The selected media is not an image</source>
<translation>Wybrany plik multimedialny nie jest obrazem</translation>
<source>The selected file is not an image</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+5"/>
<source>Error while reading media: %1</source>
<translation>Błąd odczytywania pliku: %1</translation>
<source>Error while reading file: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+35"/>
@ -1018,11 +1008,6 @@ Rozmiar multimediów: %2
<source>Devices</source>
<translation>Urządzenia</translation>
</message>
<message>
<location line="+39"/>
<source>ESC</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>emoji::Panel</name>

27
resources/langs/nheko_ru.ts
Unescape View File

@ -836,16 +836,11 @@ Media size: %2
<source>Close</source>
<translation>Закрыть</translation>
</message>
<message>
<location line="+11"/>
<source>ESC</source>
<translation></translation>
</message>
</context>
<context>
<name>dialogs::ReceiptItem</name>
<message>
<location line="-55"/>
<location line="-44"/>
<source>Today %1</source>
<translation type="unfinished"></translation>
</message>
@ -954,12 +949,7 @@ Media size: %2
</translation>
</message>
<message>
<location line="+71"/>
<source>ESC</source>
<translation></translation>
</message>
<message>
<location line="+69"/>
<location line="+140"/>
<source>Failed to enable encryption: %1</source>
<translation>Не удалось включить шифрование: %1</translation>
</message>
@ -975,13 +965,13 @@ Media size: %2
</message>
<message>
<location line="+12"/>
<source>The selected media is not an image</source>
<translation>Выбранное медия не является изображением</translation>
<source>The selected file is not an image</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+5"/>
<source>Error while reading media: %1</source>
<translation>Ошибка при чтении медия: %1</translation>
<source>Error while reading file: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+35"/>
@ -1017,11 +1007,6 @@ Media size: %2
<source>Devices</source>
<translation>Устройства</translation>
</message>
<message>
<location line="+39"/>
<source>ESC</source>
<translation></translation>
</message>
</context>
<context>
<name>emoji::Panel</name>

27
resources/langs/nheko_zh_CN.ts
Unescape View File

@ -835,16 +835,11 @@ Media size: %2
<source>Close</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+11"/>
<source>ESC</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>dialogs::ReceiptItem</name>
<message>
<location line="-55"/>
<location line="-44"/>
<source>Today %1</source>
<translation type="unfinished"></translation>
</message>
@ -953,12 +948,7 @@ Media size: %2
</translation>
</message>
<message>
<location line="+71"/>
<source>ESC</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+69"/>
<location line="+140"/>
<source>Failed to enable encryption: %1</source>
<translation>启用加密失败：%1</translation>
</message>
@ -974,13 +964,13 @@ Media size: %2
</message>
<message>
<location line="+12"/>
<source>The selected media is not an image</source>
<translation>选择的媒体不是一个图像</translation>
<source>The selected file is not an image</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+5"/>
<source>Error while reading media: %1</source>
<translation>读取媒体时失败：%1</translation>
<source>Error while reading file: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+35"/>
@ -1016,11 +1006,6 @@ Media size: %2
<source>Devices</source>
<translation>设备</translation>
</message>
<message>
<location line="+39"/>
<source>ESC</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>emoji::Panel</name>

2
src/dialogs/MemberList.cpp
Unescape View File

@ -126,7 +126,7 @@ MemberList::MemberList(const QString &room_id, QWidget *parent)
qCritical() << e.what();
}
auto closeShortcut = new QShortcut(QKeySequence("ESC"), this);
auto closeShortcut = new QShortcut(QKeySequence(QKeySequence::Cancel), this);
connect(closeShortcut, &QShortcut::activated, this, &MemberList::close);
connect(okBtn, &QPushButton::clicked, this, &MemberList::close);
}

2
src/dialogs/ReadReceipts.cpp
Unescape View File

@ -133,7 +133,7 @@ ReadReceipts::ReadReceipts(QWidget *parent)
layout->addWidget(userList_);
layout->addLayout(buttonLayout);
auto closeShortcut = new QShortcut(QKeySequence(tr("ESC")), this);
auto closeShortcut = new QShortcut(QKeySequence(QKeySequence::Cancel), this);
connect(closeShortcut, &QShortcut::activated, this, &ReadReceipts::close);
connect(okBtn, &QPushButton::clicked, this, &ReadReceipts::close);
}

6
src/dialogs/RoomSettings.cpp
Unescape View File

@ -438,7 +438,7 @@ RoomSettings::RoomSettings(const QString &room_id, QWidget *parent)
resetErrorLabel();
});
auto closeShortcut = new QShortcut(QKeySequence(tr("ESC")), this);
auto closeShortcut = new QShortcut(QKeySequence(QKeySequence::Cancel), this);
connect(closeShortcut, &QShortcut::activated, this, &RoomSettings::close);
connect(okBtn, &QPushButton::clicked, this, &RoomSettings::close);
}
@ -668,12 +668,12 @@ RoomSettings::updateAvatar()
QFile file{fileName, this};
if (format != "image") {
displayErrorMessage(tr("The selected media is not an image"));
displayErrorMessage(tr("The selected file is not an image"));
return;
}
if (!file.open(QIODevice::ReadOnly)) {
displayErrorMessage(tr("Error while reading media: %1").arg(file.errorString()));
displayErrorMessage(tr("Error while reading file: %1").arg(file.errorString()));
return;
}

2
src/dialogs/UserProfile.cpp
Unescape View File

@ -183,7 +183,7 @@ UserProfile::UserProfile(QWidget *parent)
qRegisterMetaType<std::vector<DeviceInfo>>();
auto closeShortcut = new QShortcut(QKeySequence(tr("ESC")), this);
auto closeShortcut = new QShortcut(QKeySequence(QKeySequence::Cancel), this);
connect(closeShortcut, &QShortcut::activated, this, &UserProfile::close);
connect(okBtn, &QPushButton::clicked, this, &UserProfile::close);
}

Write Preview
Loading…
Cancel
Save