Added new language flags. Added support for regional language codes.

CHANGELOG.md

@@ -9,7 +9,7 @@ All notable changes to this project will be documented in this file.
 
 ## [2.1.0] - t.b.r.
 ### Added
-- Added support for regional language codes (e.g. de_CH).
+- Added support for regional language codes (e.g. de-CH).
 
 ### Fixed
 - Fixed issue where alias of default language was picked for alternative languages when site was entered on root (/).

src/Resources/contao/dca/tl_page.php

@@ -364,6 +364,16 @@ public function languageOptions() {
         // Remove 'all' entry
         unset($arrLanguages['']);
 
+        // Change format from underscores to hyphens
+        foreach ($arrLanguages as $short => $name) {
+            if (\strpos($short, '_')) {
+                unset($arrLanguages[$short]);
+                $arrLanguages[
+                    \str_replace('_', '-', $short)
+                ] = $name;
+            }
+        }
+
         // Sort by value (a-z)
         \asort($arrLanguages);
 

src/Resources/contao/dca/tl_page_i18nl10n.php

@@ -154,7 +154,7 @@
             'reference'        => &$GLOBALS['TL_LANG']['LNG'],
             'eval'             => array(
                 'mandatory'          => true,
-                'rgxp'               => 'locale',
+                'rgxp'               => 'language',
                 'maxlength'          => 20,
                 'nospace'            => true,
                 'doNotCopy'          => true,
@@ -242,11 +242,11 @@ class tl_page_i18nl10n extends tl_page
     protected $pageType;
 
     /**
-     * Generate a localization icon for treeview
+     * Generate a localization icon for tree view.
      *
      * @param               $row
      * @param               $label
-     * @param \DataContainer $dc
+     * @param \Contao\DataContainer $dc
      * @param string        $imageAttribute
      * @param bool          $blnReturnImage
      * @param bool          $blnProtected
@@ -255,12 +255,14 @@ class tl_page_i18nl10n extends tl_page
      */
     public function labelCallback($row, $label, \DataContainer $dc = null, $imageAttribute = '', $blnReturnImage = false, $blnProtected = false)
     {
-        return sprintf(
-            '<span class="i18nl10n_page"><img class="i18nl10n_flag" src="%1$s"> %2$s [%3$s]</span>',
-            'bundles/verstaerkeri18nl10n/img/flag_icons/' . $row['language']
-            . ($row['i18nl10n_published'] ? '.png' : '_invisible.png'),
-            specialchars($row['title']),
-            $GLOBALS['TL_LANG']['LNG'][$row['language']]
+        return \sprintf(
+            '<span class="i18nl10n_page"><img class="i18nl10n_flag%1$s" src="%2$s"> %3$s [%4$s]</span>',
+            $row['i18nl10n_published'] ? '' : ' is--invisible',
+            'bundles/verstaerkeri18nl10n/img/flag_icons/' . \str_replace('-', '_', $row['language']) . '.png',
+            \Contao\StringUtil::specialchars($row['title']),
+            $GLOBALS['TL_LANG']['LNG'][
+                \str_replace('-', '_', $row['language'])
+            ]
         );
     }
 
@@ -299,8 +301,10 @@ private function localizeAllMessage()
                 foreach ($domain['localizations'] as $localization) {
                     $strDomainLocalization .= sprintf(
                         '<li><img class="i18nl10n_flag" src="%1$s.png" /> %2$s</li>',
-                        $strFlagPath . $localization,
-                        $GLOBALS['TL_LANG']['LNG'][$localization]
+                        $strFlagPath . \str_replace('-', '_', $localization),
+                        $GLOBALS['TL_LANG']['LNG'][
+                            \str_replace('-', '_', $localization)
+                        ]
                     );
                 }
             } else {
@@ -312,7 +316,7 @@ private function localizeAllMessage()
 
             $strDomainLanguages .= sprintf(
                 '<li class="i18nl10n_localize_domain"><img class="i18nl10n_flag" src="%1$s.png" /> %2$s<ul>%3$s</ul></li>',
-                $strFlagPath . $domain['default'],
+                $strFlagPath . \str_replace('-', '_', $domain['default']),
                 $key ?: '*',
                 $strDomainLocalization
             );
@@ -797,7 +801,9 @@ public function languageOptions(\Contao\DataContainer $dc)
                         (array) $this->User->i18nl10n_languages
                     ))
             ) {
-                $arrOptions[$language] = $arrLanguages[$language];
+                $arrOptions[$language] = $arrLanguages[
+                    \str_replace('-', '_', $language)
+                ];
             }
         }
 

src/Resources/contao/templates/lang_default.html5

@@ -1,18 +1,18 @@
 <ul>
     <?php foreach ($this->items as $item): ?>
