MEDIUM: Update plugin include to v2017-08-24

This commit is contained in:
Bertrand Jacquin 2017-10-15 04:52:26 +01:00
parent d60216b04e
commit 01dce5c761
No known key found for this signature in database
GPG Key ID: 5534871F2E2E93DA
45 changed files with 511 additions and 296 deletions

View File

@ -0,0 +1,13 @@
language: php
php:
- "5.6"
- "5.5"
- "5.4"
- "5.3"
env:
- DOKUWIKI=master
- DOKUWIKI=stable
- DOKUWIKI=old-stable
before_install: wget https://raw.github.com/splitbrain/dokuwiki-travis/master/travis.sh
install: sh travis.sh
script: cd _test && phpunit --stderr --group plugin_include

View File

@ -4,6 +4,9 @@ if (!defined('DOKU_INC')) die();
/**
* Test the conversion of local links to internal links if the page hasn't been fully included
*
* @group plugin_include
* @group plugins
*/
class plugin_include_locallink_conversion_test extends DokuWikiTest {
/** @var helper_plugin_include $helper */

View File

@ -4,6 +4,9 @@ if (!defined('DOKU_INC')) die();
/**
* Test the conversion of media references in link titles
*
* @group plugin_include
* @group plugins
*/
class plugin_include_media_linktitle_conversion_test extends DokuWikiTest {
/** @var helper_plugin_include $helper */
@ -47,4 +50,4 @@ EOF
$html = p_wiki_xhtml('test:include');
$this->assertContains('src="'.ml('https://www.dokuwiki.org/lib/tpl/dokuwiki/images/logo.png').'"', $html);
}
}
}

View File

