fix merge conflict

Author: Vanessa Bedzra

README.rst

@@ -50,7 +50,7 @@ Testing
 
 To run all the tests the only thing you need to do is run::
 
-    pip install -r tests/requirements.txt
+    pip install -r tests/requirements/requirements_base.txt
     python test_settings.py
 
 

djangocms_versioning/cms_toolbars.py

@@ -37,6 +37,7 @@
 )
 from djangocms_versioning.models import Version
 
+
 VERSIONING_MENU_IDENTIFIER = "version"
 CMS_SUPPORTS_DELETING_TRANSLATIONS = version.Version(cms_version) > version.Version("4.1.4")
 CMS_ADDS_PREVIEW_BUTTON = version.Version(cms_version) >= version.Version("4.2")
@@ -448,11 +449,15 @@ def add_language_menu(self):
             return
 
         languages = get_language_tuple(self.current_site.pk)
+        page_languages = self.request.current_page.get_languages()
         if len(languages) < 2:
             return  # No need to show the language menu if there is only one language
 
+        if len(page_languages) < 2:
+            return # No need to show language menu if current page has one language
+
         language_menu = self.toolbar.get_or_create_menu(
-            LANGUAGE_MENU_IDENTIFIER, _("Language"), position=-1
+            LANGUAGE_MENU_IDENTIFIER, _("Languages"), position=-1
         )
         for code, name in languages:
             # Get the page content, it could be draft too!

tests/test_toolbars.py

@@ -497,17 +497,25 @@ def _get_toolbar_item_by_name(self, menu, name):
 
     @override_settings(CMS_LANGUAGES = {1: [{"code": "en", "name": "English"}]})
     def test_change_language_menu_page_toolbar_one_languages(self):
-        page_content = PageContentWithVersionFactory()
+        page_content = PageContentWithVersionFactory(content__language="en")
+        page = page_content.page
+
+        page.update_languages(["en"])
+
         request = self.get_page_request(
-            page=page_content.page,
+            page=page,
             path=get_object_edit_url(page_content),
             user=self.get_superuser(),
         )
         request.toolbar.set_object(page_content)
         request.toolbar.populate()
         request.toolbar.post_template_populate()
+
         language_menu = request.toolbar.get_menu(LANGUAGE_MENU_IDENTIFIER)
-        self.assertIsNone(language_menu)
+        self.assertIsNone(
+            language_menu,
+            "Language menu should not be created if the page has only one language."
+        )
 
     def test_change_language_menu_page_toolbar(self):
         """Check that patched PageToolbar.change_language_menu only provides
@@ -556,6 +564,7 @@ def test_change_language_menu_page_toolbar(self):
             lang_code = "fr" if "Française" in item.name else "it"
             self.assertIn(f"language={lang_code}", item.url)
 
+    
     @skipIf(cms_version <= Version("4.1.4"), "For CMS 4.1.5 and bove: Add delete translation menu")
     def test_change_language_menu_page_toolbar_including_delete(self):
         """Check that patched PageToolbar.change_language_menu also provides