Resolve "/shared/modul/description/ verwendet falschen Sprachicon Pfad"

Closes #2757

Merge request studip/studip!1869

app/views/materialien/files/add_dokument.php

@@ -24,7 +24,7 @@
     <? foreach($GLOBALS['MVV_LANGUAGES']['values'] as $key => $entry) : ?>
         <tr>
             <td rowspan="2">
-                <?= Assets::img('languages/lang_' . mb_strtolower($key) . '.gif') ?>
+                <?= Assets::img(MVV::getContentLanguageImagePath($key), ['alt' => $entry['name'], 'size' => 24]) ?>
             </td>
             <td>
                 <label>

app/views/materialien/files/details.php

@@ -16,7 +16,7 @@
                 <ul class="list-unstyled">
                 <? foreach($documents as $key => $document): ?>
                     <li>
-                        <?= Assets::img('languages/lang_' . mb_strtolower($key) . '.gif') ?>
+                        <?= Assets::img(MVV::getContentLanguageImagePath($key), ['size' => 24]) ?>
                         <b><?= htmlReady($document->getDisplayName()); ?></b>
                         <? if($document->file_ref->isLink()): ?>
                             <a href="<?= htmlReady($document->getFilename()); ?>" target="_blank"><?= htmlReady($document->getFilename()); ?></a>

app/views/materialien/files/index.php

@@ -47,7 +47,7 @@
             </td>
             <td class="dont-hide">
             <? foreach ($mvv_file->file_refs as $fileref) : ?>
-                <?= Assets::img('languages/lang_' . mb_strtolower($fileref->file_language) . '.gif') ?>
+                <?= Assets::img(MVV::getContentLanguageImagePath($fileref->file_language), ['size' => '24']) ?>
             <? endforeach; ?>
             </td>
             <td class="dont-hide"><?= htmlReady($GLOBALS['MVV_DOCUMENTS']['TYPE']['values'][$mvv_file->type]['name']) ?></td>

app/views/materialien/files/range.php

@@ -63,7 +63,7 @@
             </td>
             <td>
                 <? foreach ($mvv_file->file_refs as $fileref) : ?>
-                    <?= Assets::img('languages/lang_' . mb_strtolower($fileref->file_language) . '.gif') ?>
+                    <?= Assets::img(MVV::getContentLanguageImagePath($fileref->file_language), ['size' => 24]) ?>
                 <? endforeach; ?>
             </td>
             <td><?= htmlReady($GLOBALS['MVV_DOCUMENTS']['TYPE']['values'][$mvv_file->type]['name']); ?></td>

app/views/module/module/details.php

@@ -23,8 +23,7 @@
                             <? foreach ($modulteil->deskriptoren->getAvailableTranslations() as $language) : ?>
                                 <? $lang = $GLOBALS['MVV_MODUL_DESKRIPTOR']['SPRACHE']['values'][$language]; ?>
                                 <a href="<?= $controller->action_link('modulteil/' . join('/', [$modulteil->id, $institut_id]), ['display_language' => $language]) ?>">
-                                    <img src="<?= Assets::image_path('languages/lang_' . mb_strtolower($language) . '.gif') ?>"
-                                         alt="<?= $lang['name'] ?>" title="<?= $lang['name'] ?>">
+                                    <?= Assets::img(MVV::getContentLanguageImagePath($language), ['alt' => $lang['name'], 'size' => 24]) ?>
                                 </a>
                             <? endforeach; ?>
                         <? endif; ?>

app/views/module/module/modul.php

