torsten/singlechat
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Add localized message for logged-in user count in German and English, enhancing user interface clarity. Update widget creation in app.cpp to utilize translation for various UI elements, improving localization consistency.

Browse Source
This commit is contained in:
Torsten Schulz (local)
2025-11-16 21:39:02 +01:00
parent a18c09592d
commit 8f24425110
12 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docroot/text.xml
View File

@@ -18,6 +18,7 @@
<message id="menu_timeout_in">Timeout in {1}</message>
<message id="history_title"><![CDATA[<h2>Conversations with already logged in users</h2>]]></message>
<message id="history_empty">No previous conversations available.</message>
<message id="logged_in_count">Logged in: {1}</message>
<message id="button_block_user">Block user</message>
<message id="button_unblock_user">Unblock user</message>
<message id="button_send">Send</message>

1
docroot/text_de_DE.xml
View File

@@ -18,6 +18,7 @@
<message id="menu_timeout_in">Timeout in {1}</message>
<message id="history_title"><![CDATA[<h2>Unterhaltungen mit bereits eingeloggten Nutzern</h2>]]></message>
<message id="history_empty">Keine bisherigen Unterhaltungen vorhanden.</message>
<message id="logged_in_count">Eingeloggt: {1}</message>
<message id="button_block_user">Benutzer blockieren</message>
<message id="button_unblock_user">Blockierung aufheben</message>
<message id="button_send">Senden</message>

1
docroot/text_en_GB.xml
View File

@@ -18,6 +18,7 @@
<message id="menu_timeout_in">Timeout in {1}</message>
<message id="history_title"><![CDATA[<h2>Conversations with already logged in users</h2>]]></message>
<message id="history_empty">No previous conversations available.</message>
<message id="logged_in_count">Logged in: {1}</message>
<message id="welcome">
<main>
<header>

1
docroot/text_en_US.xml
View File

@@ -18,6 +18,7 @@
<message id="menu_timeout_in">Timeout in {1}</message>
<message id="history_title"><![CDATA[<h2>Conversations with already logged in users</h2>]]></message>
<message id="history_empty">No previous conversations available.</message>
<message id="logged_in_count">Logged in: {1}</message>
<message id="welcome">
<main>
<header>

1
docroot/text_es_ES.xml
View File

@@ -18,6 +18,7 @@
<message id="menu_timeout_in">Desconexión en {1}</message>
<message id="history_title"><![CDATA[<h2>Conversaciones con usuarios ya conectados</h2>]]></message>
<message id="history_empty">No hay conversaciones anteriores disponibles.</message>
<message id="logged_in_count">Conectados: {1}</message>
<message id="welcome">
<main>
<header>

1
docroot/text_fr_FR.xml
View File

@@ -18,6 +18,7 @@
<message id="menu_timeout_in">Expiration dans {1}</message>
<message id="history_title"><![CDATA[<h2>Conversations avec des utilisateurs déjà connectés</h2>]]></message>
<message id="history_empty">Aucune conversation précédente disponible.</message>
<message id="logged_in_count">Connectés&nbsp;: {1}</message>
<message id="welcome">
<main>
<header>

1
docroot/text_it_IT.xml
View File

@@ -18,6 +18,7 @@
<message id="menu_timeout_in">Timeout tra {1}</message>
<message id="history_title"><![CDATA[<h2>Conversazioni con utenti già collegati</h2>]]></message>
<message id="history_empty">Nessuna conversazione precedente disponibile.</message>
<message id="logged_in_count">Utenti online: {1}</message>
<message id="welcome">
<main>
<header>

1
docroot/text_ja_JP.xml
View File

@@ -18,6 +18,7 @@
<message id="menu_timeout_in">タイムアウトまで {1}</message>
<message id="history_title"><![CDATA[<h2>すでにログインしているユーザーとの会話</h2>]]></message>
<message id="history_empty">過去の会話はありません。</message>
<message id="logged_in_count">ログイン中: {1}</message>
<message id="welcome">
<main>
<header>

1
docroot/text_th_TH.xml
View File

@@ -18,6 +18,7 @@
<message id="menu_timeout_in">หมดเวลาในอีก {1}</message>
<message id="history_title"><![CDATA[<h2>การสนทนากับผู้ใช้ที่ล็อกอินอยู่แล้ว</h2>]]></message>
<message id="history_empty">ยังไม่มีกิจกรรมการสนทนาก่อนหน้านี้</message>
<message id="logged_in_count">ออนไลน์อยู่: {1}</message>
<message id="welcome">
<main>
<header>

1
docroot/text_tl_PH.xml
View File

@@ -18,6 +18,7 @@
<message id="menu_timeout_in">Mawawala sa {1}</message>
<message id="history_title"><![CDATA[<h2>Mga pag-uusap sa mga naka-log in na user</h2>]]></message>
<message id="history_empty">Walang mga naunang pag-uusap.</message>
<message id="logged_in_count">Naka-log in: {1}</message>
<message id="welcome">
<main>
<header>

1
docroot/text_zh_CN.xml
View File

@@ -18,6 +18,7 @@
<message id="menu_timeout_in">将在 {1} 后断开</message>
<message id="history_title"><![CDATA[<h2>与已登录用户的会话</h2>]]></message>
<message id="history_empty">暂无历史会话。</message>
<message id="logged_in_count">当前在线: {1}</message>
<message id="welcome">
<main>
<header>

