Merge branch 'imgui-integration' of https://github.com/katemonster33/…

…Cataclysm-DDA into imgui-integration
CleverRaven · Dec 17, 2023 · de073d1 · de073d1
2 parents 52e3ee7 + 1d6204e
commit de073d1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/cata_imgui.cpp b/src/cata_imgui.cpp
@@ -776,11 +776,11 @@ void cataimgui::string_input_box::draw_controls()
         ImGui::SetKeyboardFocusHere( 0 );
     }
     ImGui::InputText( "##inputtext", input.data(), input.max_size() );
-    if( ImGui::Button( "OK" ) || ImGui::IsKeyDown( ImGuiKey_Enter ) ) {
+    if( ImGui::Button( _( "OK" ) ) || ImGui::IsKeyDown( ImGuiKey_Enter ) ) {
         result = dialog_result::OKClicked;
     }
     ImGui::SameLine();
-    if( ImGui::Button( "Cancel" ) || ImGui::IsKeyDown( ImGuiKey_Escape ) ) {
+    if( ImGui::Button( _( "Cancel" ) ) || ImGui::IsKeyDown( ImGuiKey_Escape ) ) {
         result = dialog_result::CancelClicked;
     }
 }

diff --git a/src/trade_ui.cpp b/src/trade_ui.cpp
@@ -112,8 +112,9 @@ trade_ui::trade_ui( party_t &you, npc &trader, currency_t cost, std::string titl
     _panes[_you]->add_character_items( you );
     _panes[_you]->add_nearby_items( 1 );
     _panes[_trader]->add_character_items( trader );
-    _panes[_trader]->set_title( "Trader Inventory" ); // DO NOT REMOVE: ImGui needs each child window to have unique titles/IDs
-    _panes[_you]->set_title( "Your Inventory" );
+    _panes[_trader]->set_title(
+        _( "Trader Inventory" ) ); // DO NOT REMOVE: ImGui needs each child window to have unique titles/IDs
+    _panes[_you]->set_title( _( "Your Inventory" ) );
     if( trader.is_shopkeeper() ) {
         _panes[_trader]->categorize_map_items( true );