lang: merge translations

2 files changed, 7 insertions, 11 deletions

diff --git a/app/src/windows/main.cpp b/app/src/windows/main.cpp
index d4c3015..28527cd 100644
--- a/app/src/windows/main.cpp
+++ b/app/src/windows/main.cpp
@@ -14,8 +14,6 @@
 namespace turns::app::windows
 {
 
-  using namespace turns::lang;
-
   main::main(BaseObjectType * base, Glib::RefPtr<Gtk::Builder> const builder)
       : Gtk::ApplicationWindow{base}
       , m_add_participant{builder->get_widget<Gtk::Button>("add_participant")}
@@ -25,9 +23,9 @@ namespace turns::app::windows
       , m_title(ADW_WINDOW_TITLE(builder->get_widget<Gtk::Widget>("title")->gobj()))
       , m_participants{Gio::ListStore<domain::participant>::create()}
   {
-    m_add_participant->set_tooltip_text(_(tooltips::add_a_participant));
-    m_open_main_menu->set_tooltip_text(_(tooltips::main_menu));
-    adw_window_title_set_subtitle(m_title, _(labels::no_active_turn_order));
+    m_add_participant->set_tooltip_text(_(lang::add_participant));
+    m_open_main_menu->set_tooltip_text(_(lang::main_menu));
+    adw_window_title_set_subtitle(m_title, _(lang::no_active_turn_order));
 
     m_add_participant->signal_clicked().connect(sigc::mem_fun(*this, &main::handle_create_participant));
 
diff --git a/app/tests/windows/main.cpp b/app/tests/windows/main.cpp
index bf3aba2..8661153 100644
--- a/app/tests/windows/main.cpp
+++ b/app/tests/windows/main.cpp
@@ -18,8 +18,6 @@
 namespace turns::app::windows::tests
 {
 
-  using namespace turns::lang;
-
   TEST_CASE("Newly constructed main window", "[windows]")
   {
     auto locale = GENERATE("en_US.UTF-8", "de_CH.UTF-8");
@@ -44,7 +42,7 @@ namespace turns::app::windows::tests
     {
       auto widget = builder->get_widget<Gtk::Widget>("title");
       auto adw = ADW_WINDOW_TITLE(widget->gobj());
-      REQUIRE(adw_window_title_get_subtitle(adw) == Glib::ustring{_(labels::no_active_turn_order)});
+      REQUIRE(adw_window_title_get_subtitle(adw) == Glib::ustring{_(lang::no_active_turn_order)});
     }
 
     SECTION("the window title is not empty")
@@ -58,19 +56,19 @@ namespace turns::app::windows::tests
     {
       auto widget = builder->get_widget<Gtk::Widget>("title");
       auto adw = ADW_WINDOW_TITLE(widget->gobj());
-      REQUIRE(adw_window_title_get_title(adw) == Glib::ustring{_(labels::turns)});
+      REQUIRE(adw_window_title_get_title(adw) == Glib::ustring{_(lang::turns)});
     }
 
     SECTION("the add_participant button has the correct tooltip")
     {
       auto widget = builder->get_widget<Gtk::Button>("add_participant");
-      REQUIRE(widget->get_tooltip_text() == Glib::ustring{_(tooltips::add_a_participant)});
+      REQUIRE(widget->get_tooltip_text() == Glib::ustring{_(lang::add_participant)});
     }
 
     SECTION("the open_main_menu button has the correct tooltip")
     {
       auto widget = builder->get_widget<Gtk::MenuButton>("open_main_menu");
-      REQUIRE(widget->get_tooltip_text() == Glib::ustring{_(tooltips::main_menu)});
+      REQUIRE(widget->get_tooltip_text() == Glib::ustring{_(lang::main_menu)});
     }
   }