20
src/app.cpp
View File

@@ -428,7 +428,7 @@ void App::updateUserlist(Wt::Json::Array unsortedUserList, int size) {
layout->setContentsMargins(0, 0, 0, 0);
userListContainer_->setOverflow(Wt::Overflow::Auto, Wt::Orientation::Vertical);
userListContainer_->setOverflow(Wt::Overflow::Hidden, Wt::Orientation::Horizontal);
layout->addWidget(std::make_unique<Wt::WText>(Wt::WString("Logged in: {1}").arg(size)));
layout->addWidget(std::make_unique<Wt::WText>(Wt::WString::tr("logged_in_count").arg(size)));
auto sortedUserList = sortUserList(unsortedUserList);
for (Wt::Json::Object &user: sortedUserList) {
addUserItemToLayout(layout, user);
@@ -1205,16 +1205,16 @@ Wt::WVBoxLayout *App::resetSearchFields() {
contentContainer_->clear();
inboxOpen_ = false;
auto contentLayout = contentContainer_->setLayout(std::make_unique<Wt::WVBoxLayout>());
contentLayout->addWidget(std::make_unique<Wt::WText>("<h2>Search</h2>"));
contentLayout->addWidget(std::make_unique<Wt::WText>(Wt::WString::tr("search_title"), Wt::TextFormat::UnsafeXHTML));
return contentLayout;
}
std::pair<Wt::WSpinBox*, Wt::WSpinBox*> App::setupSearchFields(Wt::WVBoxLayout *contentLayout) {
auto minAgeEdit = addSearchItemLine<Wt::WSpinBox>(contentLayout, "From age");
auto minAgeEdit = addSearchItemLine<Wt::WSpinBox>(contentLayout, Wt::WString::tr("search_from_age").toUTF8());
minAgeEdit->setRange(18, 150);
minAgeEdit->setValue(18);
minAgeEdit->changed().connect([=, this] { searchFields.minAge = minAgeEdit->value(); });
auto maxAgeEdit = addSearchItemLine<Wt::WSpinBox>(contentLayout, "To age");
auto maxAgeEdit = addSearchItemLine<Wt::WSpinBox>(contentLayout, Wt::WString::tr("search_to_age").toUTF8());
maxAgeEdit->setRange(18, 150);
maxAgeEdit->setValue(150);
maxAgeEdit->changed().connect([=, this] { searchFields.maxAge = maxAgeEdit->value(); });
@@ -1222,12 +1222,12 @@ std::pair<Wt::WSpinBox*, Wt::WSpinBox*> App::setupSearchFields(Wt::WVBoxLayout *
}
std::pair<Wt::WContainerWidget*, Wt::WContainerWidget*> App::setupCountryDropDown(Wt::WVBoxLayout *contentLayout) {
auto countryOpenList = addSearchItemLine<Wt::WContainerWidget>(contentLayout, "Country");
countryOpenList->addNew<Wt::WText>("All");
auto countryOpenList = addSearchItemLine<Wt::WContainerWidget>(contentLayout, Wt::WString::tr("search_country").toUTF8());
countryOpenList->addNew<Wt::WText>(Wt::WString::tr("search_all"));
countryOpenList->setStyleClass("selectBoxes-drop-down-trigger");
auto countryDropDown = countryOpenList->addNew<Wt::WContainerWidget>();
countryDropDown->setStyleClass("selectBoxes-dropdown");
countryOpenList->setToolTip("Select the countries you'll search for");
countryOpenList->setToolTip(Wt::WString::tr("search_country_tooltip"));
std::map<Wt::WString, Wt::WString> countries = server_.countries();
addItem("All", countryDropDown, countryOpenList, &searchFields.countries, true);
addItem(country, countryDropDown, countryOpenList, &searchFields.countries);
@@ -1240,12 +1240,12 @@ std::pair<Wt::WContainerWidget*, Wt::WContainerWidget*> App::setupCountryDropDow
}
std::pair<Wt::WContainerWidget*, Wt::WContainerWidget*> App::setupGendersDropDown(Wt::WVBoxLayout *contentLayout) {
auto gendersOpenList = addSearchItemLine<Wt::WContainerWidget>(contentLayout, "Genders");
gendersOpenList->addNew<Wt::WText>("All");
auto gendersOpenList = addSearchItemLine<Wt::WContainerWidget>(contentLayout, Wt::WString::tr("search_genders").toUTF8());
gendersOpenList->addNew<Wt::WText>(Wt::WString::tr("search_all"));
gendersOpenList->setStyleClass("selectBoxes-drop-down-trigger");
auto gendersDropDown = gendersOpenList->addNew<Wt::WContainerWidget>();
gendersDropDown->setStyleClass("selectBoxes-dropdown");
gendersOpenList->setToolTip("Select the genders you'll search for");
gendersOpenList->setToolTip(Wt::WString::tr("search_genders_tooltip"));
addItem("All", gendersDropDown, gendersOpenList, &searchFields.gender, true);
std::map<Wt::WString, Wt::WString> swappedGenders;
for (const auto& pair : genders_) {