-        <li class="<?php echo ($item['class'] ? $item['class'] . ' ' : '') . 'i18nl10n_lang i18nl10n_lang_' . $item['language'] . ($item['isActive'] ? ' active' : ''); ?>">
+        <li class="<?= ($item['class'] ? $item['class'] . ' ' : '') . 'i18nl10n_lang i18nl10n_lang_' . $item['language'] . ($item['isActive'] ? ' active' : ''); ?>">
             <?php if (!$item['isActive']): // disable link if active ?>
-            <a href="<?php echo $this->generateFrontendUrl($item, $this->uriParams); ?>"
-               title="<?php echo $item['title']; ?>">
+            <a href="<?= $this->generateFrontendUrl($item, $this->uriParams); ?>"
+               title="<?= $item['title']; ?>">
                 <?php endif; ?>
                 <i class="i18nl10n_flag">
-                    <img src="bundles/verstaerkeri18nl10n/img/flag_icons/<?php echo $item['language']; ?>.png">
+                    <img src="bundles/verstaerkeri18nl10n/img/flag_icons/<?= \str_replace('-', '_', $item['language']); ?>.png">
                 </i>
             <span class="i18nl10n_label">
-                <?php echo $this->languages[$item['language']]; ?>
+                <?= $this->languages[\str_replace('-', '_', $item['language'])]; ?>
             </span>
             <span class="i18nl10n_iso">
-                <?php echo $item['language']; ?>
+                <?= $item['language']; ?>
             </span>
                 <?php if (!$item['isActive']): // disable link if active ?>
             </a>

src/Resources/contao/templates/lang_select.html5

@@ -1,10 +1,12 @@
-<form name="<?php echo $this->type; ?>">
+<form name="<?= $this->type; ?>">
     <select name="i18nl10n_language" onchange="window.location.href = this.value">
 
     <?php foreach ($this->items as $item): ?>
         <option
-            value="<?php echo $this->generateFrontendUrl($item, $this->uriParams); ?>" <?php echo $item['isActive'] ? ' class="active" selected="selected"' : ''; ?>>
-            <?php echo $this->languages[$item['language']] ?>
+            value="<?= $this->generateFrontendUrl($item, $this->uriParams); ?>"
+            <?= $item['isActive'] ? ' class="active" selected="selected"' : ''; ?>
+        >
+            <?= $this->languages[\str_replace('-', '_', $item['language'])] ?>
         </option>
     <?php endforeach; ?>
 

src/Resources/contao/templates/mod_i18nl10n_nav.html5

@@ -1,6 +1,6 @@
 <!-- indexer::stop -->
-<div class="<?php echo $this->i18nl10n_langStyle ? $this->class . ' i18nl10n_lang_style i18nl10n_lang_style_' . $this->i18nl10n_langStyle : $this->class; ?> block"<?php echo ($this->style ? 'style="' . $this->style . '"' : '') . $this->cssID; ?>>
-    <?php echo $this->headline ? "<$this->hl>$this->headline</$this->hl>" : ''; ?>
-    <?php echo $this->items; ?>
+<div class="<?= $this->i18nl10n_langStyle ? $this->class . ' i18nl10n_lang_style i18nl10n_lang_style_' . $this->i18nl10n_langStyle : $this->class; ?> block"<?= ($this->style ? 'style="' . $this->style . '"' : '') . $this->cssID; ?>>
+    <?= $this->headline ? "<$this->hl>$this->headline</$this->hl>" : ''; ?>
+    <?= $this->items; ?>
 </div>
 <!-- indexer::continue -->

src/Resources/contao/templates/mod_search_i18nl10n.html5

@@ -2,12 +2,12 @@
 
 <?php $this->block('content'); ?>
 
-    <?php echo $this->form; ?>
+    <?= $this->form; ?>
 
     <?php if ($this->header): ?>
-        <p class="header"><?php echo preg_replace('@ i18nl10n::.[A-z]@', '', $this->header); ?> (<?php echo $this->duration; ?>)</p>
+        <p class="header"><?= \preg_replace('@ i18nl10n::.[A-z]@', '', $this->header); ?> (<?= $this->duration; ?>)</p>
     <?php endif; ?>
 
-    <?php echo preg_replace('@<span class="highlight">i18nl10n::[A-z]{2}</span>@', '', $this->results) . $this->pagination; ?>
+    <?= \preg_replace('@<span class="highlight">i18nl10n::[A-z]{2}</span>@', '', $this->results) . $this->pagination; ?>
 
 <?php $this->endblock(); ?>

src/Resources/contao/templates/nav_i18nl10n.html5

@@ -1,16 +1,16 @@
 <?php $this->import('Verstaerker\I18nl10nBundle\Classes\I18nl10nFrontend', 'I18nl10n'); ?>
-<ul class="<?php echo $this->level; ?>">
+<ul class="<?= $this->level; ?>">
     <?php foreach ($this->I18nl10n->i18nl10nNavItems($this->items) as $item): ?>
         <?php if ($item['isActive']): ?>
