Rework lang selector; drop flags

[galette.git] / galette / lib / Galette / Core / I18n.php

diff --git a/galette/lib/Galette/Core/I18n.php b/galette/lib/Galette/Core/I18n.php
index b201099561a14867c693b811fdcdbdb3f4e1b431..fee072bb938d3ffa25ae032fce2b5a815f3e2287 100644 (file)
--- a/galette/lib/Galette/Core/I18n.php
+++ b/galette/lib/Galette/Core/I18n.php
@@ -58,7 +58,6 @@ class I18n
     private $longid;
     private $name;
     private $abbrev;
-    private $flag;
 
     const DEFAULT_LANG = 'fr_FR';
 
@@ -154,7 +153,6 @@ class I18n
         $this->longid   = $lang['long'];
         $this->name     = $lang['longname'];
         $this->abbrev   = $lang['shortname'];
-        $this->flag     = $lang['flag'];
     }
 
     /**
@@ -212,35 +210,6 @@ class I18n
         }
     }
 
-    /**
-     * Gets the language flag from its ID
-     *
-     * @param string $id the language identifier
-     *
-     * @return string path to flag for specified language identifier
-     */
-    public function getFlagFromId($id)
-    {
-        $path = null;
-        if (!isset($this->langs[$id])) {
-            Analog::log(
-                str_replace(
-                    '%lang',
-                    $id,
-                    _T('Unknown lang (%lang)')
-                ),
-                Analog::INFO
-            );
-        } else {
-            if (defined('GALETTE_THEME_DIR')) {
-                $path = GALETTE_THEME_DIR . 'images/flags/' . $this->langs['id']['flag'];
-            } else {
-                $path = GALETTE_THEME . 'images/flags/' . $this->langs[$id]['flag'];
-            }
-        }
-        return $path;
-    }
-
     /**
      * Get current id
      *
@@ -281,20 +250,6 @@ class I18n
         return $this->abbrev;
     }
 
-    /**
-     * Get current flag
-     *
-     * @return string path to the current language flag image
-     */
-    public function getFlag()
-    {
-        if (defined('GALETTE_THEME_DIR')) {
-            return GALETTE_THEME_DIR . 'images/flags/' . $this->flag;
-        } else {
-            return GALETTE_THEME . 'images/flags/' . $this->flag;
-        }
-    }
-
     /**
      * Is a string seem to be UTF-8 one ?
      *
@@ -318,16 +273,12 @@ class I18n
     public function guessLangs()
     {
         $dir = new \DirectoryIterator($this->path);
-        $flags_dir = GALETTE_ROOT . 'webroot/themes/default/images/flags/';
         $langs = [];
         foreach ($dir as $fileinfo) {
             if ($fileinfo->isDir() && !$fileinfo->isDot()) {
                 $lang = $fileinfo->getFilename();
                 $real_lang = str_replace('.utf8', '', $lang);
                 $parsed_lang = \Locale::parseLocale($lang);
-                $flag = (file_exists($flags_dir . $real_lang . '.svg') ?
-                    $real_lang . '.svg' :
-                    'default.svg');
 
                 $langs[$real_lang] = [
                     'long'      => $lang,
@@ -335,8 +286,7 @@ class I18n
                     'longname'  => \Locale::getDisplayLanguage(
                         $lang,
                         $lang
-                    ),
-                    'flag'      => $flag
+                    )
                 ];
             }
         }