#792 Sprachverwaltung entfernen

RELEASE_NOTES.md

@@ -2,10 +2,31 @@
 
 ## Release 4.10 - 2026-05-12
 
-### Update
+Der neue Release bringt insbesondere Veränderungen bei der Sprachverwaltung und
+den Optionen, die in der Administration editierbar sind.
+
+### Update auf OPUS 4.10
+
+Das Updateskript, `bin/update.sh`, muss ausgeführt werden, da es Änderungen an 
+der Datenbank und weitere Updateschritte gibt. 
+
+- Tabelle `configuration` wird angelegt
+- Tabelle `languages` wird entfernt
+- Konfiguration in `config.xml` with in die Datenbank übertragen und die
+  Datei optional gelöscht
+- Aktive Sprachen werden in neue Konfigurationsoptionen übernommen
 
-Das Updateskript muss ausgeführt werden, da es Änderungen an der Datenbank und
-zusätzliche Updateschritte gibt. 
+### Sprachverwaltung
+
+Die Sprachverwaltung wurde aus der Administration entfernt. Dafür werden jetzt
+485 ISO 639 Sprachen im Standard unterstützt. Welche Sprachen in den Formularen
+zur Auswahl stehen sollen, lässt sich über Optionen einstellen. 
+
+Mehr dazu findet sich im OPUS 4 Handbuch unter
+https://www.opus-repository.org/userdoc/admin/languages.html
+
+Beim Update werden die aktiven Sprachen automatisch in die neue Konfiguration
+übernommen. 
 
 ### Konfiguration
 
@@ -18,8 +39,6 @@ Die editierbaren Optionen werden nun in `application/configs/options.yml`
 definiert. Generell kann die Liste lokal erweitert werden. Im Standard werden
 im Laufe der Zeit mehr Optionen in der Weboberfläche verfügbar gemacht werden.
 
-TODO Link to documentation
-
 ### RSS-Links
 
 RSS-Links können nun ausgeblendet werden. Sie werden automatisch ausgeblendet,

application/configs/application.ini

@@ -61,7 +61,11 @@ db.debug = 0
 ; LOCALE SETTINGS
 resources.locale.default = 'de'
 
-; SUPPORTED LANGUAGES
+; Languages selectable for documents
+i18n.languages.active = deu, eng, fra, rus, spa, mul
+i18n.languages.sortByName = 0
+
+; SUPPORTED USER INTERFACE LANGUAGES
 supportedLanguages = de,en
 
 ;GENERAL SETTINGS

application/configs/navigationModules.xml

@@ -364,50 +364,6 @@
                     </pages>
                 </licence>
 
-                <languages>
-                    <type>mvc</type>
-                    <label>admin_title_languages</label>
-                    <description>admin_title_languages_description</description>
-                    <group>group-cafelatte</group>
-                    <module>admin</module>
-                    <controller>language</controller>
-                    <action>index</action>
-                    <resource>languages</resource>
-                    <pages>
-                        <show>
-                            <type>mvc</type>
-                            <label>admin_language_show</label>
-                            <module>admin</module>
-                            <controller>language</controller>
-                            <action>show</action>
-                        </show>
-
-                        <new>
-                            <type>mvc</type>
-                            <label>admin_language_new</label>
-                            <module>admin</module>
-                            <controller>language</controller>
-                            <action>new</action>
-                        </new>
-
-                        <edit>
-                            <type>mvc</type>
-                            <label>admin_language_edit</label>
-                            <module>admin</module>
-                            <controller>language</controller>
-                            <action>edit</action>
-                        </edit>
-
-                        <delete>
-                            <type>mvc</type>
-                            <label>admin_language_delete</label>
-                            <module>admin</module>
-                            <controller>language</controller>
-                            <action>delete</action>
-                        </delete>
-                    </pages>
-                </languages>
-
                 <dnbInstitute>
                     <type>mvc</type>
                     <label>admin_title_dnbinstitute</label>

application/configs/options.yml

@@ -1,3 +1,28 @@
+#
+# Defines options available in administration user interface (Settings->Options).
+#
+# The 'type' defines how the option appears in the form. Supported types are
+# - string (default)
+# - int
+# - bool
+#
+# The 'section' allows grouping options. The names are arbitrary and are used as section
+# labels if no translations for the section exist.
+#
+# 'options' can be used to pass additional options to the form element, for
+# instance to increase the size.
+#
+# The translation keys for options use the following patterns:
+# - admin_config_section_SECTIONNAME
+# - admin_config_OPTIONKEY
+# - admin_config_OPTIONKEY_description
+#
+# For instance:
+# - admin_config_section_languages
+# - admin_config_i18n.languages.active
+# - admin_config_i18n.languages.active_description
+#
+
 searchengine.solr.parameterDefaults.rows:
   type: int
   section: searching
@@ -7,3 +32,13 @@ searchengine.solr.parameterDefaults.rows:
 browsing.series.sortByTitle:
   type: bool
   section: browsing
+
+i18n.languages.active:
+  type: string
+  section: languages
+  options:
+    size: 60
+
+i18n.languages.sortByName:
+  type: bool
+  section: languages

composer.json