-            <li class="<?php echo $item['class']; ?>">
-                <span class="<?php echo $item['class']; ?>"><?php echo $item['link']; ?></span><?php echo $item['subitems']; ?>
+            <li class="<?= $item['class']; ?>">
+                <span class="<?= $item['class']; ?>"><?= $item['link']; ?></span><?= $item['subitems']; ?>
             </li>
         <?php else: ?>
-            <li<?php if ($item['class']): ?> class="<?php echo $item['class']; ?>"<?php endif; ?>>
-                <a href="<?php echo $item['href']; ?>"
-                   title="<?php echo $item['pageTitle'] ? : $item['title']; ?>"<?php if ($item['class']): ?> class="<?php echo $item['class']; ?>"<?php endif; ?><?php if ($item['accesskey'] != ''): ?> accesskey="<?php echo $item['accesskey']; ?>"<?php endif; ?><?php if ($item['tabindex']): ?> tabindex="<?php echo $item['tabindex']; ?>"<?php endif; ?><?php if ($item['nofollow']): ?> rel="nofollow"<?php endif; ?><?php echo $item['target']; ?>>
-                    <?php echo $item['link']; ?>
-                </a><?php echo $item['subitems']; ?>
+            <li<?php if ($item['class']): ?> class="<?= $item['class']; ?>"<?php endif; ?>>
+                <a href="<?= $item['href']; ?>"
+                   title="<?= $item['pageTitle'] ? : $item['title']; ?>"<?php if ($item['class']): ?> class="<?= $item['class']; ?>"<?php endif; ?><?php if ($item['accesskey'] != ''): ?> accesskey="<?= $item['accesskey']; ?>"<?php endif; ?><?php if ($item['tabindex']): ?> tabindex="<?= $item['tabindex']; ?>"<?php endif; ?><?php if ($item['nofollow']): ?> rel="nofollow"<?php endif; ?><?= $item['target']; ?>>
+                    <?= $item['link']; ?>
+                </a><?= $item['subitems']; ?>
             </li>
         <?php endif; ?>
     <?php endforeach; ?>

src/Resources/contao/templates/nav_l10n.html5

@@ -1,16 +1,16 @@
 <?php $this->import('Verstaerker\I18nl10nBundle\Classes\I18nl10nFrontend', 'I18nl10n'); ?>
-<ul class="<?php echo $this->level; ?>">
+<ul class="<?= $this->level; ?>">
     <?php foreach ($this->I18nl10n->l10nNavItems($this->items) as $item): ?>
         <?php if ($item['isActive']): ?>
-            <li class="<?php echo $item['class']; ?>">
-                <span class="<?php echo $item['class']; ?>"><?php echo $item['link']; ?></span><?php echo $item['subitems']; ?>
+            <li class="<?= $item['class']; ?>">
+                <span class="<?= $item['class']; ?>"><?= $item['link']; ?></span><?= $item['subitems']; ?>
             </li>
         <?php else: ?>
-            <li<?php if ($item['class']): ?> class="<?php echo $item['class']; ?>"<?php endif; ?>>
-                <a href="<?php echo $item['href']; ?>"
-                   title="<?php echo $item['pageTitle'] ? : $item['title']; ?>"<?php if ($item['class']): ?> class="<?php echo $item['class']; ?>"<?php endif; ?><?php if ($item['accesskey'] != ''): ?> accesskey="<?php echo $item['accesskey']; ?>"<?php endif; ?><?php if ($item['tabindex']): ?> tabindex="<?php echo $item['tabindex']; ?>"<?php endif; ?><?php if ($item['nofollow']): ?> rel="nofollow"<?php endif; ?><?php echo $item['target']; ?>>
-                    <?php echo $item['link']; ?>
-                </a><?php echo $item['subitems']; ?>
+            <li<?php if ($item['class']): ?> class="<?= $item['class']; ?>"<?php endif; ?>>
+                <a href="<?= $item['href']; ?>"
+                   title="<?= $item['pageTitle'] ? : $item['title']; ?>"<?php if ($item['class']): ?> class="<?= $item['class']; ?>"<?php endif; ?><?php if ($item['accesskey'] != ''): ?> accesskey="<?= $item['accesskey']; ?>"<?php endif; ?><?php if ($item['tabindex']): ?> tabindex="<?= $item['tabindex']; ?>"<?php endif; ?><?php if ($item['nofollow']): ?> rel="nofollow"<?php endif; ?><?= $item['target']; ?>>
+                    <?= $item['link']; ?>
+                </a><?= $item['subitems']; ?>
             </li>
         <?php endif; ?>
     <?php endforeach; ?>

src/Resources/public/css/style.css

@@ -81,6 +81,10 @@ ul.level_5 .tl_left {
     vertical-align: middle;
 }
 
+.i18nl10n_flag.is--invisible {
+    opacity: 0.25;
+}
+
 .i18nl10n_page {
     color: #b3b3b3;
     padding-left: 3px;