diff --git a/docroot/text.xml b/docroot/text.xml index d57c243..17a7cbe 100644 --- a/docroot/text.xml +++ b/docroot/text.xml @@ -1,20 +1,15 @@ - - Please type in your nick for the chat: - - - Gender: - - - Age: - - - Country: - - - Start chat - + Please type in your nick for the chat: + Gender: + Age: + Country: + Start chat + Female + Male + Pair + Transgender (M->F) + Transgender (F->M)
diff --git a/docroot/text_de_DE.xml b/docroot/text_de_DE.xml index 64e610c..a57c2eb 100644 --- a/docroot/text_de_DE.xml +++ b/docroot/text_de_DE.xml @@ -1,20 +1,15 @@ - - Bitte gib deinen Nicknamen für den Chat ein: - - - Geschlecht: - - - Alter: - - - Land: - - - Chat starten - + Bitte gib deinen Nicknamen für den Chat ein: + Geschlecht: + Alter: + Land: + Chat starten + Weiblich + Männlich + Paar + Transgender (M->F) + Transgender (F->M)
diff --git a/docroot/text_en_GB.xml b/docroot/text_en_GB.xml index 6b124f5..fc8d516 100644 --- a/docroot/text_en_GB.xml +++ b/docroot/text_en_GB.xml @@ -1,20 +1,15 @@ - - Please type in your nick for the chat: - - - Gender: - - - Age: - - - Country: - - - Start chat - + Please type in your nick for the chat: + Gender: + Age: + Country: + Start chat + Female + Male + Pair + Transgender (M->F) + Transgender (F->M)
diff --git a/docroot/text_en_US.xml b/docroot/text_en_US.xml index ae17179..39b12b2 100644 --- a/docroot/text_en_US.xml +++ b/docroot/text_en_US.xml @@ -1,20 +1,15 @@ - - Please type in your nick for the chat: - - - Gender: - - - Age: - - - Country: - - - Start chat - + Please type in your nick for the chat: + Gender: + Age: + Country: + Start chat + Female + Male + Pair + Transgender (M->F) + Transgender (F->M)
diff --git a/docroot/text_es_ES.xml b/docroot/text_es_ES.xml index 14aae2e..1d2a07a 100644 --- a/docroot/text_es_ES.xml +++ b/docroot/text_es_ES.xml @@ -1,20 +1,15 @@ - - Escribe tu nick para el chat: - - - Género: - - - Edad: - - - País: - - - Iniciar chat - + Escribe tu nick para el chat: + Género: + Edad: + País: + Iniciar chat + Mujer + Hombre + Pareja + Transgénero (H->M) + Transgénero (M->H)
diff --git a/docroot/text_fr_FR.xml b/docroot/text_fr_FR.xml index 5c095d9..94117ee 100644 --- a/docroot/text_fr_FR.xml +++ b/docroot/text_fr_FR.xml @@ -1,20 +1,15 @@ - - Veuillez saisir votre pseudo pour le chat : - - - Genre : - - - Âge : - - - Pays : - - - Lancer le chat - + Veuillez saisir votre pseudo pour le chat : + Genre : + Âge : + Pays : + Lancer le chat + Femme + Homme + Couple + Transgenre (H->F) + Transgenre (F->H)
diff --git a/docroot/text_it_IT.xml b/docroot/text_it_IT.xml index 6044cc6..b0fd750 100644 --- a/docroot/text_it_IT.xml +++ b/docroot/text_it_IT.xml @@ -1,20 +1,15 @@ - - Inserisci il tuo nick per la chat: - - - Genere: - - - Età: - - - Paese: - - - Avvia chat - + Inserisci il tuo nick per la chat: + Genere: + Età: + Paese: + Avvia chat + Donna + Uomo + Coppia + Trans (M->F) + Trans (F->M)
diff --git a/docroot/text_ja_JP.xml b/docroot/text_ja_JP.xml index b30959b..d60431b 100644 --- a/docroot/text_ja_JP.xml +++ b/docroot/text_ja_JP.xml @@ -1,20 +1,15 @@ - - チャット用のニックネームを入力してください： - - - 性別： - - - 年齢： - - - 国： - - - チャットを開始 - + チャット用のニックネームを入力してください： + 性別： + 年齢： + 国： + チャットを開始 + 女性 + 男性 + カップル + トランスジェンダー (M->F) + トランスジェンダー (F->M)
diff --git a/docroot/text_th_TH.xml b/docroot/text_th_TH.xml index c26e8d6..7c0b9b5 100644 --- a/docroot/text_th_TH.xml +++ b/docroot/text_th_TH.xml @@ -1,20 +1,15 @@ - - กรุณาใส่ชื่อเล่นของคุณสำหรับแชท: - - - เพศ: - - - อายุ: - - - ประเทศ: - - - เริ่มแชท - + กรุณาใส่ชื่อเล่นของคุณสำหรับแชท: + เพศ: + อายุ: + ประเทศ: + เริ่มแชท + ผู้หญิง + ผู้ชาย + คู่รัก + ทรานส์เจนเดอร์ (ช->ญ) + ทรานส์เจนเดอร์ (ญ->ช)
diff --git a/docroot/text_tl_PH.xml b/docroot/text_tl_PH.xml index d4e8df9..759cfb4 100644 --- a/docroot/text_tl_PH.xml +++ b/docroot/text_tl_PH.xml @@ -1,20 +1,15 @@ - - Ilagay ang iyong nick para sa chat: - - - Kasarian: - - - Edad: - - - Bansa: - - - Simulan ang chat - + Ilagay ang iyong nick para sa chat: + Kasarian: + Edad: + Bansa: + Simulan ang chat + Babae + Lalaki + Mag-partner + Transgender (M->F) + Transgender (F->M)
diff --git a/docroot/text_zh_CN.xml b/docroot/text_zh_CN.xml index 4a47916..f981729 100644 --- a/docroot/text_zh_CN.xml +++ b/docroot/text_zh_CN.xml @@ -1,20 +1,15 @@ - - 请输入用于聊天的昵称： - - - 性别： - - - 年龄： - - - 国家： - - - 开始聊天 - + 请输入用于聊天的昵称： + 性别： + 年龄： + 国家： + 开始聊天 + 女 + 男 + 情侣 + 跨性别 (男->女) + 跨性别 (女->男)
diff --git a/src/app.cpp b/src/app.cpp index 4f9a2cb..2e31084 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -372,7 +372,8 @@ void App::connectToServer() { void App::populateGenderComboBox(Wt::WComboBox *genderWidget) { int markIndex{-1}; for (const auto &genderItem: genders_) { - genderWidget->addItem(genderItem.second); + auto label = Wt::WString::tr(genderItem.second.toUTF8()); + genderWidget->addItem(label); if (genderItem.first == "F") { markIndex = genderWidget->count(); } @@ -382,7 +383,8 @@ void App::populateGenderComboBox(Wt::WComboBox *genderWidget) { std::string App::getGenderShortByGender(std::string gender) { for (const auto &genderItem: genders_) { - if (gender == genderItem.second) { + auto label = Wt::WString::tr(genderItem.second.toUTF8()).toUTF8(); + if (gender == label) { return genderItem.first.toUTF8(); } } diff --git a/src/app.h b/src/app.h index 3ff3f45..1f53080 100644 --- a/src/app.h +++ b/src/app.h @@ -23,12 +23,13 @@ private: const std::string adminName {"comiciusadmin"}; const std::string adminPassword {"p3Lv9!7?+Qq"}; + // Key: short gender code used in the protocol, Value: translation id for display text std::map genders_ { - {"F", "Female"}, - {"M", "Male"}, - {"P", "Pair"}, - {"TF", "Transgender (M->F)"}, - {"TM", "Transgender (F->M)"} + {"F", "gender_female"}, + {"M", "gender_male"}, + {"P", "gender_pair"}, + {"TF", "gender_trans_mf"}, + {"TM", "gender_trans_fm"} }; std::vector notAllowedNickPhrases_ { "whore",