@ -4,6 +4,9 @@ if (!defined('DOKU_INC')) die();
/**
* Test namespace includes
*
* @group plugin_include
* @group plugins
*/
class plugin_include_namespaces_includes_test extends DokuWikiTest {
/**
@ -38,6 +41,25 @@ class plugin_include_namespaces_includes_test extends DokuWikiTest {
saveWikiText('inclorder:page4', '{{include_n>2}} Page 4/2', 'created page 4/0');
}
/**
* Helper function to read dir content
*/
protected function getDirContent ($dir) {
if (is_dir($dir)) {
$pages = array();
if ($handle = opendir($dir)) {
while (($file = readdir($handle)) !== false) {
if ($file != '.' && $file != '..') {
$pages [] = $file;
}
}
closedir($handle);
return $pages;
}
}
return null;
}
/**
* Test hiding of hidden pages in namespace includes
*/
@ -81,19 +103,33 @@ class plugin_include_namespaces_includes_test extends DokuWikiTest {
// test include of the root namespace
$flags = $this->helper->get_flags(array());
$pages = $this->helper->_get_included_pages('namespace', ':', '', '', $flags);
$this->assertEquals(array(), $pages);
$this->assertEquals(array(array('id' => 'mailinglist', 'exists' => true, 'parent_id' => '')), $pages);
$flags = $this->helper->get_flags(array('depth=2'));
$pages = $this->helper->_get_included_pages('namespace', ':', '', '', $flags);
$this->assertEquals(array(
$expected = array(
array('id' => 'inclhidden:visible', 'exists' => true, 'parent_id' => ''),
array('id' => 'inclorder:page1', 'exists' => true, 'parent_id' => ''),
array('id' => 'inclorder:page2', 'exists' => true, 'parent_id' => ''),
array('id' => 'inclorder:page3', 'exists' => true, 'parent_id' => ''),
array('id' => 'inclorder:page4', 'exists' => true, 'parent_id' => ''),
array('id' => 'incltest:level1', 'exists' => true, 'parent_id' => ''),
array('id' => 'wiki:dokuwiki', 'exists' => true, 'parent_id' => ''),
array('id' => 'wiki:syntax', 'exists' => true, 'parent_id' => ''),
), $pages);
array('id' => 'mailinglist', 'exists' => true, 'parent_id' => ''),
//array('id' => 'wiki:dokuwiki', 'exists' => true, 'parent_id' => ''),
//array('id' => 'wiki:syntax', 'exists' => true, 'parent_id' => ''),
//$wikiPages,
);
// Add pages in namespace wiki
$dir = $this->getDirContent(dirname(__FILE__).'/../../../../_test/data/pages/wiki');
$this->assertTrue($dir !== null);
foreach ($dir as $page) {
$page = substr($page, 0, -4);
$expected [] = array('id' => 'wiki:'.$page, 'exists' => true, 'parent_id' => '');
}
array_multisort($expected);
array_multisort($pages);
$this->assertEquals($expected, $pages);
}
/**

View File

@ -1,5 +1,11 @@
<?php
/**
* Class plugin_include_nested_test
*
* @group plugin_include
* @group plugins
*/
class plugin_include_nested_test extends DokuWikiTest {
private $ids = array(
'test:plugin_include:nested:start',
@ -48,17 +54,17 @@ class plugin_include_nested_test extends DokuWikiTest {
}
private function _createPages() {
saveWikiText('test:plugin_include:nested:start',
saveWikiText('test:plugin_include:nested:start',
'====== Main Test Page ======'.DOKU_LF.DOKU_LF
.'Main Content'.rand().DOKU_LF.DOKU_LF
.'{{page>second}}'.DOKU_LF,
'setup for test');
saveWikiText('test:plugin_include:nested:second',
saveWikiText('test:plugin_include:nested:second',
'====== Second Test Page ======'.DOKU_LF.DOKU_LF
.'Second Content'.rand().DOKU_LF.DOKU_LF
.'{{page>third}}'.DOKU_LF,
'setup for test');
saveWikiText('test:plugin_include:nested:third',
saveWikiText('test:plugin_include:nested:third',
'====== Third Test Page ======'.DOKU_LF.DOKU_LF
.'Third Content'.rand().DOKU_LF.DOKU_LF
.'{{page>third}}'.DOKU_LF,

View File

@ -1,7 +1,10 @@
<?php
/**
* Tests the editx support for adapting the syntax of the include plugin
* Tests the move support for adapting the syntax of the include plugin
*
* @group plugin_include
* @group plugins
*/
class plugin_include_pagemove_support_test extends DokuWikiTest {
public function setup() {
@ -11,35 +14,62 @@ class plugin_include_pagemove_support_test extends DokuWikiTest {
}
public function test_relative_include() {
global $ID;
/** @var $move helper_plugin_move */
$move = plugin_load('helper', 'move');
if (!$move) return; // disable the test when move is not installed
/** @var $move helper_plugin_move_op */
$move = plugin_load('helper', 'move_op');
if (!$move) {
$this->markTestSkipped('the move plugin is not installed');
return;
}
saveWikiText('editx', '{{page>start#start}} %%{{page>start}}%% {{section>wiki:syntax#tables&nofooter}} {{page>:}} {{section>test:start#test}}', 'Testcase created');
idx_addPage('editx');
$ID = 'editx';
$opts['ns'] = '';
$opts['newname'] = 'editx';
$opts['newns'] = 'test';
$move->move_page($opts);
$this->assertTrue($move->movePage('editx', 'test:editx'));
$this->assertEquals('{{page>:start#start}} %%{{page>start}}%% {{section>wiki:syntax#tables&nofooter}} {{page>:}} {{section>test:start#test}}',rawWiki('test:editx'));
}
public function test_rename() {
global $ID;
/** @var $move helper_plugin_move */
$move = plugin_load('helper', 'move');
if (!$move) return; // disable the test when move is not installed
/** @var $move helper_plugin_move_op */
$move = plugin_load('helper', 'move_op');
if (!$move) {
$this->markTestSkipped('the move plugin is not installed');
return;
}
saveWikiText('editx', 'Page to rename', 'Testcase create');
saveWikiText('links', '{{section>links#foo}} {{page>editx}} {{page>:eDitX&nofooter}} {{section>editx#test}} {{page>editx&nofooter}}', 'Testcase created');
idx_addPage('editx');
idx_addPage('links');
$ID = 'editx';
$opts['ns'] = '';
$opts['newname'] = 'edit';
$opts['newns'] = 'test';
$move->move_page($opts);
$this->assertTrue($move->movePage('editx', 'test:edit'));
$this->assertEquals('{{section>links#foo}} {{page>test:edit}} {{page>test:edit&nofooter}} {{section>test:edit#test}} {{page>test:edit&nofooter}}', rawWiki('links'));
}
}
public function test_relative_include_adaption() {
/** @var $move helper_plugin_move_op */
$move = plugin_load('helper', 'move_op');
if (!$move) {
$this->markTestSkipped('the move plugin is not installed');
return;
}
$text = '====== Main ======
This is a test page
[[.1:page_1|link]]
{{page>.1:page_1&nofooter&noeditbutton}}
{{page>.1:page_2&nofooter&noeditbutton}}';
saveWikiText('old:namespace:main', $text, 'Created');
saveWikiText('old:namespace:1:page_1', 'Page 1', 'Created');
saveWikiText('old:namespace:1:page_2', 'Page 2', 'Created');
idx_addPage('old:namespace:main');
idx_addPage('old:namespace:1:page_1');
idx_addPage('old:namespace:1:page_2');
$this->assertTrue($move->movePage('old:namespace:main', 'new:namespace:main'));
$this->assertTrue($move->movePage('old:namespace:1:page_1', 'new:namespace:1:page_1'));
$this->assertTrue($move->movePage('old:namespace:1:page_2', 'new:namespace:1:page_2'));
$this->assertEquals($text, rawWiki('new:namespace:main'));
}
}

View File

@ -1,5 +1,8 @@
<?php
/*
* @group plugin_include
* @group plugins
*/
class plugin_include_safeindex_test extends DokuWikiTest {
public function setup() {
$this->pluginsEnabled[] = 'include';

View File

@ -22,7 +22,7 @@ class action_plugin_include extends DokuWiki_Action_Plugin {
/* @var helper_plugin_include $helper */
var $helper = null;
function action_plugin_include() {
function __construct() {
$this->helper = plugin_load('helper', 'include');
}
@ -131,7 +131,7 @@ class action_plugin_include extends DokuWiki_Action_Plugin {
*/
function handle_metadata(&$event, $param) {
global $conf;
if($conf['allowdebug']) {
if($conf['allowdebug'] && $this->getConf('debugoutput')) {
dbglog('---- PLUGIN INCLUDE META DATA START ----');
dbglog($event->data);
dbglog('---- PLUGIN INCLUDE META DATA END ----');
@ -212,8 +212,8 @@ class action_plugin_include extends DokuWiki_Action_Plugin {
if(!isset($cache->mode) || $cache->mode == 'i') return;
$depends = p_get_metadata($cache->page, 'plugin_include');
if($conf['allowdebug']) {
if($conf['allowdebug'] && $this->getConf('debugoutput')) {
dbglog('---- PLUGIN INCLUDE CACHE DEPENDS START ----');
dbglog($depends);
dbglog('---- PLUGIN INCLUDE CACHE DEPENDS END ----');
@ -228,7 +228,7 @@ class action_plugin_include extends DokuWiki_Action_Plugin {
$depends['include_content'] != isset($_REQUEST['include_content'])) {
$cache->depends['purge'] = true; // included pages changed or old metadata - request purge.
if($conf['allowdebug']) {
if($conf['allowdebug'] && $this->getConf('debugoutput')) {
dbglog('---- PLUGIN INCLUDE: REQUESTING CACHE PURGE ----');
dbglog('---- PLUGIN INCLUDE CACHE PAGES FROM META START ----');
dbglog($depends['pages']);
@ -340,7 +340,14 @@ class action_plugin_include extends DokuWiki_Action_Plugin {
// break the pattern up into its parts
list($mode, $page, $sect) = preg_split('/>|#/u', $syntax, 3);
$newpage = $handler->adaptRelativeId($page);
if (method_exists($handler, 'adaptRelativeId')) { // move plugin before version 2015-05-16
$newpage = $handler->adaptRelativeId($page);
} else {
$newpage = $handler->resolveMoves($page, 'page');
$newpage = $handler->relativeLink($page, $newpage, 'page');
}
if ($newpage == $page) {
return $match;
} else {

View File

@ -16,7 +16,6 @@ $conf['showlinkbacks'] = 1; // show number of linkbacks below blog entries
$conf['showtags'] = 1; // show tags below blog entries
$conf['showeditbtn'] = 1; // show the edit button
$conf['doredirect'] = 1; // redirect back to original page after an edit
$conf['usernamespace'] = 'user'; // namespace for user pages
$conf['doindent'] = 1; // indent included pages relative to the page they get included
$conf['linkonly'] = 0; // link only to the included pages instead of including the content
$conf['title'] = 0; // use first header of page in link
@ -27,4 +26,5 @@ $conf['order'] = 'id'; // order in which the pages are included in the
$conf['rsort'] = 0; // reverse sort order
$conf['depth'] = 1; // maximum depth of namespace includes, 0 for unlimited depth
$conf['readmore'] = 1; // Show readmore link in case of firstsection only
$conf['debugoutput'] = 0; // print debug information to debuglog if global allowdebug is enabled
//Setup VIM: ex: et ts=2 :

View File

@ -19,7 +19,6 @@ $meta['showlinkbacks'] = array('onoff');
$meta['showtags'] = array('onoff');
$meta['showeditbtn'] = array('onoff');
$meta['doredirect'] = array('onoff');
$meta['usernamespace'] = array('string');
$meta['doindent'] = array('onoff');
$meta['linkonly'] = array('onoff');
$meta['title'] = array('onoff');
@ -30,4 +29,5 @@ $meta['order'] = array('multichoice', '_choices' => array('id', 'title',
$meta['rsort'] = array('onoff');
$meta['depth'] = array('numeric', '_min' => 0);
$meta['readmore'] = array('onoff');
$meta['debugoutput'] = array('onoff');
//Setup VIM: ex: et ts=2 :

View File

@ -28,7 +28,7 @@ class helper_plugin_include extends DokuWiki_Plugin { // DokuWiki_Helper_Plugin
/**
* Constructor loads default config settings once
*/
function helper_plugin_include() {
function __construct() {
$this->defaults['noheader'] = $this->getConf('noheader');
$this->defaults['firstsec'] = $this->getConf('firstseconly');
$this->defaults['editbtn'] = $this->getConf('showeditbtn');
@ -704,7 +704,7 @@ class helper_plugin_include extends DokuWiki_Plugin { // DokuWiki_Helper_Plugin
}
break;
default:
$page = $this->_apply_macro($page);
$page = $this->_apply_macro($page, $parent_id);
resolve_pageid(getNS($parent_id), $page, $exists); // resolve shortcuts and clean ID
if (auth_quickaclcheck($page) >= AUTH_READ)
$pages[] = $page;
@ -793,11 +793,44 @@ class helper_plugin_include extends DokuWiki_Plugin { // DokuWiki_Helper_Plugin
}
return $pages;
}
/**
* Get wiki language from "HTTP_ACCEPT_LANGUAGE"
* We allow the pattern e.g. "ja,en-US;q=0.7,en;q=0.3"
*/
function _get_language_of_wiki($id, $parent_id) {
global $conf;
$result = $conf['lang'];
if(strpos($id, '@BROWSER_LANG@') !== false){
$brlangp = "/([a-zA-Z]{1,8}(-[a-zA-Z]{1,8})*|\*)(;q=(0(.[0-9]{0,3})?|1(.0{0,3})?))?/";
if(preg_match_all(
$brlangp, $_SERVER["HTTP_ACCEPT_LANGUAGE"],
$matches, PREG_SET_ORDER
)){
$langs = array();
foreach($matches as $match){
$langname = $match[1] == '*' ? $conf['lang'] : $match[1];
$qvalue = $match[4] == '' ? 1.0 : $match[4];
$langs[$langname] = $qvalue;
}
arsort($langs);
foreach($langs as $lang => $langq){
$testpage = $this->_apply_macro(str_replace('@BROWSER_LANG@', $lang, $id), $parent_id);
resolve_pageid(getNS($parent_id), $testpage, $exists);
if($exists){
$result = $lang;
break;
}
}
}
}
return cleanID($result);
}
/**
* Makes user or date dependent includes possible
*/
function _apply_macro($id) {
function _apply_macro($id, $parent_id) {
global $INFO;
global $auth;
@ -847,6 +880,7 @@ class helper_plugin_include extends DokuWiki_Plugin { // DokuWiki_Helper_Plugin
'@USER@' => cleanID($user),
'@NAME@' => cleanID($INFO['userinfo']['name']),
'@GROUP@' => cleanID($group),
'@BROWSER_LANG@' => $this->_get_language_of_wiki($id, $parent_id),
'@YEAR@' => date('Y',$time_stamp),
'@MONTH@' => date('m',$time_stamp),
'@WEEK@' => date('W',$time_stamp),

View File

@ -1,10 +1,10 @@
<?php
<?php
/**
* Arabic language file
*
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
* @author Muhammad Bashir Al-Noimi <bashir.storm@gmail.com>
* http://www.hali-sy.com
* http://www.hali-sy.com
*/
// custom language strings for the plugin

View File

@ -1,10 +1,10 @@
<?php
<?php
/**
* Arabic language file
*
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
* @author Muhammad Bashir Al-Noimi <bashir.storm@gmail.com>
* http://www.hali-sy.com
* http://www.hali-sy.com
*/
// for the configuration manager
@ -16,6 +16,5 @@ $lang['showdate'] = 'عرض التاريخ للصفحة المضمّنة';
$lang['showuser'] = 'عرض إسم المستخدم للصفحة المضمّنة';
$lang['showcomments'] = 'عرض تعليقات الصفحة المضمّنة';
$lang['showtags'] = 'عرض الأقسام أسف الصفحة المضمّنة';
$lang['usernamespace'] = 'فضاء الأسماء لصفحات المستخدم';
//Setup VIM: ex: et ts=2 :
//Setup VIM: ex: et ts=2 :

View File

@ -1,22 +1,32 @@
<?php
/**
* Czech language file (UTF-8 encoding)
*
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
* @author Lukas Zapletal <lukas.zapletal at gmail dot com>
*/
// for the configuration manager
$lang['firstseconly'] = 'zobrazovat pouze první sekci vkládaných stránek';
$lang['showtaglogos'] = 'zobrazovat obrázek prvních tagů';
$lang['showfooter'] = 'zobrazovat dole info o vkládané stránce';
$lang['showlink'] = 'zobrazovat dole permalinky vkládaných stránek';
$lang['showdate'] = 'zobrazovat dole datum vkládané stránky';
$lang['showuser'] = 'zobrazovat dole jméno uživatele vkládaných stránek';
$lang['showcomments'] = 'zobrazovat dole komentář u vkládaných stránek vyžadován Discussion plugin)';
$lang['showlinkbacks'] = 'zobrazovat dole zpětné odkazy vkládaných stránek (vyžadován Linkback plugin)';
$lang['showtags'] = 'zobrazovat dole tagy vkládaných stránek (vyžadován Tag plugin)';
$lang['showeditbtn'] = 'zobrazovat tlačítko pro editaci';
$lang['usernamespace'] = 'jmenný prostor pro uživatelské stránky';
//Setup VIM: ex: et ts=2 :
<?php
/**
* Czech language file (UTF-8 encoding)
*
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
* @author Lukas Zapletal <lukas.zapletal at gmail dot com>
* @author Roman Svoboda <svoboro1 at fel.cvut dot cz>
*/
// for the configuration manager
$lang['noheader'] = 'Nezobrazovat první záhlaví vkládaných stránek/sekcí';
$lang['firstseconly'] = 'Zobrazovat pouze první sekci vkládaných stránek';
$lang['showtaglogos'] = 'Zobrazovat obrázek prvních tagů';
$lang['showfooter'] = 'Zobrazovat dole info o vkládané stránce';
$lang['showlink'] = 'Odkaz na první titulek vkládané stránky';
$lang['showpermalink'] = 'Zobrazovat dole permalinky vkládané stránky';
$lang['showdate'] = 'Zobrazovat dole datum vkládané stránky';
$lang['showmdate'] = 'Zobrazovat dole datum modifikace vkládané stránky';
$lang['showuser'] = 'Zobrazovat dole jméno uživatele vkládané stránky';
$lang['showcomments'] = 'Zobrazovat dole komentáře u vkládané stránky (vyžadován Discussion plugin)';
$lang['showlinkbacks'] = 'Zobrazovat dole zpětné odkazy vkládané stránky (vyžadován Linkback plugin)';
$lang['showtags'] = 'Zobrazovat dole tagy vkládané stránky (vyžadován Tag plugin)';
$lang['showeditbtn'] = 'Zobrazovat tlačítko pro editaci';
$lang['doredirect'] = 'Přesměrovat na původní stránku po provedení editace vkládané stránky';
$lang['order_o_id'] = 'ID stránky';
$lang['order_o_title'] = 'titulek';
$lang['order_o_created'] = 'datum vytvoření';
$lang['order_o_modified'] = 'datum modifikace';
$lang['rsort'] = 'Obrátit pořadí řazení vkládaných stránek';
$lang['readmore'] = 'Zobrazit nebo nezobrazit odkaz \'Číst více\' pouze pro případ první sekce';
$lang['debugoutput'] = 'Tisknout podrobnější ladící informace do dokuwiki ladícího logu, pokud je povolena globální možnost "allowdebug"';
//Setup VIM: ex: et ts=2 :

View File

@ -19,7 +19,6 @@ $lang['showlinkbacks'] = 'vis linkbacks nedenfor inkluderet side (Linkba
$lang['showtags'] = 'vis tags nedenfor inkluderet side (Tag Plugin nødvendigt)';
$lang['showeditbtn'] = 'vis redigér-knap';
$lang['doredirect'] = 'henvis til original side efter redigering af den inkluderede side';
$lang['usernamespace'] = 'navnerum for brugersider';
$lang['doindent'] = 'indryk inkluderede sider relativt i forhold til siden de inkluderes i';
$lang['linkonly'] = 'link udelukkende til den inkluderede side i stedet for at vise indholdet';
$lang['title'] = 'benyt sidens første overskrift i link, selvom useheading er slået fra (har kun effekt på linkonly-tilstand)';

View File

@ -1,10 +1,8 @@
<?php
/**
* German language file
*
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
* @author Esther Brunner <wikidesign@gmail.com>
*/
// custom language strings for the plugin
$lang['readmore'] = '→ Weiter lesen...';
/**
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
*
* @author Esther Brunner <wikidesign@gmail.com>
*/
$lang['readmore'] = '→ Weiterlesen...';

View File

@ -1,33 +1,39 @@
<?php
/**
* German language file
*
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
* @author Esther Brunner <wikidesign@gmail.com>
*/
// for the configuration manager
$lang['noheader'] = 'Zeige nicht den ersten Header von eingeschlossenen Seiten/Sektionen';
$lang['firstseconly'] = 'Nur erster Abschnitt von eingebundenen Seiten';
$lang['showtaglogos'] = 'Bild für erstes Tag anzeigen';
$lang['showfooter'] = 'Infos über eingebundene Seite darunter anzeigen';
$lang['showlink'] = 'Erste Überschrift der eingebundenen Seite als Link anzeigen';
$lang['showpermalink'] = 'Permalink unter eingebunderer Seite anzeigen';
$lang['showdate'] = 'Datum unter eingebundender Seite anzeigen';
$lang['showmdate'] = 'Datum der Bearbeitung unter eingebundender Seite anzeigen';
$lang['showuser'] = 'Autorenname unter eingebunderer Seite anzeigen';
$lang['showcomments'] = 'Kommentare unter eingebundener Seite anzeigen (Discussion Plugin wird benötigt)';
$lang['showlinkbacks'] = 'Linkbacks unter eingebundener Seite anzeigen (Linkback Plugin wird benötigt)';
$lang['showtags'] = 'Tags unter eingebundener Seite anzeigen (Tag Plugin wird benötigt)';
$lang['showeditbtn'] = 'Bearbeiten-Tasten anzeigen';
$lang['doredirect'] = 'Nach dem Bearbeiten der eingebundenen Seite zur ursprünglichen Seite weiterleiten';
$lang['usernamespace'] = 'Namensraum für Benutzerseiten';
$lang['doindent'] = 'Eingebundene Seiten relativ zur Seite, in der sie eingebunden sind einrücken';
$lang['linkonly'] = 'Nur einen Link anzeigen statt dem Inhalt der eingebundenen Seite';
$lang['title'] = 'Erste Überschrift im Link benutzen auch wenn "useheading" ausgeschaltet ist (betrifft nur den "linkonly"-Modus)';
$lang['pageexists'] = 'Keinen Link anzeigen, wenn die verlinkte Seite nicht existiert (betrifft nur den "linkonly"-Modus)';
$lang['parlink'] = 'Einen Absatz um den Link herum anzeigen (betrifft nur den "linkonly"-Modus)';
$lang['safeindex'] = 'verhindern der Indizierung der Metadaten von nicht-öffentlichen Seiten';
$lang['order'] = 'Sortierkriterium von Einschlüssen mit multiplen Seiten';
$lang['rsort'] = 'kehre die Sortierreihenfolge von eingeschlossenen Seiten um';
$lang['depth'] = 'maximale Tiefe von Namespace Einschlüssen, 0 für unbegrenzte Tiefe';
/**
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
*
* @author F. Mueller-Donath <j.felix@mueller-donath.de>
* @author Esther Brunner <wikidesign@gmail.com>
*/
$lang['noheader'] = 'Erste Überschrift von eingeschlossenen Seiten/Sektionen nicht anzeigen';
$lang['firstseconly'] = 'Nur ersten Abschnitt von eingebundenen Seiten anzeigen';
$lang['showtaglogos'] = 'Bild für erstes Tag anzeigen';
$lang['showfooter'] = 'Infos über eingebundene Seite darunter anzeigen';
$lang['showlink'] = 'Erste Überschrift der eingebundenen Seite als Link anzeigen';
$lang['showpermalink'] = 'Permalink unter eingebunderer Seite anzeigen';
$lang['showdate'] = 'Datum unter eingebundender Seite anzeigen';
$lang['showmdate'] = 'Änderungsdatum unter eingebundener Seite anzeigen';
$lang['showuser'] = 'Autorenname unter eingebundener Seite anzeigen';
$lang['showcomments'] = 'Kommentare unter eingebundener Seite anzeigen (Discussion Plugin wird benötigt)';
$lang['showlinkbacks'] = 'Linkbacks unter eingebundener Seite anzeigen (Linkback Plugin wird benötigt)';
$lang['showtags'] = 'Tags unter eingebundener Seite anzeigen (Tag Plugin wird benötigt)';
$lang['showeditbtn'] = 'Bearbeiten-Button anzeigen';
$lang['doredirect'] = 'Nach dem Bearbeiten der eingebundenen Seite zur ursprünglichen Seite weiterleiten';
$lang['doindent'] = 'Eingebundene Seiten relativ zur Seite, in der sie eingebunden sind einrücken';
$lang['linkonly'] = 'Nur einen Link anzeigen statt dem Inhalt der eingebundenen Seite';
$lang['title'] = 'Erste Überschrift im Link benutzen auch wenn "useheading" ausgeschaltet ist (betrifft nur den "linkonly"-Modus)';
$lang['pageexists'] = 'Keinen Link anzeigen, wenn die verlinkte Seite nicht existiert (betrifft nur den "linkonly"-Modus)';
$lang['parlink'] = 'Einen Absatz um den Link herum anzeigen (betrifft nur den "linkonly"-Modus)';
$lang['safeindex'] = 'Verhindere das Indizieren von Metadaten auf eingebundenen, nicht öffentlichen Seiten';
$lang['order'] = 'Sortierkriterium beim Einfügen von mehreren Seiten';
$lang['order_o_id'] = 'Seiten ID';
$lang['order_o_title'] = 'Titel';
$lang['order_o_created'] = 'Erstellungsdatum';
$lang['order_o_modified'] = 'Änderungsdatum';
$lang['order_o_indexmenu'] = 'Benutzerdefinierte Reihenfolge mit Indexmenu Syntax';
$lang['order_o_custom'] = 'Benutzerdefinierte Reihenfolge mit Include Syntax';
$lang['rsort'] = 'Umgekehrte Reihenfolge bei der Sortierung von eingefügten Seiten';
$lang['depth'] = 'Maximale Tiefe von Namensräumen, 0 für alle Ebenen';
$lang['readmore'] = '\'Weiterlesen\'-Link bei aktiviertem "firstseconly"-Modus anzeigen';
$lang['debugoutput'] = 'Ausführliche Informationen in das Debuglog des Dokuwikis schreiben (setzt voraus, dass die globale Option "allowdebug" aktiviert ist).';

View File

@ -2,7 +2,7 @@
/**
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
*
* @author Esther Brunner <wikidesign@gmail.com>
*
* @author Esther Brunner <wikidesign@gmail.com>
*/
$lang['readmore'] = '→ Weiterlesen...';

View File

@ -2,32 +2,34 @@
/**
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
*
* @author Esther Brunner <wikidesign@gmail.com>
*
* @author F. Mueller-Donath <j.felix@mueller-donath.de>
* @author Esther Brunner <wikidesign@gmail.com>
* @author Dominik Eckelmann <deckelmann@gmail.com>
* @author Christian Paul <info@jaller.de>
* @author Dana <dannax3@gmx.de>
*/
$lang['noheader'] = 'Verstecke die erste Überschrift der eingefügten Seite/Sektion';
$lang['firstseconly'] = 'Nur erster Abschnitt von eingebundenen Seiten';
$lang['noheader'] = 'Erste Überschrift von eingeschlossenen Seiten/Sektionen nicht anzeigen';
$lang['firstseconly'] = 'Nur ersten Abschnitt von eingebundenen Seiten anzeigen';
$lang['showtaglogos'] = 'Bild für erstes Tag anzeigen';
$lang['showfooter'] = 'Infos über eingebundene Seite darunter anzeigen';
$lang['showlink'] = 'Erste Überschrift der eingebundenen Seite als Link anzeigen';
$lang['showpermalink'] = 'Permalink unter eingebunderer Seite anzeigen';
$lang['showdate'] = 'Datum unter eingebunderer Seite anzeigen';
$lang['showmdate'] = 'Zeige das Änderungsdatum unter eingefügten Seiten an';
$lang['showuser'] = 'Autorenname unter eingebunderer Seite anzeigen';
$lang['showmdate'] = 'Änderungsdatum unter eingebundener Seite anzeigen';
$lang['showuser'] = 'Autorenname unter eingebundener Seite anzeigen';
$lang['showcomments'] = 'Kommentare unter eingebundener Seite anzeigen (Discussion Plugin wird benötigt)';
$lang['showlinkbacks'] = 'Linkbacks unter eingebundener Seite anzeigen (Linkback Plugin wird benötigt)';
$lang['showtags'] = 'Tags unter eingebundener Seite anzeigen (Tag Plugin wird benötigt)';
$lang['showeditbtn'] = 'Bearbeiten-Tasten anzeigen';
$lang['showeditbtn'] = 'Bearbeiten-Button anzeigen';
$lang['doredirect'] = 'Nach dem Bearbeiten der eingebundenen Seite zur ursprünglichen Seite weiterleiten';
$lang['usernamespace'] = 'Namensraum für Benutzerseiten';
$lang['doindent'] = 'Eingebundene Seiten relativ zur Seite, in der sie eingebunden sind einrücken';
$lang['linkonly'] = 'Nur einen Link anzeigen statt dem Inhalt der eingebundenen Seite';
$lang['title'] = 'Erste Überschrift im Link benutzen auch wenn "useheading" ausgeschaltet ist (betrifft nur den "linkonly"-Modus)';
$lang['pageexists'] = 'Keinen Link anzeigen, wenn die verlinkte Seite nicht existiert (betrifft nur den "linkonly"-Modus)';
$lang['parlink'] = 'Einen Absatz um den Link herum anzeigen (betrifft nur den "linkonly"-Modus)';
$lang['safeindex'] = 'Verhindere das indizieren von Metadaten auf eingebundenen, nicht öffentlichen Seiten';
$lang['order'] = 'Sortierkriterium beim einfügen von mehreren Seiten';
$lang['safeindex'] = 'Verhindere das Indizieren von Metadaten auf eingebundenen, nicht öffentlichen Seiten';
$lang['order'] = 'Sortierkriterium beim Einfügen von mehreren Seiten';
$lang['order_o_id'] = 'Seiten ID';
$lang['order_o_title'] = 'Titel';
$lang['order_o_created'] = 'Erstellungsdatum';
@ -35,4 +37,6 @@ $lang['order_o_modified'] = 'Änderungsdatum';
$lang['order_o_indexmenu'] = 'Benutzerdefinierte Reihenfolge mit Indexmenu Syntax.';
$lang['order_o_custom'] = 'Benutzerdefinierte Reihenfolge mit Include Syntax';
$lang['rsort'] = 'Umgekehrte Reihenfolge bei der Sortierung von eingefügten Seiten';
$lang['depth'] = 'Maximale tiefe von Namensräumen, 0 für unendliche tiefe';
$lang['depth'] = 'Maximale Tiefe von Namensräumen, 0 für alle Ebenen';
$lang['readmore'] = 'Zeige einen \'Weiterlesen\'-Link bei aktiviertem "firstseconly"-Modus';
$lang['debugoutput'] = 'Ausführliche Informationen in das Debuglog des Dokuwikis schreiben (setzt voraus, dass die globale Option "allowdebug" aktiviert ist).';

View File

@ -8,34 +8,34 @@
// for the configuration manager
$lang['noheader'] = 'Don\'t show the first header of included pages/sections';
$lang['firstseconly'] = 'show only the first section of included pages';
$lang['showtaglogos'] = 'show image for first tag';
$lang['showfooter'] = 'show info about included page below';
$lang['showlink'] = 'link first headline of included page';
$lang['showpermalink'] = 'show permalinks below included page';
$lang['showdate'] = 'show dates below included page';
$lang['showmdate'] = 'show modified dates below included page';
$lang['showuser'] = 'show usernames below included page';
$lang['showcomments'] = 'show comments below included page (Discussion plugin needed)';
$lang['showlinkbacks'] = 'show linkbacks below included page (Linkback Plugin needed)';
$lang['showtags'] = 'show tags below included page (Tag Plugin needed)';
$lang['showeditbtn'] = 'show edit button';
$lang['doredirect'] = 'redirect to the original page after editing the included page';
$lang['usernamespace'] = 'namespace for user pages';
$lang['doindent'] = 'indent included pages relative to the page they get included in';
$lang['linkonly'] = 'link only to the included page instead of showing the content';
$lang['title'] = 'use first heading of page in link even if useheading is off (only affects linkonly mode)';
$lang['pageexists'] = 'do not display a link if the page does not exist (only affects linkonly mode)';
$lang['parlink'] = 'put a paragraph around the link (only affects linkonly mode)';
$lang['safeindex'] = 'prevent indexing of metadata from non-public included pages';
$lang['order'] = 'ordering criteria of includes with multiple pages';
$lang['firstseconly'] = 'Show only the first section of included pages';
$lang['showtaglogos'] = 'Show image for first tag';
$lang['showfooter'] = 'Show info about included page below';
$lang['showlink'] = 'Link first headline of included page';
$lang['showpermalink'] = 'Show permalinks below included page';
$lang['showdate'] = 'Show dates below included page';
$lang['showmdate'] = 'Show modified dates below included page';
$lang['showuser'] = 'Show usernames below included page';
$lang['showcomments'] = 'Show comments below included page (Discussion plugin needed)';
$lang['showlinkbacks'] = 'Show linkbacks below included page (Linkback Plugin needed)';
$lang['showtags'] = 'Show tags below included page (Tag Plugin needed)';
$lang['showeditbtn'] = 'Show edit button';
$lang['doredirect'] = 'Redirect to the original page after editing the included page';
$lang['doindent'] = 'Indent included pages relative to the page they get included in';
$lang['linkonly'] = 'Link only to the included page instead of showing the content';
$lang['title'] = 'Use first heading of page in link even if useheading is off (only affects linkonly mode)';
$lang['pageexists'] = 'Do not display a link if the page does not exist (only affects linkonly mode)';
$lang['parlink'] = 'Put a paragraph around the link (only affects linkonly mode)';
$lang['safeindex'] = 'Prevent indexing of metadata from non-public included pages';
$lang['order'] = 'Ordering criteria of includes with multiple pages';
$lang['order_o_id'] = 'page ID';
$lang['order_o_title'] = 'title';
$lang['order_o_created'] = 'creation date';
$lang['order_o_modified'] = 'modification date';
$lang['order_o_indexmenu'] = 'custom order with indexmenu syntax';
$lang['order_o_custom'] = 'custom order with include syntax';
$lang['rsort'] = 'reverse the sort order of the included pages';
$lang['depth'] = 'maximum depth of namespace includes, 0 for unlimited depth';
$lang['rsort'] = 'Reverse the sort order of the included pages';
$lang['depth'] = 'Maximum depth of namespace includes, 0 for unlimited depth';
$lang['readmore'] = 'Show or not the \'Read More\' link in case of firstsection only';
$lang['debugoutput'] = 'Print verbose debug information to the dokuwiki debuglog if the global "allowdebug" option is enabled';
//Setup VIM: ex: et ts=2 :

View File

@ -4,6 +4,7 @@
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
*
* @author Robert Bogenschneider <bogi@uea.org>
* @author Robert Bogenschneider <robog@gmx.de>
*/
$lang['noheader'] = 'Ne montri la unuan alineon de inkluditaj paĝoj/sekcioj';
$lang['firstseconly'] = 'montri nur la unuan sekcion de inkluditaj paĝoj';
@ -19,7 +20,6 @@ $lang['showlinkbacks'] = 'montri retroligilojn sub inkludita paĝo (krom
$lang['showtags'] = 'montri etikedojn sub inkludita paĝo (kromaĵo tag bezonata)';
$lang['showeditbtn'] = 'montri butonon por modifi';
$lang['doredirect'] = 'redirekti al la origina paĝo post modifado de la inkludita paĝo';
$lang['usernamespace'] = 'nomspaco por uzantopaĝoj';
$lang['doindent'] = 'ŝovi inkluditajn paĝojn relative al la inkludanta paĝo';
$lang['linkonly'] = 'nur ligi, ne montri la enhavon de la inkludita paĝo';
$lang['title'] = 'uzi la unuan titolon de paĝo en ligilo eĉ se useheading estas blokita (koncernas nur linkonly-moduson)';
@ -35,3 +35,4 @@ $lang['order_o_indexmenu'] = 'propra ordo per indexmenu-sintakso';
$lang['order_o_custom'] = 'propra ordo per include-sintakso';
$lang['rsort'] = 'inversigi la ordon de la inkluditaj paĝoj';
$lang['depth'] = 'maksimuma profundeco de nomspaco-inkludoj, 0 por senlima profundeco';
$lang['readmore'] = 'Ĉu montri la \'Legi plu\'-ligilon por la opcio unua alineo';

View File

@ -15,6 +15,5 @@ $lang['showdate'] = 'mostrar la fecha a continuación de las entradas al bl
$lang['showuser'] = 'mostrar los nombres de usuarios a continuación de las entradas al blog';
$lang['showcomments'] = 'mostrar comentarios a continuación de las entradas al blog';
$lang['showtags'] = 'mostrar etiquetas a continuación de la entrada al blog';
$lang['usernamespace'] = 'namespace para las páginas de usuario';
//Setup VIM: ex: et ts=2 :

View File

@ -8,35 +8,37 @@
* @author bruno <bruno@ninesys.fr>
* @author Christian "Na_kai" Sueur <sueur.christian@gmail.com>
* @author Fabrice Dejaigher <fabrice@chtiland.com>
* @author Schplurtz le Déboulonné <schplurtz@laposte.net>
* @author Olivier Humbert <trebmuh@tuxfamily.org>
*/
$lang['noheader'] = 'Ne pas afficher le premier en-tête de pages / sections inclus';
$lang['firstseconly'] = 'afficher uniquement la première section des billets';
$lang['noheader'] = 'Ne pas afficher la première en-tête de pages / sections incluse';
$lang['firstseconly'] = 'Afficher uniquement la première section des billets';
$lang['showtaglogos'] = 'Afficher l\'image de la première balise';
$lang['showfooter'] = 'montrer les infos sur la page incluse ci-dessous';
$lang['showlink'] = 'utiliser le premier en-tête comme lien pour la page incluse';
$lang['showpermalink'] = 'afficher les permaliens sous la page incluse';
$lang['showdate'] = 'afficher les dates sous la page incluse';
$lang['showmdate'] = 'afficher les dates de modification sous la page incluse';
$lang['showuser'] = 'afficher le nom de l\'utilisateur sous la page incluse';
$lang['showcomments'] = 'Afficher les commentaires sous la page incluse (Plugin Discussion requis)';
$lang['showlinkbacks'] = 'Afficher les liens pointants vers la page sous la page incluse (Plugin Linkback requis)';
$lang['showtags'] = 'Afficher les étiquettes (tags) sous la page incluse (Plugin Tag requis)';
$lang['showeditbtn'] = 'afficher le bouton d\'édition';
$lang['doredirect'] = 'rediriger vers la page d\'origine après l\'édition de la page incluse';
$lang['usernamespace'] = 'espace de nom pour les pages des utilisateurs';
$lang['showfooter'] = 'Montrer les infos sur la page incluse en dessous';
$lang['showlink'] = 'Utiliser la première en-tête comme un lien vers la page incluse';
$lang['showpermalink'] = 'Afficher les permaliens sous la page incluse';
$lang['showdate'] = 'Afficher les dates sous la page incluse';
$lang['showmdate'] = 'Afficher les dates de modification sous la page incluse';
$lang['showuser'] = 'Afficher le nom de l\'utilisateur sous la page incluse';
$lang['showcomments'] = 'Afficher les commentaires sous la page incluse (greffon Discussion requis)';
$lang['showlinkbacks'] = 'Afficher les liens pointants vers la page sous la page incluse (greffon Linkback requis)';
$lang['showtags'] = 'Afficher les étiquettes (tags) sous la page incluse (greffon Tag requis)';
$lang['showeditbtn'] = 'Afficher le bouton d\'édition';
$lang['doredirect'] = 'Rediriger vers la page d\'origine après l\'édition de la page incluse';
$lang['doindent'] = 'Indenter les pages incluses par rapport à la page où elles sont incluses';
$lang['linkonly'] = 'faire un lien vers la page incluse plutôt que d\'afficher son contenu';
$lang['title'] = 'utiliser la première en-tête de la page pour le lien même si l\'option \'useheading\' n\'est pas activée (ne concerne que le mode \'lien seul\')';
$lang['pageexists'] = 'ne pas afficher un lien si la page n\'existe pas (ne concerne que le mode \'lien seul\')';
$lang['parlink'] = 'mettre le lien dans un paragraphe (ne concerne que le mode lien seul)';
$lang['safeindex'] = 'empêcher l\'indexation de métadonnées à partir de pages incluses non publiques';
$lang['order'] = 'critère de tri des inclusions multi-pages';
$lang['linkonly'] = 'Faire un lien vers la page incluse plutôt que d\'afficher son contenu';
$lang['title'] = 'Utiliser la première en-tête de la page pour le lien même si l\'option \'useheading\' n\'est pas activée (ne concerne que le mode \'lien seul\')';
$lang['pageexists'] = 'Ne pas afficher un lien si la page n\'existe pas (ne concerne que le mode \'lien seul\')';
$lang['parlink'] = 'Mettre le lien dans un paragraphe (ne concerne que le mode \'lien seul\')';
$lang['safeindex'] = 'Empêcher l\'indexation des métadonnées à partir de pages incluses non-publiques';
$lang['order'] = 'Critère de tri des inclusions multi-pages';
$lang['order_o_id'] = 'Page ID';
$lang['order_o_title'] = 'titre';
$lang['order_o_created'] = 'date de création';
$lang['order_o_modified'] = 'date de modification';
$lang['order_o_indexmenu'] = 'ordre personnalisé avec la syntaxe de menu d\'index';
$lang['order_o_custom'] = 'ordre personnalisé avec la syntaxe inclure';
$lang['rsort'] = 'inverser l\'ordre de tri des pages incluses';
$lang['depth'] = 'profondeur maximale d\'inclusion de l\'espace de nom (namespace), 0 pour une profondeur illimitée';
$lang['readmore'] = 'Affiche ou pas le lien \'Lire la suite\' dans le cas de l\'affichage de la première section seule';
$lang['order_o_title'] = 'Titre';
$lang['order_o_created'] = 'Date de création';
$lang['order_o_modified'] = 'Date de modification';
$lang['order_o_indexmenu'] = 'Ordre personnalisé avec la syntaxe de menu d\'index';
$lang['order_o_custom'] = 'Ordre personnalisé avec la syntaxe inclure';
$lang['rsort'] = 'Inverser l\'ordre de tri des pages incluses';
$lang['depth'] = 'Profondeur maximale d\'inclusion de l\'espace de nom (namespace), 0 pour une profondeur illimitée';
$lang['readmore'] = 'Affiche - ou pas - le lien \'Lire la suite\' dans le cas de l\'affichage de la première section seule';
$lang['debugoutput'] = 'Afficher des informations de débogage verbeuses dans le journal de débogage de DokuWiki lorsque l\'option globale "allowdebug" est activée.';

View File

@ -1,12 +1,9 @@
<?php
/**
* Hungarian language file
*
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
* @author Norbert Csík <norbert.csik@gmail.com>
*
* @author Norbert Csík <norbert.csik@gmail.com>
* @author DelD <deldadam@gmail.com>
*/
// custom language strings for the plugin
$lang['readmore'] = 'tovább...';
//Setup VIM: ex: et ts=2 :
$lang['readmore'] = 'Tovább...';

View File

@ -1,14 +1,39 @@
<?php
/**
* Hungarian language file
*
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
* @author Norbert Csík <norbert.csik@gmail.com>
*/
// for the configuration manager
$lang['firstseconly'] = 'a blog bejegyzések első bekezdését mutassa';
$lang['showdate'] = 'mutassa a dátumot a blog bejegyzések alatt';
$lang['showuser'] = 'mutassa a felhasználónevet a blog bejegyzések alatt';
//Setup VIM: ex: et ts=2 :
/**
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
*
* @author Norbert Csík <norbert.csik@gmail.com>
* @author DelD <deldadam@gmail.com>
*/
$lang['noheader'] = 'Csatolt oldal/szakasz első címsorának elrejtése';
$lang['firstseconly'] = 'Csak a csatolt oldal első bekezdésének megjelenítése';
$lang['showtaglogos'] = 'Első címke képének megjelenítése';
$lang['showfooter'] = 'Csatolt oldal adatainak megjelenítése lent';
$lang['showlink'] = 'Csatolt oldal első címsora hivatkozásként';
$lang['showpermalink'] = 'Állandó hivatkozások megjelenítése csatolt oldal alatt';
$lang['showdate'] = 'Dátumok megjelenítése csatolt oldal alatt';
$lang['showmdate'] = 'Módosítási dátum megjelenítése csatolt oldal alatt';
$lang['showuser'] = 'Felhasználónevek megjelenítése csatolt oldal alatt';
$lang['showcomments'] = 'Hozzászólások megjelenítése csatolt oldal alatt (a \'Discussion\' bővítmény szükséges hozzá)';
$lang['showlinkbacks'] = 'Visszamutató hivatkozások megjelenítése csatolt oldal alatt (a \'Linkback\' bővítmény szükséges hozzá)';
$lang['showtags'] = 'Címkék megjelenítése a csatolt oldal alatt (a \'Tag\' bővítmény szükséges hozzá)';
$lang['showeditbtn'] = '\'Oldal szerkesztése\' gomb megjelenítése';
$lang['doredirect'] = 'Átirányítás az eredeti oldalra a csatolt oldal szerkesztése után';
$lang['usernamespace'] = 'Felhasználói oldalak névtere';
$lang['doindent'] = 'Csatolt oldal behúzása relatíve ahhoz az oldalhoz, amelyhez csatolták';
$lang['linkonly'] = 'Csak a csatolt oldalra mutató hivatkozás megjelenítése a teljes oldal tartalma helyett';
$lang['title'] = 'Oldal első címsorának használat a hivatkozásban akkor is, ha a \'useheadin\' beállítás tiltott (csak akkor van hatása, ha csatolt oldal tartalma helyett hivatkozás jelenik meg)';
$lang['pageexists'] = 'Csatolt oldal hivatkozásának elrejtése, ha az oldal még nem létezik (csak akkor van hatása, ha csatolt oldal tartalma helyett hivatkozás jelenik meg)';
$lang['parlink'] = 'Hivatkozás elhelyezése bekezdéscímkék (<p>) között (csak akkor van hatása, ha csatolt oldal tartalma helyett hivatkozás jelenik meg)';
$lang['safeindex'] = 'Nem nyilvános, csatolt oldalak metaadai indexelésének tiltása';
$lang['order'] = 'Rendezési feltételek több oldal csatolása esetén';
$lang['order_o_id'] = 'Oldalazonosító (ID)';
$lang['order_o_title'] = 'Cím';
$lang['order_o_created'] = 'Létrehozás dátuma';
$lang['order_o_modified'] = 'Módosítás dátuma';
$lang['order_o_indexmenu'] = 'Tetszőleges sorrend indexmenü szintaxisával';
$lang['order_o_custom'] = 'Tetszőleges sorrend csatoló (include) szintaxisával';
$lang['rsort'] = 'Csatolt oldalak sorrendjének megfordítása';
$lang['depth'] = 'Csatolások névtereinek max. mélysége (0=végtelen)';
$lang['readmore'] = '\'Tovább...\' hivatkozás megjelenítése, ha a csatolt oldalnak csak az első bekezdése látszik';

View File

@ -11,6 +11,5 @@ $lang['firstseconly'] = 'Mostra nel blog solo la prima sezione degli articoli';
$lang['showlink'] = 'Mostra un link all\'articolo sotto le voci del blog';
$lang['showdate'] = 'Mostra la data sotto le voci del blog';
$lang['showuser'] = 'Mostra il nome dell\'autore sotto le voci del blog';
$lang['usernamespace'] = 'Namespace per le pagine degli utenti';
//Setup VIM: ex: et ts=2 :

View File

@ -1,12 +1,8 @@
<?php
/**
* Japanese language file
*
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
* @author Satoshi Sahara <sahara.satoshi@gmail.com>
*
* @author Satoshi Sahara <sahara.satoshi@gmail.com>
*/
// custom language strings for the plugin
$lang['readmore'] = '→ 続き...';
//Setup VIM: ex: et ts=2 :
$lang['readmore'] = '→ 続き...';

View File

@ -1,40 +1,39 @@
<?php
/**
* Japanese language file
*
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
* @author Satoshi Sahara <sahara.satoshi@gmail.com>
*
* @author Satoshi Sahara <sahara.satoshi@gmail.com>
* @author Hideaki SAWADA <chuno@live.jp>
*/
// for the configuration manager
$lang['noheader'] = 'インクルードするページまたはセクションの最初の見だしを表示しない';
$lang['firstseconly'] = '最初のセクションだけをインクルードする';
$lang['showtaglogos'] = '(タグが設定されている場合) show image for first tag';
$lang['showlink'] = 'インクルード部の最初の見だしをインクルード先のページまたはセクションへのリンクとする';
$lang['showfooter'] = 'インクルード部の下にフッターを表示する';
$lang['showpermalink'] = 'フッター情報: インクルード先への permalink を表示';
$lang['showdate'] = 'フッター情報: ページ作成日付(date) を表示';
$lang['showmdate'] = 'フッター情報: ページ修正日付(modified date) を表示';
$lang['showuser'] = 'フッター情報: ユーザ名(username) を表示';
$lang['showcomments'] = 'フッター情報: コメントを表示する (Discussion plugin が必要)';
$lang['showlinkbacks'] = 'フッター情報: バックリンク(linkback) を表示 (Linkback Plugin が必要)';
$lang['showtags'] = 'フッター情報: タグ(tag) を表示 (Tag Plugin が必要)';
$lang['showeditbtn'] = 'インクルード先を編集するボタンを表示';
$lang['doredirect'] = 'インクルード先の編集後、元のページにリダイレクトして戻る';
$lang['usernamespace'] = 'ユーザーページの名前空間';
$lang['doindent'] = 'インクルード部を元ページの当該位置での見出しレベルより1段階下げる';
$lang['linkonly'] = 'linkonly モードをデフォルトにする: インクルードせず、指定ページまたはセクションへのリンクだけを表示';
$lang['title'] = '(linkonly モード時) リンクタイトルに最初の見出しを使うuseheading の指定によらず適用)';
$lang['pageexists'] = '(linkonly モード時) インクルードするページが存在しない場合は何も表示しない ';
$lang['parlink'] = '(linkonly モード時) リンクを「段落」とする (インラインリストにする場合は無効にしてください)';
$lang['safeindex'] = 'prevent indexing of metadata from non-public included pages';
$lang['order'] = '(名前空間インクルード時) ページソートに使う項目';
$lang['order_o_id'] = 'ページ ID';
$lang['order_o_title'] = 'タイトル';
$lang['order_o_created'] = '作成日時';
$lang['order_o_modified'] = '修正日時';
$lang['order_o_indexmenu'] = 'indexmenu プラグイン互換のソート方法';
$lang['order_o_custom'] = 'include プラグイン互換のソート方法';
$lang['rsort'] = '(名前空間インクルード時) ページソートを逆順にする';
$lang['depth'] = '(名前空間インクルード時) インクルード対象とする名前空間の最大深さ 0:制限なし)';
//Setup VIM: ex: et ts=2 :
$lang['noheader'] = 'インクルードするページまたはセクションの最初の見だしを表示しない';
$lang['firstseconly'] = 'インクルードするページの最初のセクションだけを表示する';
$lang['showtaglogos'] = '(タグが設定されている場合) タグ先頭の画像を表示する';
$lang['showfooter'] = 'インクルード部の下にフッター情報を表示する';
$lang['showlink'] = 'インクルード部の最初の見出しをインクルード先のページまたはセクションへのリンクとする';
$lang['showpermalink'] = 'フッター情報: ページの permalink を表示';
$lang['showdate'] = 'フッター情報: ページ作成日付(date) を表示';
$lang['showmdate'] = 'フッター情報: ページ修正日付(modified date) を表示';
$lang['showuser'] = 'フッター情報: ユーザ名(username) を表示';
$lang['showcomments'] = 'フッター情報: コメントを表示する (Discussion plugin が必要)';
$lang['showlinkbacks'] = 'フッター情報: バックリンク(linkback) を表示 (Linkback Plugin が必要)';
$lang['showtags'] = 'フッター情報: タグ(tag) を表示 (Tag Plugin が必要)';
$lang['showeditbtn'] = 'インクルード先を編集するボタンを表示';
$lang['doredirect'] = 'インクルード先の編集後、元のページにリダイレクトして戻る';
$lang['doindent'] = 'インクルード部を元ページの当該位置での見出しレベルより1段階下げる';
$lang['linkonly'] = 'linkonly モードをデフォルトにする: インクルードせず、指定ページまたはセクションへのリンクだけを表示';
$lang['title'] = '(linkonly モード時) リンクタイトルに最初の見出しを使うuseheading の指定によらず適用)';
$lang['pageexists'] = '(linkonly モード時) インクルードするページが存在しない場合は何も表示しない ';
$lang['parlink'] = '(linkonly モード時) リンクを「段落」とする (インラインリストにする場合は無効にしてください)';
$lang['safeindex'] = '非公開のインクルードページのメタデータをインデックス化しない';
$lang['order'] = '(名前空間インクルード時) ページソートに使う項目';
$lang['order_o_id'] = 'ページ ID';
$lang['order_o_title'] = 'タイトル';
$lang['order_o_created'] = '作成日時';
$lang['order_o_modified'] = '修正日時';
$lang['order_o_indexmenu'] = 'indexmenu プラグイン互換のソート方法';
$lang['order_o_custom'] = 'include プラグイン互換のソート方法';
$lang['rsort'] = '(名前空間インクルード時) ページソートを逆順にする';
$lang['depth'] = '(名前空間インクルード時) インクルード対象とする名前空間の最大深さ 0:制限なし)';
$lang['readmore'] = '最初のセクションだけの場合、「→ 続き...」リンクを表示する';
$lang['debugoutput'] = '"allowdebug" オプションが有効な場合、DokuWiki の DEBUGLOG に詳細なデバッグ情報を出力する';

View File

@ -2,7 +2,7 @@
/**
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
*
*
* @author Myeongjin <aranet100@gmail.com>
*/
$lang['readmore'] = '→ 더 읽기...';

View File

@ -2,8 +2,9 @@
/**
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
*
*
* @author Myeongjin <aranet100@gmail.com>
* @author Erial <erial2@gmail.com>
*/
$lang['noheader'] = '포함된 문서/문단의 첫 문단 제목을 보이지 않기';
$lang['firstseconly'] = '포함된 문서의 첫 문단만 보이기';
@ -14,16 +15,15 @@ $lang['showpermalink'] = '포함된 문서 아래에 고유링크 보이
$lang['showdate'] = '포함된 문서 아래에 날짜 보이기';
$lang['showmdate'] = '포함된 문서 아래에 수정된 날짜 보이기';
$lang['showuser'] = '포함된 문서 아래에 사용자 이름 보이기';
$lang['showcomments'] = '포함된 문서 아래에 글 보이기 (Discussion 플러그인 필요)';
$lang['showcomments'] = '포함된 문서 아래에 글 보이기 (Discussion 플러그인 필요)';
$lang['showlinkbacks'] = '포함된 문서 아래에 링크백 보이기 (Linkback 플러그인 필요)';
$lang['showtags'] = '포함된 문서 아래에 태그 보이기 (Tag 플러그인 필요)';
$lang['showeditbtn'] = '편집 버튼 보이기';
$lang['doredirect'] = '포함된 문서를 편집하고 나서 원래 문서로 넘겨주기';
$lang['usernamespace'] = '사용자 문서에 대한 이름공간';
$lang['doindent'] = '원래 문서의 해당 위치에서 포함된 문서를 들여쓰기';
$lang['linkonly'] = '내용을 보여주는 대신 포함된 문서에만 링크';
$lang['title'] = 'useheading이 꺼져 있어도 링크에서 문서의 첫 문단 제목을 사용 (linkonly 모드만 영향을 줍니다)';
$lang['pageexists'] = '문서가 존재하지 않을 때 링크를 보이지 않기 (linkonly 모드만 영향을 줍니다)';
$lang['pageexists'] = '문서가 존재하지 않을 때 링크를 표시하지 않기 (linkonly 모드만 영향을 줍니다)';
$lang['parlink'] = '링크 주위에 문단 넣기 (linkonly 모드만 영향을 줍니다)';
$lang['safeindex'] = '공개되지 않은 포함된 문서에서 메타데이터의 색인을 방지';
$lang['order'] = '여러 문서로 포함의 조건 정렬';
@ -35,3 +35,5 @@ $lang['order_o_indexmenu'] = 'indexmenu 문법 사용자 지정 정렬';
$lang['order_o_custom'] = 'include 문법 사용자 지정 정렬';
$lang['rsort'] = '포함된 문서의 정렬 순서를 반대로';
$lang['depth'] = '이름공간 포함의 최대 깊이, 제한 없는 깊이는 0';
$lang['readmore'] = '첫문단일 경우에만 \'더 읽기\' 링크를 보이거나 보이지 않기';
$lang['debugoutput'] = '전역 "allowdebug" 옵션이 활성화되어 있는 경우 도쿠위키 디버그로그에 상세한 디버그 정보를 출력';

View File

@ -2,7 +2,7 @@
/**
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
*
* @author Gijs H. van Gemert <g.v.gemert@inter.nl.net>
*
* @author Gijs H. van Gemert <g.v.gemert@inter.nl.net>
*/
$lang['readmore'] = '→ Lees verder...';

View File

@ -2,8 +2,10 @@
/**
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
*
*
* @author Mark Prins <mprins@users.sf.net>
* @author Johan Wijnker <johan@wijnker.eu>
* @author Gerrit Uitslag <klapinklapin@gmail.com>
*/
$lang['noheader'] = 'toon de eerste kop van de ingesloten pagina/sectie niet';
$lang['firstseconly'] = 'toon alleen de eerste sectie van de ingesloten pagina\'s';
@ -19,7 +21,6 @@ $lang['showlinkbacks'] = 'toon linkbacks onder de ingesloten pagina (Lin
$lang['showtags'] = 'toon labels onder de ingesloten pagina (Tag plugin vereist)';
$lang['showeditbtn'] = 'toon aanpassen knop';
$lang['doredirect'] = 'verwijs naar de originele pagina na aanpassen van de ingesloten pagina';
$lang['usernamespace'] = 'naamruimte voor gebruikers pagina\'s';
$lang['doindent'] = 'spring ingesloten pagina\'s in relatief aan de pagina waarin ze ingesloten worden';
$lang['linkonly'] = 'alleen een link naar de ingesloten pagina opnemen en niet de inhoud';
$lang['title'] = 'gebruik de eerste kop als link ook al staat useheading uit (alleen van toepassing op linkonly modus)';
@ -35,3 +36,5 @@ $lang['order_o_indexmenu'] = 'aangepaste volgorde met indexmenu syntax';
$lang['order_o_custom'] = 'aangepaste volgorde met include syntax';
$lang['rsort'] = 'draai de sorteervolgorde van de ingesloten pagina\'s om';
$lang['depth'] = 'maximum diepte van de naamruimte insluitingen, 0 voor onbeperkt';
$lang['readmore'] = 'Toon de \'Lees verder\' link als er alleen een eerste deel is of niet';
$lang['debugoutput'] = 'Schrijf uitgebreide debug informatie naar de DokuWiki debuglog als de globale "allowdebug" configuratieoptie is ingeschakeld';

View File

@ -2,7 +2,7 @@
/**
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
*
*
* @author Spike <Spike@Foobar2000.Ru>
* @author Aleksandr Selivanov <alexgearbox@gmail.com>
* @author Aleksandr Selivanov <alexgearbox@yandex.ru>

View File

@ -2,12 +2,14 @@
/**
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
*
*
* @author Spike <Spike@Foobar2000.Ru>
* @author Aleksandr Selivanov <alexgearbox@gmail.com>
* @author Aleksandr Selivanov <alexgearbox@yandex.ru>
* @author RainbowSpike <1@2.ru>
* @author Paulo <mragvlik@gmail.com>
*/
$lang['noheader'] = 'Не показывать первый заголовок внедряемых страниц, секций';
$lang['noheader'] = 'Не показывать первый заголовок внедряемых страниц, секций';
$lang['firstseconly'] = 'Показывать только первую секцию внедряемой страницы';
$lang['showtaglogos'] = 'Показывать изображение для первого тега';
$lang['showfooter'] = 'Снизу показывать информацию о внедряемой странице';
@ -21,9 +23,20 @@ $lang['showlinkbacks'] = 'Показывать обратные ссыл
$lang['showtags'] = 'Показывать теги ниже внедряемой страницы (требуется плагин Tag)';
$lang['showeditbtn'] = 'Показывать кнопку «Править»';
$lang['doredirect'] = 'Переходить на оригинальную страницу после редактирования внедрённой страницы';
$lang['usernamespace'] = 'Пространство имён для страниц пользователей';
$lang['doindent'] = 'Создавать отступ для внедряемой страницы относительно основной страницы';
$lang['linkonly'] = 'Вместо содержимого внедряемой страницы показывать ссылку на неё';
$lang['title'] = 'Использовать для ссылки внедряемой страницы её первый заголовок, даже если обычно они не применяются (только для режима linkonly)';
$lang['pageexists'] = 'Не показывать ссылку внедряемой страницы, если сама она не существует (только для режима linkonly)';
$lang['parlink'] = 'Поместить ссылку внедряемой страницы в параграф (только для режима linkonly)';
$lang['safeindex'] = 'Закрыть индексирование метаданных от непубличных внедряемых страниц';
$lang['order'] = 'Сортировать внедряемые страницы по';
$lang['order_o_id'] = 'ID страницы';
$lang['order_o_title'] = 'заголовку';
$lang['order_o_created'] = 'дате создания';
$lang['order_o_modified'] = 'дате изменения';
$lang['order_o_indexmenu'] = 'настраиваемый порядок с синтаксисом Indexmenu';
$lang['order_o_custom'] = 'настраиваемый порядок с синтаксисом Include';
$lang['rsort'] = 'Обратить порядок сортировки внедряемых страниц';
$lang['depth'] = 'Максимальная глубина вложений пространств имён. Укажите 0 для снятия ограничений.';
$lang['readmore'] = 'Показывать ссылку «Читать дальше...», если выбран показ первой секции?';
$lang['debugoutput'] = 'Выводить подробную информации об отладке в журнал отладки «Докувики» при включённой глобальной опции allowdebug';

View File

@ -13,6 +13,4 @@ $lang['showlink'] = 'prikaži permalinke pod blog vnosi';
$lang['showdate'] = 'prikaži datume pod blog vnosi';
$lang['showuser'] = 'prikaži uporabniška imena pod blog vnosi';
$lang['usernamespace'] = 'namespace za uporabniške strani';
//Setup VIM: ex: et ts=2 :

View File

@ -1,12 +1,8 @@
<?php
/**
* Swedish language file
*
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
* @author Christer Nygren <wiki@fronet.fro.se>
*
* @author Christer Nygren <wiki@fronet.fro.se>
*/
// custom language strings for the plugin
$lang['readmore'] = '→ Läs mer...';
//Setup VIM: ex: et ts=2 :
$lang['readmore'] = '→ Läs mer...';

View File

@ -1,16 +1,39 @@
<?php
/**
* Swedish language file
*
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
* @author Christer Nygren <wiki@fronet.fro.se>
*/
// for the configuration manager
$lang['firstseconly'] = 'visa endast första delen av inlägg';
$lang['showlink'] = 'visa permalinks under inlägg';
$lang['showdate'] = 'visa datum under inlägg';
$lang['showuser'] = 'visa användarnamn under inlägg';
$lang['usernamespace'] = 'vy för användarsidor';
//Setup VIM: ex: et ts=2 :
/**
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
*
* @author Christer Nygren <wiki@fronet.fro.se>
* @author Tor Härnqvist <tor@harnqvist.se>
*/
$lang['noheader'] = 'Visa inte första rubriken från inkluderade sidor/sektioner';
$lang['firstseconly'] = 'visa endast första delen av inkluderad sida';
$lang['showtaglogos'] = 'Visa bild för första tagg';
$lang['showfooter'] = 'Visa information om inkluderad sidan nedanför';
$lang['showlink'] = 'visa permalinks under inkluderad sida';
$lang['showpermalink'] = 'Visa permalänk nedanför inkluderad sida';
$lang['showdate'] = 'visa datum under inkluderad sida';
$lang['showmdate'] = 'Visa ändringsdatum nedanför inkluderad sida';
$lang['showuser'] = 'visa användarnamn under inkluderad sida';
$lang['showcomments'] = 'Visa kommentarer nedanför inkluderad sida (Discussion-plugin krävs)';
$lang['showlinkbacks'] = 'Visa tillbakalänkingar nedanför inkluderad sida (Linkback-plugin krävs)';
$lang['showtags'] = 'Visa taggar nedanför inkluderad sida (tagg-plugin krävs)';
$lang['showeditbtn'] = 'Visa redigera-knapp';
$lang['doredirect'] = 'Omdirigera till originalsidan efter redigering av den inkluderade sidan';
$lang['doindent'] = 'Gör indrag för inkluderande sidor relativt den sida som de är inkluderad på';
$lang['linkonly'] = 'Länka enbart till den inkluderade sidan, istället för att visa dess innehåll';
$lang['title'] = 'Visa första rubriken på sidan som länk även om rubrikvisning är inaktiverat (påverkar enbart endast länkingsinställning)';
$lang['pageexists'] = 'Visa inte en länk om sidan inte existerar (påverkar enbart endast länkingsinställning)';
$lang['parlink'] = 'Placera ett stycke kring länken (påverkar enbart endast länkingsinställning)';
$lang['safeindex'] = 'Förhindra metadataindexering från icke-publika sidor';
$lang['order'] = 'Kriterier för sortering vid inkludering av multipla sidor ';
$lang['order_o_id'] = 'sid-ID';
$lang['order_o_title'] = 'rubrik';
$lang['order_o_created'] = 'skapandedatum';
$lang['order_o_modified'] = 'ändringsdatum';
$lang['order_o_indexmenu'] = 'användardefinierad ordning med indexmeny-syntax';
$lang['order_o_custom'] = 'användardefinierad ordning med include-syntax';
$lang['rsort'] = 'Omvänd sortering på inkluderade sidor';
$lang['depth'] = 'Maximalt djup på namnrymder att inkludera, 0 för obegränsat djup';
$lang['readmore'] = 'Visa eller gör \'Läs mer\'-länk i fall bara förstasektionen';
$lang['debugoutput'] = 'Skriv ut mer omfattande avlusningsinformation till DokuWiki-avlusningsloggen om det globala "allowdebug"-alternativet är aktiverat';

View File

@ -19,7 +19,6 @@ $lang['showlinkbacks'] = 'eklenen sayfanın altında geri bağlantılar
$lang['showtags'] = 'eklenen sayfanın altında etiketleri göster (Bunun için Tag eklentisi gereklidir)';
$lang['showeditbtn'] = 'düzenle düğmesini göster';
$lang['doredirect'] = 'eklenen sayfayı düzenledikten sonra orjinal sayfaya yönlendir';
$lang['usernamespace'] = 'kullanıcı sayfaları için isimalanı';
$lang['doindent'] = 'eklenen sayfaları dahil edildikleri sayfaya göre girintili yap';
$lang['linkonly'] = 'içeriği göstermek yerine, sadece eklenen sayfaya bağlantı göster';
$lang['title'] = 'sayfa başlığını kullanma kapalı bile olsa, sayfanın ilk başlığını bağlantıda kullan (yalnızca bağlantı göster seceneği etkinken çalışır)';

View File

@ -4,6 +4,7 @@
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
*
* @author lainme <lainme993@gmail.com>
* @author Test2g <zccnexus@gmail.com>
*/
$lang['noheader'] = '不要显示所包含的页面/章节中的第一个标题';
$lang['firstseconly'] = '仅显示所包含页面的第一个章节';
@ -19,11 +20,11 @@ $lang['showlinkbacks'] = '在下方显示所包含页面的 linkback';
$lang['showtags'] = '在下方显示所包含页面的标签';
$lang['showeditbtn'] = '显示编辑按钮';
$lang['doredirect'] = '编辑所包含的页面后转向到原始页面';
$lang['usernamespace'] = '用户页的命名空间';
$lang['doindent'] = '相对所在页面对包含的页面进行缩进';
$lang['linkonly'] = '仅显示到所包含页面的链接而不显示内容';
$lang['title'] = '即使 useheading 选项关闭也使用页面的第一个标题进行超链接 (仅影响 linkonly 模式)';
$lang['pageexists'] = '不要显示不存在的页面的链接 (仅影响 linkonly 模式)';
$lang['parlink'] = '将一个段落环绕显示在链接旁仅对linkonly模式有效';
$lang['order_o_id'] = '页面 ID';
$lang['order_o_title'] = '标题';
$lang['order_o_created'] = '创建日期';

View File

@ -1,7 +1,7 @@
base include
author Michael Hamann, Gina Häussge, Christopher Smith, Michael Klier, Esther Brunner
email michael@content-space.de
date 2013-11-25
date 2017-08-24
name include plugin
desc Functions to include another page in a wiki page
url http://dokuwiki.org/plugin:include

View File

@ -0,0 +1,2 @@
# requirements for testing
https://github.com/michitux/dokuwiki-plugin-move.git lib/plugins/move

View File

@ -30,6 +30,12 @@ div.dokuwiki div.inclmeta span.author {
padding: 1px 0px 1px 16px;
}
/* Disable the default interwiki icon for the user link (if there is any) */
div.dokuwiki div.inclmeta span.author a.interwiki {
background: none;
padding: 0;
}
div.dokuwiki div.inclmeta span.comment {
background: transparent url(images/comment.gif) 0px 1px no-repeat;
padding: 1px 0px 1px 16px;

View File

@ -45,6 +45,8 @@ class syntax_plugin_include_footer extends DokuWiki_Syntax_Plugin {
/**
* Returns the meta line below the included page
* @param $renderer Doku_Renderer_xhtml The (xhtml) renderer
* @return string The HTML code of the footer
*/
function html_footer($page, $sect, $sect_title, $flags, $footer_lvl, &$renderer) {
global $conf, $ID;
@ -94,21 +96,13 @@ class syntax_plugin_include_footer extends DokuWiki_Syntax_Plugin {
// author
if ($flags['user'] && $exists) {
$author = $meta['creator'];
$author = $meta['user'];
if ($author) {
$userpage = cleanID($this->getConf('usernamespace').':'.$author);
resolve_pageid(getNS($ID), $userpage, $exists);
$class = ($exists ? 'wikilink1' : 'wikilink2');
$link = array(
'url' => wl($userpage),
'title' => $userpage,
'name' => hsc($author),
'target' => $conf['target']['wiki'],
'class' => $class.' url fn',
'pre' => '<span class="vcard author">',
'suf' => '</span>',
);
$xhtml[] = $renderer->_formatLink($link);
if (function_exists('userlink')) {
$xhtml[] = '<span class="vcard author">' . userlink($author) . '</span>';
} else { // DokuWiki versions < 2014-05-05 doesn't have userlink support, fall back to not providing a link
$xhtml[] = '<span class="vcard author">' . editorinfo($author) . '</span>';
}
}
}

View File

@ -124,7 +124,7 @@ class syntax_plugin_include_include extends DokuWiki_Syntax_Plugin {
}
$secids = array();
if ($format == 'xhtml') {
if ($format == 'xhtml' || $format == 'odt') {
$secids = p_get_metadata($ID, 'plugin_include secids');
}
@ -153,7 +153,16 @@ class syntax_plugin_include_include extends DokuWiki_Syntax_Plugin {
$instructions = $this->helper->_get_instructions($id, $sect, $mode, $level, $flags, $root_id, $secids);
if (!$flags['editbtn']) {
global $conf;
$maxseclevel_org = $conf['maxseclevel'];
$conf['maxseclevel'] = 0;
}
$renderer->nest($instructions);
if (isset($maxseclevel_org)) {
$conf['maxseclevel'] = $maxseclevel_org;
unset($maxseclevel_org);
}
array_pop($page_stack);
}