@@ -694,6 +694,6 @@ if ($GLOBALS['MVV_MODUL']['SPRACHE']['default'] != $display_language) {
 </form>
 <? if (!$def_lang) : ?>
     <script>
-        jQuery('#modul_form').find('textarea, input[type=text]').after('<div style="padding-top:10px;"><a href="#" title="<?= _('Originalfassung anzeigen') ?>" class="mvv-show-original" data-type="modul"><img src="<?= Assets::image_path('languages/lang_' . mb_strtolower($modul->getDefaultLanguage()) . '.gif') ?>" alt="<?= _('Originalfassung') ?>"></a></div>');
+        jQuery('#modul_form').find('textarea, input[type=text]').after('<div style="padding-top:10px;"><a href="#" title="<?= _('Originalfassung anzeigen') ?>" class="mvv-show-original" data-type="modul"><?= Assets::img(MVV::getContentLanguageImagePath($modul->getDefaultLanguage()), ['alt' => _('Originalfassung'), 'size' => 24]) ?></a></div>');
     </script>
 <? endif; ?>

app/views/module/module/module.php

@@ -47,8 +47,7 @@
                     <? foreach ($languages as $language) : ?>
                         <? $lang = $GLOBALS['MVV_MODUL_DESKRIPTOR']['SPRACHE']['values'][$language]; ?>
                         <a href="<?= $controller->action_link('modul/' . $modul->id . '/', ['display_language' => $language]) ?>">
-                            <img src="<?= Assets::image_path('languages/lang_' . mb_strtolower($language) . '.gif') ?>"
-                                 alt="<?= $lang['name'] ?>" title="<?= $lang['name'] ?>">
+                            <?= Assets::img(MVV::getContentLanguageImagePath($language), ['alt' => $lang['name'], 'size' => 24]) ?>
                         </a>
                     <? endforeach; ?>
                 <? endif; ?>

app/views/module/module/modulteil.php

@@ -478,6 +478,6 @@ if ($GLOBALS['MVV_MODULTEIL']['SPRACHE']['default'] != $display_language) {
 </form>
 <? if (!$def_lang) : ?>
     <script>
-        jQuery('#modulteil_form').find('textarea, input[type=text]').after('<div style="padding-top:10px;"><a href="#" title="<?= _('Originalfassung anzeigen') ?>" class="mvv-show-original" data-type="modulteil"><img src="<?= Assets::image_path('languages/lang_' . mb_strtolower($modul->getDefaultLanguage()) . '.gif') ?>" alt="<?= _('Originalfassung') ?>"></a></div>');
+        jQuery('#modulteil_form').find('textarea, input[type=text]').after('<div style="padding-top:10px;"><a href="#" title="<?= _('Originalfassung anzeigen') ?>" class="mvv-show-original" data-type="modulteil"><?= Assets::img(MVV::getContentLanguageImagePath($modul->getDefaultLanguage()), ['alt' => _('Originalfassung'), 'size' => 24]) ?></a></div>');
     </script>
 <? endif; ?>

app/views/shared/deskriptor_language.php

@@ -3,7 +3,7 @@
 <? foreach ($GLOBALS[strtoupper($table)]['SPRACHE']['values'] as $lang => $value) : ?>
 <div style="padding-top:10px;">
     <a href="<?= URLHelper::getLink($link, ['display_language' => $lang]) ?>">
-        <img src="<?= Assets::image_path('languages/lang_' . mb_strtolower($lang) . '.gif') ?>" alt="<?= $value['name'] ?>">
+        <?= Assets::img(MVV::getContentLanguageImagePath($lang), ['alt' => $value['name'], 'size' => 24]) ?>
         <?= $value['name'] ?> (<?= in_array($lang, $languages) ? 'bearbeiten' : 'neu anlegen' ?>)
         <?= $lang == $sprache ? Icon::create('accept', 'accept', [])->asImg() : '' ?>
     </a>

app/views/shared/modul/description.php

@@ -3,7 +3,7 @@
     <? foreach ($modul->deskriptoren->getAvailableTranslations() as $language) : ?>
         <? $lang = $GLOBALS['MVV_MODUL_DESKRIPTOR']['SPRACHE']['values'][$language]; ?>
         <a data-dialog="size=auto;title='<?= htmlReady($modul->getDisplayName()) ?>'" href="<?= $controller->action_link('description/' . $modul->id . '/', ['display_language' => $language]) ?>">
-            <img src="<?= Assets::image_path('languages/lang_' . mb_strtolower($language) . '.gif') ?>" alt="<?= $lang['name'] ?>" title="<?= $lang['name'] ?>">
+            <?= Assets::img(MVV::getContentLanguageImagePath($language), ['alt' => $lang['name'], 'size' => 24]) ?>
         </a>
     <? endforeach; ?>
 </div>

lib/classes/MVV.class.php

@@ -833,4 +833,17 @@ class MVV implements Loggable {
         return $result;
     }
 
+    /**
+     * Returns imagepath for given language, used by MVV
+     * First tries $GLOBALS['CONTENT_LANGUAGES'], if not defined returns hardcoded path
+     *
+     * @param string $language e.g. 'DE'
+     * @return string path to language icon
+     */
+    public static function getContentLanguageImagePath($language): string
+    {
+        $content_language = $GLOBALS['MVV_MODUL_DESKRIPTOR']['SPRACHE']['values'][$language]['content_language'];
+        return 'languages/' . ($GLOBALS['CONTENT_LANGUAGES'][$content_language]?$GLOBALS['CONTENT_LANGUAGES'][$content_language]['picture']:'lang_' . mb_strtolower($language) . '.gif');
+    }
+
 }