3 files changed, 21 insertions, 0 deletions
diff --git a/lib/plugins/config/settings/config.class.php b/lib/plugins/config/settings/config.class.php
index faa8c5e7e..011335913 100644
--- a/lib/plugins/config/settings/config.class.php
+++ b/lib/plugins/config/settings/config.class.php
@@ -631,6 +631,7 @@ if (!class_exists('setting_multichoice')) {
         foreach ($this->_choices as $choice) {
             $selected = ($value == $choice) ? ' selected="selected"' : '';
             $option = $plugin->getLang($this->_key.'_o_'.$choice);
+            if (!$option && isset($this->lang[$this->_key.'_o_'.$choice])) $option = $this->lang[$this->_key.'_o_'.$choice];
             if (!$option) $option = $choice;
 
             $choice = htmlspecialchars($choice);
diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php
index c087cd767..56a1c43ff 100644
--- a/lib/plugins/config/settings/config.metadata.php
+++ b/lib/plugins/config/settings/config.metadata.php
@@ -84,6 +84,7 @@ $meta['title']    = array('string');
 $meta['start']    = array('string','_pattern' => '!^[^:;/]+$!'); // don't accept namespaces
 $meta['lang']     = array('dirchoice','_dir' => DOKU_INC.'inc/lang/');
 $meta['template'] = array('dirchoice','_dir' => DOKU_INC.'lib/tpl/','_pattern' => '/^[\w-]+$/');
+$meta['license']  = array('license');
 $meta['savedir']  = array('savedir');
 $meta['basedir']  = array('string');
 $meta['baseurl']  = array('string');
diff --git a/lib/plugins/config/settings/extra.class.php b/lib/plugins/config/settings/extra.class.php
index 40c919a12..12e176f35 100644
--- a/lib/plugins/config/settings/extra.class.php
+++ b/lib/plugins/config/settings/extra.class.php
@@ -116,6 +116,25 @@ if (!class_exists('setting_compression')) {
   }
 }
 
+if (!class_exists('setting_license')) {
+  class setting_license extends setting_multichoice {
+
+    var $_choices = array('');      // none choosen
+
+    function initialize($default,$local,$protected) {
+      global $license;
+
+      foreach($license as $key => $data){
+        $this->_choices[] = $key;
+        $this->lang[$this->_key.'_o_'.$key] = $data['name'];
+      }
+
+      parent::initialize($default,$local,$protected);
+    }
+  }
+}
+
+
 if (!class_exists('setting_renderer')) {
   class setting_renderer extends setting_multichoice {
     var $_prompts = array();