@@ -23,8 +23,8 @@
     "ext-yaml": "*",
     "opus4/zf1-future": "1.25.*",
     "jpgraph/jpgraph": "dev-master",
-    "opus4-repo/opus4-common": "^4.9",
-    "opus4-repo/framework": "dev-master as 4.10",
+    "opus4-repo/opus4-common": "dev-master as 4.10",
+    "opus4-repo/framework": "dev-lang407 as 4.10",
     "opus4-repo/search": "^4.9",
     "opus4-repo/opus4-bibtex": "^4.9",
     "opus4-repo/opus4-import": "^4.9",
@@ -34,6 +34,7 @@
     "opus4-repo/opus4-sword": "^4.9",
     "opus4-repo/opus4-app-common": "dev-main as 4.10",
     "opus4-repo/opus4-deepgreen": "^4.9",
+    "opus4-repo/opus4-i18n": "dev-main as 4.10",
     "components/jquery": "3.4.*",
     "components/jqueryui": "1.12.*",
     "oomphinc/composer-installers-extender": "^2.0",

db/masterdata/022-set-opus-version.sql

@@ -11,7 +11,7 @@ START TRANSACTION;
 -- Set internal OPUS version (for controlling updates)
 
 TRUNCATE TABLE `opus_version`;
-INSERT INTO `opus_version` (`version`) VALUES (21);
+INSERT INTO `opus_version` (`version`) VALUES (22);
 
 COMMIT;
 

library/Application/Controller/Action/Helper/Translation.php

@@ -31,7 +31,6 @@
 
 use Opus\Common\Enrichment;
 use Opus\Document;
-use Opus\Language;
 
 /**
  * Helper for handling translations.
@@ -103,12 +102,7 @@ public function getKeyForField($modelName, $fieldName)
             $translationKey = $this->normalizeModelName($modelName) . '_' . $fieldName;
             return preg_replace('/Opus_Common_/', 'Opus_', $translationKey); // TODO LAMINAS fix keys
         } else {
-            switch ($modelName) {
-                case Language::class:
-                    return $this->normalizeModelName($modelName) . '_' . $fieldName;
-                default:
-                    return $fieldName;
-            }
+            return $fieldName;
         }
     }
 

library/Application/Form/Element/Language.php

@@ -29,7 +29,10 @@
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  */
 
-use Opus\Common\Language;
+use Opus\App\Common\Configuration;
+use Opus\Common\Log;
+use Opus\I18n\I18nException;
+use Opus\I18n\Languages;
 
 /**
  * TODO override setLabel for more robust translation
@@ -52,6 +55,23 @@ public function init()
         }
     }
 
+    /**
+     * @param string|null $value
+     * @return void
+     */
+    public function setValue($value)
+    {
+        if ($value !== null) {
+            $language = Languages::getLanguage($value);
+
+            if (null !== $language) {
+                $value = $language->getId();
+            }
+        }
+
+        parent::setValue($value);
+    }
+
     /**
      * @return array
      */
@@ -65,15 +85,68 @@ public static function getLanguageList()
 
     /**
      * Setup language list.
+     *
+     * TODO reduce responsibilities of this function
      */
     public static function initLanguageList()
     {
+        $config = Configuration::getInstance()->getConfig();
+
+        if (! isset($config->i18n->languages->active)) {
+            throw new Exception('no active languages configured');
+        }
+
+        $optionValue = $config->i18n->languages->active;
+
+        if (strlen(trim($optionValue)) > 0) {
+            // Use configured languages
+            $activeLanguages = explode(',', $optionValue);
+        } else {
+            // Use all languages
+            $helper          = new Languages();
+            $activeLanguages = array_keys($helper->getAllAsArray());
+        }
+
+        $activeLanguages = array_filter($activeLanguages, function ($lang) {
+            return ! empty($lang);
+        });
+
+        if (isset($config->i18n->languages->local)) {
+            $localLanguages = $config->i18n->languages->local->toArray();
+            $languages      = new Languages();
+            try {
+                $languages->addLanguages($localLanguages);
+            } catch (I18nException $ex) {
+                Log::get()->err('Error loading local languages: ' . $ex->getMessage());
+            }
+        }
+
         $translate = Application_Translate::getInstance();
+        $locale    = $translate->getLocale();
+
         $languages = [];
-        foreach (Language::getAllActiveTable() as $languageRow) {
-            $langId             = $languageRow['part2_t'];
-            $languages[$langId] = $translate->translateLanguage($langId);
+
+        foreach ($activeLanguages as $lang) {
+            $part2b   = trim($lang);
+            $language = Languages::getLanguage($part2b);
+
+            if ($language === null) {
+                Log::get()->err("Language '{$part2b}' not found");
+                continue;
+            }
+
+            $langId      = $language->getPart2t();
+            $translation = $language->getDisplayName($locale);
+
+            // TODO support local translations
+
+            $languages[$langId] = $translation;
         }
+
+        if (isset($config->i18n->languages->sortByName) && filter_var($config->i18n->languages->sortByName, FILTER_VALIDATE_BOOLEAN)) {
+            asort($languages);
+        }
+
         self::$languageList = $languages;
     }
 }