소스 검색

Merge branch 'master' of github.com:LotarProject/dokuwiki-plugin-icons

Giuseppe Di Terlizzi 7 년 전
부모
커밋
06556d38d7
4개의 변경된 파일27개의 추가작업 그리고 6개의 파일을 삭제
  1. 2 2
      action.php
  2. 3 3
      conf/default.php
  3. 3 1
      conf/metadata.php
  4. 19 0
      lang/fr/settings.php

+ 2 - 2
action.php

@@ -39,8 +39,8 @@ class action_plugin_icons extends DokuWiki_Action_Plugin {
       $font_icons[] = $this->getConf('fontAwesomeURL');
     }
 
-    if ($this->getConf('loadTypicon')) {
-      $font_icons[] = $this->getConf('typiconURL');
+    if ($this->getConf('loadTypicons')) {
+      $font_icons[] = $this->getConf('typiconsURL');
     }
 
     foreach ($font_icons as $font_icon) {

+ 3 - 3
conf/default.php

@@ -7,10 +7,10 @@
 
 $conf['defaultSize']     = '16';
 $conf['defaultPack']     = 'fa';
-$conf['fontAwesomeURL']  = '//maxcdn.bootstrapcdn.com/font-awesome/latest/css/font-awesome.min.css';
+$conf['fontAwesomeURL']  = 'https://maxcdn.bootstrapcdn.com/font-awesome/latest/css/font-awesome.min.css';
 $conf['loadFontAwesome'] = 1;
-$conf['typiconURL']      = '//cdn.rawgit.com/stephenhutchings/typicons.font/master/src/font/typicons.min.css';
-$conf['loadTypicon']     = 1;
+$conf['typiconsURL']     = 'https://cdn.rawgit.com/stephenhutchings/typicons.font/master/src/font/typicons.min.css';
+$conf['loadTypicons']    = 1;
 $conf['fugueURL']        = 'https://raw.githubusercontent.com/yusukekamiyamane/fugue-icons/master';
 $conf['oxygenURL']       = 'https://raw.githubusercontent.com/pasnox/oxygen-icons-png/master/oxygen';
 $conf['silkURL']         = 'http://icons.iconarchive.com/icons/famfamfam/silk/16';

+ 3 - 1
conf/metadata.php

@@ -10,7 +10,9 @@ $meta['defaultSize']     = array('string');
 $meta['defaultPack']     = array('multichoice','_choices' => array('fa', 'glyphicon', 'fugue', 'oxygen'));
 $meta['loadFontAwesome'] = array('onoff');
 $meta['fontAwesomeURL']  = array('string');
+$meta['loadTypicons']    = array('onoff');
+$meta['typiconsURL']     = array('string');
 $meta['fugueURL']        = array('string');
 $meta['oxygenURL']       = array('string');
 $meta['silkURL']         = array('string');
-$meta['flagURL']         = array('string');
+$meta['flagURL']         = array('string');

+ 19 - 0
lang/fr/settings.php

@@ -0,0 +1,19 @@
+<?php
+/**
+ * French language file
+ *
+ * @license    GPL 2 (http://www.gnu.oug/licenses/gpl.html)
+ * @author     Giuseppe Di Terlizzi <giuseppe.diterlizzi@gmail.com>
+ */
+
+// fou the configuration manager
+$lang['defaultSize']     = 'Taille par défaut des icônes';
+$lang['defaultPack']     = 'Paquet d\'icônes par défaut';
+$lang['fontAwesomeURL']  = 'Font Awesome CSS URL (CDN ou local)';
+$lang['typiconsURL']     = 'Typicons CSS URL (CDN ou local)';
+$lang['fugueURL']        = 'URL du chemin de base de Fugue (CDN ou local)';
+$lang['oxygenURL']       = 'URL du chemin de base de Oxygen (CDN ou local)';
+$lang['loadFontAwesome'] = 'Voulez-vous charger le fichier CSS de Font Awesome ?';
+$lang['loadTypicons']    = 'Voulez-vous charger le fichier CSS de Typicons ?';
+$lang['silkURL']         = 'URL du chemin de base de Silk (CDN ou local)';
+$lang['flagURL']         = 'URL du chemin de base de Flag (CDN ou local)';