diff --git a/localization/rssguard_cs.ts b/localization/rssguard_cs.ts index a167adc4a..13cf38ef5 100644 --- a/localization/rssguard_cs.ts +++ b/localization/rssguard_cs.ts @@ -2144,6 +2144,10 @@ It is highly recommended to create your own "Application ID". Message &filters + + &Show tree branches + + FormMessageFiltersManager diff --git a/localization/rssguard_da.ts b/localization/rssguard_da.ts index a5ba35842..ee6e6806a 100644 --- a/localization/rssguard_da.ts +++ b/localization/rssguard_da.ts @@ -2139,6 +2139,10 @@ It is highly recommended to create your own "Application ID". Message &filters + + &Show tree branches + + FormMessageFiltersManager diff --git a/localization/rssguard_de.ts b/localization/rssguard_de.ts index b3006e011..3e3495810 100644 --- a/localization/rssguard_de.ts +++ b/localization/rssguard_de.ts @@ -2140,6 +2140,10 @@ It is highly recommended to create your own "Application ID". Message &filters + + &Show tree branches + + FormMessageFiltersManager diff --git a/localization/rssguard_en.ts b/localization/rssguard_en.ts index fe43af0be..5d440be2d 100644 --- a/localization/rssguard_en.ts +++ b/localization/rssguard_en.ts @@ -2167,6 +2167,10 @@ It is highly recommended to create your own "Application ID". Message &filters + + &Show tree branches + + FormMessageFiltersManager diff --git a/localization/rssguard_es.ts b/localization/rssguard_es.ts index 9dc23dd15..8671e4c00 100755 --- a/localization/rssguard_es.ts +++ b/localization/rssguard_es.ts @@ -2142,6 +2142,10 @@ It is highly recommended to create your own "Application ID". Message &filters + + &Show tree branches + + FormMessageFiltersManager diff --git a/localization/rssguard_fr.ts b/localization/rssguard_fr.ts index ea8796fce..618d16964 100644 --- a/localization/rssguard_fr.ts +++ b/localization/rssguard_fr.ts @@ -2142,6 +2142,10 @@ It is highly recommended to create your own "Application ID". Message &filters + + &Show tree branches + + FormMessageFiltersManager diff --git a/localization/rssguard_gl.ts b/localization/rssguard_gl.ts index 86060e391..a1c969953 100644 --- a/localization/rssguard_gl.ts +++ b/localization/rssguard_gl.ts @@ -2139,6 +2139,10 @@ It is highly recommended to create your own "Application ID". Message &filters + + &Show tree branches + + FormMessageFiltersManager diff --git a/localization/rssguard_he.ts b/localization/rssguard_he.ts index c0e14200e..fedefa8bb 100644 --- a/localization/rssguard_he.ts +++ b/localization/rssguard_he.ts @@ -2138,6 +2138,10 @@ It is highly recommended to create your own "Application ID". Message &filters + + &Show tree branches + + FormMessageFiltersManager diff --git a/localization/rssguard_id.ts b/localization/rssguard_id.ts index 83cecabc9..8c27976c3 100644 --- a/localization/rssguard_id.ts +++ b/localization/rssguard_id.ts @@ -2141,6 +2141,10 @@ It is highly recommended to create your own "Application ID". Message &filters + + &Show tree branches + + FormMessageFiltersManager diff --git a/localization/rssguard_it.ts b/localization/rssguard_it.ts index 48e5d5ad2..27a4c1634 100644 --- a/localization/rssguard_it.ts +++ b/localization/rssguard_it.ts @@ -2142,6 +2142,10 @@ It is highly recommended to create your own "Application ID". Message &filters + + &Show tree branches + + FormMessageFiltersManager diff --git a/localization/rssguard_ja.ts b/localization/rssguard_ja.ts index ad898d431..37f64e6ec 100644 --- a/localization/rssguard_ja.ts +++ b/localization/rssguard_ja.ts @@ -2138,6 +2138,10 @@ It is highly recommended to create your own "Application ID". Message &filters + + &Show tree branches + + FormMessageFiltersManager diff --git a/localization/rssguard_lt.ts b/localization/rssguard_lt.ts index bb733d1c1..ef13da917 100644 --- a/localization/rssguard_lt.ts +++ b/localization/rssguard_lt.ts @@ -2144,6 +2144,10 @@ It is highly recommended to create your own "Application ID". Message &filters + + &Show tree branches + + FormMessageFiltersManager diff --git a/localization/rssguard_nl.ts b/localization/rssguard_nl.ts index c92e7ebf7..2fc9fba0e 100644 --- a/localization/rssguard_nl.ts +++ b/localization/rssguard_nl.ts @@ -2142,6 +2142,10 @@ It is highly recommended to create your own "Application ID". Message &filters + + &Show tree branches + + FormMessageFiltersManager diff --git a/localization/rssguard_pl.ts b/localization/rssguard_pl.ts index 8a3ab6dc8..1c3663e7f 100644 --- a/localization/rssguard_pl.ts +++ b/localization/rssguard_pl.ts @@ -2144,6 +2144,10 @@ It is highly recommended to create your own "Application ID". Message &filters + + &Show tree branches + + FormMessageFiltersManager diff --git a/localization/rssguard_pt.ts b/localization/rssguard_pt.ts index 5ae13cd3b..7e85d5013 100644 --- a/localization/rssguard_pt.ts +++ b/localization/rssguard_pt.ts @@ -448,7 +448,7 @@ Clique para abrir a pasta de destino. E-mail address - + Endereço de e-mail @@ -737,7 +737,7 @@ ou esta função ainda não foi implementada. GNU GPL License (applies to RSS Guard and mimesis source code) - + Licença GNU GPL (aplica-se ao código fonte do RSS Guard e mimesis) @@ -771,19 +771,19 @@ ou esta função ainda não foi implementada. Subject - + Assunto Title of your message - + Título da sua mensagem E-mail NOT sent - + E-mail NÃO enviado Your e-mail message wasn't sent. - + Sua mensagem de e-mail não foi enviada. @@ -1047,7 +1047,7 @@ ou esta função ainda não foi implementada. Specified redirect URL must start with "http://localhost" and must be configured in your OAuth "application". - + A URL de redirecionamento especificada deve começar com "http://localhost" e deve ser configurada no "aplicativo" OAuth. @@ -1146,13 +1146,15 @@ ou esta função ainda não foi implementada. Get my own Application ID - + Obter minha própria ID de Aplicativo Specified redirect URL must start with "http://localhost" and must be configured in your OAuth "application". It is highly recommended to create your own "Application ID". - + A URL de redirecionamento especificada deve começar com "http://localhost" e deve ser configurada no "aplicativo" OAuth. + +É altamente recomendado criar seu próprio "ID de Aplicativo". @@ -2144,6 +2146,10 @@ It is highly recommended to create your own "Application ID". Message &filters &Filtros de mensagem + + &Show tree branches + + FormMessageFiltersManager @@ -2309,7 +2315,7 @@ It is highly recommended to create your own "Application ID". Cannot save new filter, error: ''. - + Não foi possível salvar o novo filtro, erro: ". @@ -2880,15 +2886,15 @@ Você pode instalá-lo agora. you aren't logged in - + você não está logado not logged-in - + não logado comm error when asking for recipients - + erro comm ao perguntar por destinatários @@ -3523,7 +3529,7 @@ versão, clicando nesta notificação popup. Cannot insert message filter, because current database cannot return last inserted row ID. - + Não é possível inserir o filtro de mensagens, porque o banco de dados atual não pode retornar o último ID da linha inserida. diff --git a/localization/rssguard_ru.ts b/localization/rssguard_ru.ts index 207343f64..1d3a0373e 100644 --- a/localization/rssguard_ru.ts +++ b/localization/rssguard_ru.ts @@ -2143,6 +2143,10 @@ It is highly recommended to create your own "Application ID". Message &filters + + &Show tree branches + + FormMessageFiltersManager diff --git a/localization/rssguard_sv.ts b/localization/rssguard_sv.ts index 2d8fd3f12..a6871c4bf 100644 --- a/localization/rssguard_sv.ts +++ b/localization/rssguard_sv.ts @@ -448,7 +448,7 @@ Klicka här för att öppna målmappen. E-mail address - + E-postadress @@ -737,7 +737,7 @@ att funktionen inte är implementerad än. GNU GPL License (applies to RSS Guard and mimesis source code) - + GNU GPL Licens (gäller RSS Guard och mimesis källkod) @@ -771,19 +771,19 @@ att funktionen inte är implementerad än. Subject - + Ämne Title of your message - + Meddelandetitel E-mail NOT sent - + E-postmeddelande INTE skickat Your e-mail message wasn't sent. - + Ditt e-postmeddelande skickades inte. @@ -1047,7 +1047,7 @@ att funktionen inte är implementerad än. Specified redirect URL must start with "http://localhost" and must be configured in your OAuth "application". - + Angiven omdirigerings-URL måste börja med "http://localhost" och måste konfigureras i ditt "OAuth-program". @@ -1146,13 +1146,15 @@ att funktionen inte är implementerad än. Get my own Application ID - + Skapa mitt eget applikations-ID Specified redirect URL must start with "http://localhost" and must be configured in your OAuth "application". It is highly recommended to create your own "Application ID". - + Angiven omdirigerings-URL måste börja med "http://localhost" och måste konfigureras i ditt "OAuth-program". + +Det rekommenderas starkt att du skapar ditt eget applikations-ID. @@ -2144,6 +2146,10 @@ It is highly recommended to create your own "Application ID". Message &filters Meddelande&filter + + &Show tree branches + + FormMessageFiltersManager @@ -2309,7 +2315,7 @@ It is highly recommended to create your own "Application ID". Cannot save new filter, error: ''. - + Kan inte spara nytt filter, fel: ". @@ -2879,15 +2885,15 @@ Du kan installera det nu. you aren't logged in - + Du är inte inloggad not logged-in - + Inte inloggad comm error when asking for recipients - + comm-fel när mottagare efterfrågas @@ -3522,7 +3528,7 @@ genom att klicka på denna popup-avisering. Cannot insert message filter, because current database cannot return last inserted row ID. - + Kan inte infoga meddelandefilter eftersom den aktuella databasen inte kan returnera senast infogat rad-ID. diff --git a/localization/rssguard_uk.ts b/localization/rssguard_uk.ts index 6725c5047..b494135a2 100644 --- a/localization/rssguard_uk.ts +++ b/localization/rssguard_uk.ts @@ -2140,6 +2140,10 @@ It is highly recommended to create your own "Application ID". Message &filters + + &Show tree branches + + FormMessageFiltersManager diff --git a/localization/rssguard_zh_CN.ts b/localization/rssguard_zh_CN.ts index 3e6588fb9..79886db9a 100755 --- a/localization/rssguard_zh_CN.ts +++ b/localization/rssguard_zh_CN.ts @@ -2141,6 +2141,10 @@ It is highly recommended to create your own "Application ID". Message &filters + + &Show tree branches + + FormMessageFiltersManager diff --git a/localization/rssguard_zh_TW.ts b/localization/rssguard_zh_TW.ts index 0decf4a4a..4bd0bf464 100755 --- a/localization/rssguard_zh_TW.ts +++ b/localization/rssguard_zh_TW.ts @@ -2143,6 +2143,10 @@ It is highly recommended to create your own "Application ID". Message &filters 消息篩選器(&F) + + &Show tree branches + + FormMessageFiltersManager diff --git a/src/librssguard/network-web/oauth2service.cpp b/src/librssguard/network-web/oauth2service.cpp index 07fd3ddf3..e63eb7d84 100644 --- a/src/librssguard/network-web/oauth2service.cpp +++ b/src/librssguard/network-web/oauth2service.cpp @@ -42,11 +42,12 @@ #include #include -Q_GLOBAL_STATIC(OAuthHttpHandler, qz_silent_acmanager) - OAuth2Service::OAuth2Service(const QString& auth_url, const QString& token_url, const QString& client_id, const QString& client_secret, const QString& scope, QObject* parent) - : QObject(parent), m_id(QString::number(QRandomGenerator::global()->generate())), m_timerId(-1), m_redirectionHandler(new OAuthHttpHandler(this)) { + : QObject(parent), + m_id(QString::number(QRandomGenerator::global()->generate())), m_timerId(-1), + m_redirectionHandler(new OAuthHttpHandler(tr("You can close this window now. Go back to %1").arg(APP_NAME), + this)) { m_tokenGrantType = QSL("authorization_code"); m_tokenUrl = QUrl(token_url); m_authUrl = auth_url; diff --git a/src/librssguard/network-web/oauthhttphandler.cpp b/src/librssguard/network-web/oauthhttphandler.cpp index 9a5581527..c127a0aea 100644 --- a/src/librssguard/network-web/oauthhttphandler.cpp +++ b/src/librssguard/network-web/oauthhttphandler.cpp @@ -10,9 +10,7 @@ #include #include -OAuthHttpHandler::OAuthHttpHandler(QObject* parent) : QObject(parent) { - m_text = tr("You can close this window now. Go back to %1").arg(APP_NAME); - +OAuthHttpHandler::OAuthHttpHandler(const QString& success_text, QObject* parent) : QObject(parent), m_successText(success_text) { connect(&m_httpServer, &QTcpServer::newConnection, this, &OAuthHttpHandler::clientConnected); setListenAddressPort(QString(OAUTH_REDIRECT_URI) + QL1C(':') + QString::number(OAUTH_REDIRECT_URI_PORT)); } @@ -118,17 +116,17 @@ void OAuthHttpHandler::answerClient(QTcpSocket* socket, const QUrl& url) { handleRedirection(received_data); - const QByteArray html = QByteArrayLiteral("") + - qApp->applicationName().toUtf8() + - QByteArrayLiteral("") + - m_text.toUtf8() + - QByteArrayLiteral(""); - const QByteArray html_size = QString::number(html.size()).toUtf8(); + const QString html = QSL("") + + qApp->applicationName() + + QSL("") + + m_successText + + QSL(""); + const QByteArray html_utf = html.toUtf8(); + const QByteArray html_size = QString::number(html_utf.size()).toLocal8Bit(); const QByteArray reply_message = QByteArrayLiteral("HTTP/1.0 200 OK \r\n" - "Content-Type: text/html; " - "charset=\"utf-8\"\r\n" + "Content-Type: text/html; charset=\"utf-8\"\r\n" "Content-Length: ") + html_size + - QByteArrayLiteral("\r\n\r\n") + html; + QByteArrayLiteral("\r\n\r\n") + html_utf; socket->write(reply_message); } diff --git a/src/librssguard/network-web/oauthhttphandler.h b/src/librssguard/network-web/oauthhttphandler.h index ccd814d51..d7315d50b 100644 --- a/src/librssguard/network-web/oauthhttphandler.h +++ b/src/librssguard/network-web/oauthhttphandler.h @@ -12,15 +12,21 @@ class OAuthHttpHandler : public QObject { Q_OBJECT public: - explicit OAuthHttpHandler(QObject* parent = nullptr); + explicit OAuthHttpHandler(const QString& success_text, QObject* parent = nullptr); virtual ~OAuthHttpHandler(); bool isListening() const; + // Returns listening portnumber. quint16 listenPort() const; + + // Returns listening IP address, usually something like "127.0.0.1". QHostAddress listenAddress() const; + + // Returns full URL string. QString listenAddressPort() const; + // Sets full URL string, for example "http://localhost:123456". void setListenAddressPort(const QString& full_uri); signals: @@ -72,7 +78,7 @@ class OAuthHttpHandler : public QObject { QHostAddress m_listenAddress; quint16 m_listenPort; QString m_listenAddressPort; - QString m_text; + QString m_successText; }; #endif // OAUTHHTTPHANDLER_H