diff --git a/docroot/text.xml b/docroot/text.xml index 0f854fc..6b339b8 100644 --- a/docroot/text.xml +++ b/docroot/text.xml @@ -18,6 +18,7 @@ Timeout in {1} Conversations with already logged in users]]> No previous conversations available. + Logged in: {1} Block user Unblock user Send diff --git a/docroot/text_de_DE.xml b/docroot/text_de_DE.xml index 45590b0..edfab8f 100644 --- a/docroot/text_de_DE.xml +++ b/docroot/text_de_DE.xml @@ -18,6 +18,7 @@ Timeout in {1} Unterhaltungen mit bereits eingeloggten Nutzern]]> Keine bisherigen Unterhaltungen vorhanden. + Eingeloggt: {1} Benutzer blockieren Blockierung aufheben Senden diff --git a/docroot/text_en_GB.xml b/docroot/text_en_GB.xml index 0492a8b..bba9c6a 100644 --- a/docroot/text_en_GB.xml +++ b/docroot/text_en_GB.xml @@ -18,6 +18,7 @@ Timeout in {1} Conversations with already logged in users]]> No previous conversations available. + Logged in: {1}
diff --git a/docroot/text_en_US.xml b/docroot/text_en_US.xml index 0b993a1..430a9b9 100644 --- a/docroot/text_en_US.xml +++ b/docroot/text_en_US.xml @@ -18,6 +18,7 @@ Timeout in {1} Conversations with already logged in users]]> No previous conversations available. + Logged in: {1}
diff --git a/docroot/text_es_ES.xml b/docroot/text_es_ES.xml index 00846c0..cdeb982 100644 --- a/docroot/text_es_ES.xml +++ b/docroot/text_es_ES.xml @@ -18,6 +18,7 @@ Desconexión en {1} Conversaciones con usuarios ya conectados]]> No hay conversaciones anteriores disponibles. + Conectados: {1}
diff --git a/docroot/text_fr_FR.xml b/docroot/text_fr_FR.xml index 304b0eb..45bfc86 100644 --- a/docroot/text_fr_FR.xml +++ b/docroot/text_fr_FR.xml @@ -18,6 +18,7 @@ Expiration dans {1} Conversations avec des utilisateurs déjà connectés]]> Aucune conversation précédente disponible. + Connectés : {1}
diff --git a/docroot/text_it_IT.xml b/docroot/text_it_IT.xml index 961656d..757a5d9 100644 --- a/docroot/text_it_IT.xml +++ b/docroot/text_it_IT.xml @@ -18,6 +18,7 @@ Timeout tra {1} Conversazioni con utenti già collegati]]> Nessuna conversazione precedente disponibile. + Utenti online: {1}
diff --git a/docroot/text_ja_JP.xml b/docroot/text_ja_JP.xml index 505808d..1ccc5a2 100644 --- a/docroot/text_ja_JP.xml +++ b/docroot/text_ja_JP.xml @@ -18,6 +18,7 @@ タイムアウトまで {1} すでにログインしているユーザーとの会話]]> 過去の会話はありません。 + ログイン中: {1}
diff --git a/docroot/text_th_TH.xml b/docroot/text_th_TH.xml index 5e2983f..09efee7 100644 --- a/docroot/text_th_TH.xml +++ b/docroot/text_th_TH.xml @@ -18,6 +18,7 @@ หมดเวลาในอีก {1} การสนทนากับผู้ใช้ที่ล็อกอินอยู่แล้ว]]> ยังไม่มีกิจกรรมการสนทนาก่อนหน้านี้ + ออนไลน์อยู่: {1}
diff --git a/docroot/text_tl_PH.xml b/docroot/text_tl_PH.xml index 8b412df..4a4ab02 100644 --- a/docroot/text_tl_PH.xml +++ b/docroot/text_tl_PH.xml @@ -18,6 +18,7 @@ Mawawala sa {1} Mga pag-uusap sa mga naka-log in na user]]> Walang mga naunang pag-uusap. + Naka-log in: {1}
diff --git a/docroot/text_zh_CN.xml b/docroot/text_zh_CN.xml index 21b8fb3..cc6e6c8 100644 --- a/docroot/text_zh_CN.xml +++ b/docroot/text_zh_CN.xml @@ -18,6 +18,7 @@ 将在 {1} 后断开 与已登录用户的会话]]> 暂无历史会话。 + 当前在线: {1}
diff --git a/src/app.cpp b/src/app.cpp index 4095f20..878021c 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -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::WString("Logged in: {1}").arg(size))); + layout->addWidget(std::make_unique(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()); - contentLayout->addWidget(std::make_unique("

Search

")); + contentLayout->addWidget(std::make_unique(Wt::WString::tr("search_title"), Wt::TextFormat::UnsafeXHTML)); return contentLayout; } std::pair App::setupSearchFields(Wt::WVBoxLayout *contentLayout) { - auto minAgeEdit = addSearchItemLine(contentLayout, "From age"); + auto minAgeEdit = addSearchItemLine(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(contentLayout, "To age"); + auto maxAgeEdit = addSearchItemLine(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 App::setupSearchFields(Wt::WVBoxLayout * } std::pair App::setupCountryDropDown(Wt::WVBoxLayout *contentLayout) { - auto countryOpenList = addSearchItemLine(contentLayout, "Country"); - countryOpenList->addNew("All"); + auto countryOpenList = addSearchItemLine(contentLayout, Wt::WString::tr("search_country").toUTF8()); + countryOpenList->addNew(Wt::WString::tr("search_all")); countryOpenList->setStyleClass("selectBoxes-drop-down-trigger"); auto countryDropDown = countryOpenList->addNew(); countryDropDown->setStyleClass("selectBoxes-dropdown"); - countryOpenList->setToolTip("Select the countries you'll search for"); + countryOpenList->setToolTip(Wt::WString::tr("search_country_tooltip")); std::map countries = server_.countries(); addItem("All", countryDropDown, countryOpenList, &searchFields.countries, true); addItem(country, countryDropDown, countryOpenList, &searchFields.countries); @@ -1240,12 +1240,12 @@ std::pair App::setupCountryDropDow } std::pair App::setupGendersDropDown(Wt::WVBoxLayout *contentLayout) { - auto gendersOpenList = addSearchItemLine(contentLayout, "Genders"); - gendersOpenList->addNew("All"); + auto gendersOpenList = addSearchItemLine(contentLayout, Wt::WString::tr("search_genders").toUTF8()); + gendersOpenList->addNew(Wt::WString::tr("search_all")); gendersOpenList->setStyleClass("selectBoxes-drop-down-trigger"); auto gendersDropDown = gendersOpenList->addNew(); 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 swappedGenders; for (const auto& pair : genders_) {