Revert "Resolve "Sprachauswahl für Originalfassung der Modul(teil)-Deskriptoren""

Merge request studip/studip!3715

1 files changed, 13 insertions, 10 deletions

diff --git a/lib/models/Modulteil.php b/lib/models/Modulteil.php
index cc992af..3b8f146 100644
--- a/lib/models/Modulteil.php
+++ b/lib/models/Modulteil.php
@@ -114,11 +114,7 @@ class Modulteil extends ModuleManagementModelTreeItem
     {
         parent::__construct($id);
         $this->object_real_name = _('Modulteil');
-        if ($this->modul) {
-            $this->default_language = $this->modul->original_language;
-        } else {
-            $this->default_language = Config::get()->MVV_DESCRIPTOR_DEFAULT_LANGUAGE;
-        }
+        $this->default_language = $GLOBALS['MVV_MODUL_DESKRIPTOR']['SPRACHE']['default'];
     }
 
     /**
@@ -169,7 +165,7 @@ class Modulteil extends ModuleManagementModelTreeItem
 
     public function getDisplayName()
     {
-        $deskriptor = $this->getDeskriptor();
+        $deskriptor = $this->getDeskriptor(self::getLanguage());
         $template = Config::get()->MVV_TEMPLATE_NAME_MODULTEIL;
         if (trim($template)) {
             $placeholders = [
@@ -214,12 +210,19 @@ class Modulteil extends ModuleManagementModelTreeItem
     }
 
     /**
-     * Returns the descriptor. If this component has no descriptor already
-     * a new one is created and returned.
+     * Returns the Deskriptor in the given language. A Modul has always a
+     * Deskriptor in the default language. If the given language is unknown, the
+     * method returns the deskriptor in the default language.
      *
-     * @return ModulteilDeskriptor The descriptor.
+     * @param string $language The id of the language
+     * @param bool If true returns always a new descriptor
+     * @return object The Deskriptor.
      */
-    public function getDeskriptor() {
+    public function getDeskriptor($language = null, $force_new = false) {
+        if (!isset($GLOBALS['MVV_MODULTEIL_DESKRIPTOR']['SPRACHE']['values'][$language])) {
+            $language = $this->default_language;
+        }
+
         if (!$this->deskriptoren) {
             // the module is new and has no descriptor
             // return a new descriptor in the default language