3 files changed, 17 insertions, 4 deletions

diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 33dddf1e..e852c7e9 100755
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -23,6 +23,19 @@ class Poche
     private $currentLanguage = '';
     private $notInstalledMessage = array();
 
+    private $language_names = array(
+      'cs_CZ.utf8' => 'čeština',
+      'de_DE.utf8' => 'German',
+      'en_EN.utf8' => 'English',
+      'es_ES.utf8' => 'Español',
+      'fa_IR.utf8' => 'فارسی',
+      'fr_FR.utf8' => 'Français',
+      'it_IT.utf8' => 'Italiano',
+      'pl_PL.utf8' => 'Polski',
+      'ru_RU.utf8' => 'Pусский',
+      'sl_SI.utf8' => 'Slovenščina',
+      'uk_UA.utf8' => 'Український',
+    );
     public function __construct()
     {
         if ($this->configFileIsAvailable()) {
@@ -333,7 +346,7 @@ class Poche
                 $current = true;
             }
             
-            $languages[] = array('name' => $language, 'current' => $current);
+            $languages[] = array('name' => $this->language_names[$language], 'value' => $language, 'current' => $current);
         }
         
         return $languages;
@@ -751,7 +764,7 @@ class Poche
         $actualLanguage = false;
         
         foreach ($languages as $language) {
-            if ($language['name'] == $_POST['language']) {
+            if ($language['value'] == $_POST['language']) {
                 $actualLanguage = true;
                 break;
             }
diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig
index cbb42f65..b37ac115 100644
--- a/themes/baggy/config.twig
+++ b/themes/baggy/config.twig
@@ -69,7 +69,7 @@
                         <label class="col w150p" for="language">{% trans "Language:" %}</label>
                         <select class="col" id="language" name="language">
                             {% for language in languages %}
-                            <option value="{{ language.name }}" {{ language.current ? 'selected' : '' }}>{{ language.name }}</option>
+                            <option value="{{ language.value }}" {{ language.current ? 'selected' : '' }}>{{ language.name }}</option>
                             {% endfor %}
                         </select>
                     </div>
diff --git a/themes/default/config.twig b/themes/default/config.twig
index c513f239..cd4d074d 100644
--- a/themes/default/config.twig
+++ b/themes/default/config.twig
@@ -69,7 +69,7 @@
                         <label class="col w150p" for="language">{% trans "Language:" %}</label>
                         <select class="col" id="language" name="language">
                             {% for language in languages %}
-                            <option value="{{ language.name }}" {{ language.current ? 'selected' : '' }}>{{ language.name }}</option>
+                            <option value="{{ language.value }}" {{ language.current ? 'selected' : '' }}>{{ language.name }}</option>
                             {% endfor %}
                         </select>
                     </div>