use strftime() instead of date() FS#1335 :!:

This patch replaces the use of the date() function with the strftime()
function. The latter will respect a set locale and will use localized
strings for things like month names.

Because the format options for strftime differ from the ones used in date,
DokuWiki will rest the value of $conf['dformat'] if it contains an old
date format string (detected by missing % characters).

Plugins or templates using the $conf['dformat'] need to be updated.

darcs-hash:20080223124045-7ad00-6afb2b839afc58781463e25577e06adb675fff79.gz
This commit is contained in:
Andreas Gohr 2008-02-23 13:40:45 +01:00
parent 8acb31082c
commit e656dcd46a
32 changed files with 49 additions and 44 deletions

View File

@ -33,7 +33,7 @@ $conf['youarehere'] = 0; //show "You are here" navigation? 0|1
$conf['typography'] = 1; //smartquote conversion 0=off, 1=doublequotes, 2=all quotes
$conf['htmlok'] = 0; //may raw HTML be embedded? This may break layout and XHTML validity 0|1
$conf['phpok'] = 0; //may PHP code be embedded? Never do this on the internet! 0|1
$conf['dformat'] = 'Y/m/d H:i'; //dateformat accepted by PHPs date() function
$conf['dformat'] = '%Y/%m/%d %H:%M'; //dateformat accepted by PHPs strftime() function
$conf['signature'] = ' --- //[[@MAIL@|@NAME@]] @DATE@//'; //signature see wiki:config for details
$conf['toptoclevel'] = 1; //Level starting with and below to include in AutoTOC (max. 5)
$conf['maxtoclevel'] = 3; //Up to which level include into AutoTOC (max. 5)

View File

@ -733,7 +733,7 @@ function pageTemplate($data){
$tpl = str_replace('@USER@',$_SERVER['REMOTE_USER'],$tpl);
$tpl = str_replace('@NAME@',$INFO['userinfo']['name'],$tpl);
$tpl = str_replace('@MAIL@',$INFO['userinfo']['mail'],$tpl);
$tpl = str_replace('@DATE@',date($conf['dformat']),$tpl);
$tpl = str_replace('@DATE@',$conf['dformat'],$tpl);
$tpl = strftime($tpl);
return $tpl;
}
@ -932,7 +932,7 @@ function notify($id,$who,$rev='',$summary='',$minor=false,$replace=array()){
}
$ip = clientIP();
$text = str_replace('@DATE@',date($conf['dformat']),$text);
$text = str_replace('@DATE@',strftime($conf['dformat']),$text);
$text = str_replace('@BROWSER@',$_SERVER['HTTP_USER_AGENT'],$text);
$text = str_replace('@IPADDRESS@',$ip,$text);
$text = str_replace('@HOSTNAME@',gethostsbyaddrs($ip),$text);

View File

@ -248,7 +248,7 @@ function html_draft(){
$form->addHidden('date', $draft['date']);
$form->addElement(form_makeWikiText($text, array('readonly'=>'readonly')));
$form->addElement(form_makeOpenTag('div', array('id'=>'draft__status')));
$form->addElement($lang['draftdate'].' '. date($conf['dformat'],filemtime($INFO['draft'])));
$form->addElement($lang['draftdate'].' '. strftime($conf['dformat'],filemtime($INFO['draft'])));
$form->addElement(form_makeCloseTag('div'));
$form->addElement(form_makeButton('submit', 'recover', $lang['btn_recover'], array('tabindex'=>'1')));
$form->addElement(form_makeButton('submit', 'draftdel', $lang['btn_draftdel'], array('tabindex'=>'2')));
@ -379,7 +379,7 @@ function html_locked(){
global $INFO;
$locktime = filemtime(wikiLockFN($ID));
$expire = @date($conf['dformat'], $locktime + $conf['locktime'] );
$expire = @strftime($conf['dformat'], $locktime + $conf['locktime'] );
$min = round(($conf['locktime'] - (time() - $locktime) )/60);
print p_locale_xhtml('locked');
@ -415,7 +415,7 @@ function html_revisions($first=0){
array_pop($revisions); // remove extra log entry
}
$date = @date($conf['dformat'],$INFO['lastmod']);
$date = @strftime($conf['dformat'],$INFO['lastmod']);
print p_locale_xhtml('revisions');
print '<form action="'.wl($ID).'" method="post" id="page__revisions">';
@ -443,7 +443,7 @@ function html_revisions($first=0){
}
foreach($revisions as $rev){
$date = date($conf['dformat'],$rev);
$date = strftime($conf['dformat'],$rev);
$info = getRevisionInfo($ID,$rev,true);
$exists = page_exists($ID,$rev);
@ -539,7 +539,7 @@ function html_recent($first=0){
print '<ul>';
foreach($recents as $recent){
$date = date($conf['dformat'],$recent['date']);
$date = strftime($conf['dformat'],$recent['date']);
print ($recent['type']===DOKU_CHANGE_TYPE_MINOR_EDIT) ? '<li class="minor">' : '<li>';
print '<div class="li">';
@ -793,7 +793,7 @@ function html_diff($text='',$intro=true){
$l_rev = '';
$l_text = rawWiki($ID,'');
$l_head = '<a class="wikilink1" href="'.wl($ID).'">'.
$ID.' '.date($conf['dformat'],@filemtime(wikiFN($ID))).'</a> '.
$ID.' '.strftime($conf['dformat'],@filemtime(wikiFN($ID))).'</a> '.
$lang['current'];
$r_rev = '';
@ -822,14 +822,14 @@ function html_diff($text='',$intro=true){
$r_text = rawWiki($ID,$r_rev);
$l_head = '<a class="wikilink1" href="'.wl($ID,"rev=$l_rev").'">'.
$ID.' '.date($conf['dformat'],$l_rev).'</a>';
$ID.' '.strftime($conf['dformat'],$l_rev).'</a>';
if($r_rev){
$r_head = '<a class="wikilink1" href="'.wl($ID,"rev=$r_rev").'">'.
$ID.' '.date($conf['dformat'],$r_rev).'</a>';
$ID.' '.strftime($conf['dformat'],$r_rev).'</a>';
}else{
$r_head = '<a class="wikilink1" href="'.wl($ID).'">'.
$ID.' '.date($conf['dformat'],@filemtime(wikiFN($ID))).'</a> '.
$ID.' '.strftime($conf['dformat'],@filemtime(wikiFN($ID))).'</a> '.
$lang['current'];
}
}
@ -1044,7 +1044,7 @@ function html_edit($text=null,$include='edit'){ //FIXME: include needed?
<div style="width:99%;">
<div class="toolbar">
<div id="draft__status"><?php if(!empty($INFO['draft'])) echo $lang['draftdate'].' '.date($conf['dformat']);?></div>
<div id="draft__status"><?php if(!empty($INFO['draft'])) echo $lang['draftdate'].' '.strftime($conf['dformat']);?></div>
<div id="tool__bar"><?php if($wr){?><a href="<?php echo DOKU_BASE?>lib/exe/mediamanager.php?ns=<?php echo $INFO['namespace']?>"
target="_blank"><?php echo $lang['mediaselect'] ?></a><?php }?></div>

View File

@ -128,6 +128,11 @@
$conf['compression'] = 0;
}
// fix dateformat for upgraders
if(strpos($conf['dformat'],'%') === false){
$conf['dformat'] = '%Y/%m/%d %H:%M';
}
// precalculate file creation modes
init_creationmodes();

View File

@ -364,7 +364,7 @@ function media_notify($id,$file,$mime){
if(empty($conf['notify'])) return; //notify enabled?
$text = rawLocale('uploadmail');
$text = str_replace('@DATE@',date($conf['dformat']),$text);
$text = str_replace('@DATE@',strftime($conf['dformat']),$text);
$text = str_replace('@BROWSER@',$_SERVER['HTTP_USER_AGENT'],$text);
$text = str_replace('@IPADDRESS@',$_SERVER['REMOTE_ADDR'],$text);
$text = str_replace('@HOSTNAME@',gethostbyaddr($_SERVER['REMOTE_ADDR']),$text);
@ -494,7 +494,7 @@ function media_printfile($item,$auth,$jump){
$info .= (int) $item['meta']->getField('File.Height');
$info .= ' ';
}
$info .= '<i>'.date($conf['dformat'],$item['mtime']).'</i>';
$info .= '<i>'.strftime($conf['dformat'],$item['mtime']).'</i>';
$info .= ' ';
$info .= filesize_h($item['size']);

View File

@ -865,7 +865,7 @@ function tpl_pageinfo(){
}
}
$fn = utf8_decodeFN($fn);
$date = date($conf['dformat'],$INFO['lastmod']);
$date = strftime($conf['dformat'],$INFO['lastmod']);
// print it
if($INFO['exists']){

View File

@ -24,10 +24,10 @@ function toolbar_JSdefines($varname){
global $lang;
$menu = array();
$evt = new Doku_Event('TOOLBAR_DEFINE', $menu);
if ($evt->advise_before()){
// build button array
$menu = array_merge($menu, array(
array(
@ -197,7 +197,7 @@ function toolbar_signature(){
$sig = str_replace('@USER@',$_SERVER['REMOTE_USER'],$sig);
$sig = str_replace('@NAME@',$INFO['userinfo']['name'],$sig);
$sig = str_replace('@MAIL@',$INFO['userinfo']['mail'],$sig);
$sig = str_replace('@DATE@',date($conf['dformat']),$sig);
$sig = str_replace('@DATE@',strftime($conf['dformat']),$sig);
$sig = str_replace('\\\\n','\\n',addslashes($sig));
return $sig;
}

View File

@ -143,7 +143,7 @@ function ajax_lock(){
);
$cname = getCacheName($draft['client'].$id,'.draft');
if(io_saveFile($cname,serialize($draft))){
echo $lang['draftdate'].' '.date($conf['dformat']);
echo $lang['draftdate'].' '.strftime($conf['dformat']);
}
}

View File

@ -48,7 +48,7 @@ $lang['youarehere'] = 'Йерархични следи';
$lang['typography'] = 'Поправяне на разместени букви';
$lang['htmlok'] = 'Позволяване на HTML';
$lang['phpok'] = 'Позволяване на PHP';
$lang['dformat'] = 'Формат на датата (виж. <a href="http://www.php.net/date">date</a> функцията на PHP)';
$lang['dformat'] = 'Формат на датата (виж. <a href="http://www.php.net/strftime">strftime</a> функцията на PHP)';
$lang['signature'] = 'Подпис';
$lang['toptoclevel'] = 'Главно ниво за съдържанието';
$lang['maxtoclevel'] = 'Максимално ниво на съдържанието';

View File

@ -45,7 +45,7 @@ $lang['youarehere'] = 'Camí d\'engrunes jeràrquic';
$lang['typography'] = 'Substitucions tipogràfiques';
$lang['htmlok'] = 'Permet HTML incrustat';
$lang['phpok'] = 'Permet PHP incrustat';
$lang['dformat'] = 'Format de data (vg. la funció PHP <a href="http://www.php.net/date">date</a>)';
$lang['dformat'] = 'Format de data (vg. la funció PHP <a href="http://www.php.net/strftime">strftime</a>)';
$lang['signature'] = 'Signatura';
$lang['toptoclevel'] = 'Nivell superior per a la taula de continguts';
$lang['maxtoclevel'] = 'Nivell màxim per a la taula de continguts';

View File

@ -50,7 +50,7 @@ $lang['youarehere'] = 'Hierarchická "drobečková" navigace';
$lang['typography'] = 'Provádět typografické nahrazování';
$lang['htmlok'] = 'Povolit vložené HTML';
$lang['phpok'] = 'Povolit vložené PHP';
$lang['dformat'] = 'Formát data (viz PHP funkci <a href="http://www.php.net/date">date</a>)';
$lang['dformat'] = 'Formát data (viz PHP funkci <a href="http://www.php.net/strftime">strftime</a>)';
$lang['signature'] = 'Podpis';
$lang['toptoclevel'] = 'Nejvyšší úroveň, kterou začít automaticky generovaný obsah';
$lang['maxtoclevel'] = 'Maximální počet úrovní v automaticky generovaném obsahu';

View File

@ -64,7 +64,7 @@ $lang['youarehere'] = 'Hierarkisk sti';
$lang['typography'] = 'Typografiske erstatninger';
$lang['htmlok'] = 'Tillad indlejret HTML';
$lang['phpok'] = 'Tillad indlejret PHP';
$lang['dformat'] = 'Datoformat (se PHP\'s <a href="http://www.php.net/date">date</a> funktion)';
$lang['dformat'] = 'Datoformat (se PHP\'s <a href="http://www.php.net/strftime">strftime</a> funktion)';
$lang['signature'] = 'Signatur';
$lang['toptoclevel'] = 'Højeste niveau for indholdsfortegnelse';
$lang['maxtoclevel'] = 'Maksimalt niveau for indholdsfortegnelse';

View File

@ -48,7 +48,7 @@ $lang['youarehere'] = 'Hierarchische Pfadnavigation verwenden';
$lang['typography'] = 'Typographische Ersetzungen';
$lang['htmlok'] = 'HTML erlauben';
$lang['phpok'] = 'PHP erlauben';
$lang['dformat'] = 'Datumsformat (Siehe PHP <a href="http://www.php.net/date">date</a> Funktion)';
$lang['dformat'] = 'Datumsformat (Siehe PHP <a href="http://www.php.net/strftime">strftime</a> Funktion)';
$lang['signature'] = 'Signatur';
$lang['toptoclevel'] = 'Inhaltsverzeichnis bei dieser Überschriftsgröße beginnen';
$lang['maxtoclevel'] = 'Maximale Überschriftsgröße für Inhaltsverzeichnis';

View File

@ -52,7 +52,7 @@ $lang['youarehere'] = 'Εμφάνιση ιεραρχικής προβ
$lang['typography'] = 'Μετατροπή ειδικών χαρακτήρων στο τυπογραφικό ισοδύναμό τους';
$lang['htmlok'] = 'Να επιτρέπεται η ενσωμάτωση HTML';
$lang['phpok'] = 'Να επιτρέπεται η ενσωμάτωση PHP';
$lang['dformat'] = 'Μορφή ημερομηνίας (βλέπε την <a href="http://www.php.net/date">date</a> function της PHP)';
$lang['dformat'] = 'Μορφή ημερομηνίας (βλέπε την <a href="http://www.php.net/strftime">strftime</a> function της PHP)';
$lang['signature'] = 'Υπογραφή';
$lang['toptoclevel'] = 'Ανώτατο επίπεδο πίνακα περιεχομένων σελίδας';
$lang['maxtoclevel'] = 'Μέγιστο επίπεδο για πίνακα περιεχομένων σελίδας';

View File

@ -64,7 +64,7 @@ $lang['youarehere'] = 'Hierarchical breadcrumbs';
$lang['typography'] = 'Do typographical replacements';
$lang['htmlok'] = 'Allow embedded HTML';
$lang['phpok'] = 'Allow embedded PHP';
$lang['dformat'] = 'Date format (see PHP\'s <a href="http://www.php.net/date">date</a> function)';
$lang['dformat'] = 'Date format (see PHP\'s <a href="http://www.php.net/strftime">strftime</a> function)';
$lang['signature'] = 'Signature';
$lang['toptoclevel'] = 'Top level for table of contents';
$lang['maxtoclevel'] = 'Maximum level for table of contents';

View File

@ -47,7 +47,7 @@ $lang['youarehere'] = 'Hierarkiaj paneroj';
$lang['typography'] = 'Fari tipografiajn anstataŭigojn';
$lang['htmlok'] = 'Ebligi enmeton de HTML-aĵoj';
$lang['phpok'] = 'Ebligi enmeton de PHP-aĵoj';
$lang['dformat'] = 'Formato de datoj (vidu la PHP-an funkcion <a href="http://www.php.net/date">date</a>';
$lang['dformat'] = 'Formato de datoj (vidu la PHP-an funkcion <a href="http://www.php.net/strftime">strftime</a>';
$lang['signature'] = 'Subskribo';
$lang['toptoclevel'] = 'Supera nivelo por la enhavtabelo';
$lang['maxtoclevel'] = 'Maksimuma nivelo por la enhavtabelo';

View File

@ -47,7 +47,7 @@ $lang['youarehere'] = 'Traza jerárquica';
$lang['typography'] = 'Realizar reemplazos tipográficos';
$lang['htmlok'] = 'Permitir HTML embebido';
$lang['phpok'] = 'Permitir PHP embebido';
$lang['dformat'] = 'Formato de fecha (ver la función de PHP <a href="http://www.php.net/date">date</a>)';
$lang['dformat'] = 'Formato de fecha (ver la función de PHP <a href="http://www.php.net/strftime">strftime</a>)';
$lang['signature'] = 'Firma';
$lang['toptoclevel'] = 'Nivel superior para la tabla de contenidos';
$lang['maxtoclevel'] = 'Máximo nivel para la tabla de contenidos';

View File

@ -46,7 +46,7 @@ $lang['youarehere'] = 'Hierarkiset leivänmurut';
$lang['typography'] = 'Tee typograafiset korvaukset';
$lang['htmlok'] = 'Salli upotettu HTML';
$lang['phpok'] = 'Salli upotettu PHP';
$lang['dformat'] = 'Päivämäärän muoto (katso PHPn <a href="http://www.php.net/date">date</a> functiota)';
$lang['dformat'] = 'Päivämäärän muoto (katso PHPn <a href="http://www.php.net/strftime">strftime</a> functiota)';
$lang['signature'] = 'Allekirjoitus';
$lang['toptoclevel'] = 'Ylätason sisällysluettelo';
$lang['maxtoclevel'] = 'Sisällysluettelon suurin syvyys';

View File

@ -49,7 +49,7 @@ $lang['youarehere'] = 'Traces hiérarchiques';
$lang['typography'] = 'Effectuer des améliorations typographiques';
$lang['htmlok'] = 'Permettre html dans les pages';
$lang['phpok'] = 'Permettre php dans les pages';
$lang['dformat'] = 'Format de date (cf. fonction <a href="http://www.php.net/date">date</a> de PHP)';
$lang['dformat'] = 'Format de date (cf. fonction <a href="http://www.php.net/strftime">strftime</a> de PHP)';
$lang['signature'] = 'Signature';
$lang['toptoclevel'] = 'Niveau supérieur pour figurer dans la table des matières';
$lang['maxtoclevel'] = 'Niveau maximum pour figurer dans la table des matières';

View File

@ -46,7 +46,7 @@ $lang['youarehere'] = 'Niveis xerárquicos da estrutura de navegació
$lang['typography'] = 'Facer substitucións tipográficas';
$lang['htmlok'] = 'Permitir a inserción de HTML';
$lang['phpok'] = 'Permitir a inserción de PHP';
$lang['dformat'] = 'Formato de Data (bótalle un ollo á función <a href="http://www.php.net/date">date</a> do PHP)';
$lang['dformat'] = 'Formato de Data (bótalle un ollo á función <a href="http://www.php.net/strftime">strftime</a> do PHP)';
$lang['signature'] = 'Sinatura';
$lang['toptoclevel'] = 'Nivel superior para a táboa de contidos';
$lang['maxtoclevel'] = 'Nivel máximo para a táboa de contidos';

View File

@ -65,7 +65,7 @@ $lang['youarehere'] = 'עקבות היררכיות להיסטוריה';
$lang['typography'] = 'שימוש בחלופות טיפוגרפיות';
$lang['htmlok'] = 'אישור שיבוץ HTML';
$lang['phpok'] = 'אישור שיבוץ PHP';
$lang['dformat'] = 'תסדיר תאריך (נא לפנות לפונקציה <a href="http://www.php.net/date">date</a> של PHP)';
$lang['dformat'] = 'תסדיר תאריך (נא לפנות לפונקציה <a href="http://www.php.net/strftime">strftime</a> של PHP)';
$lang['signature'] = 'חתימה';
$lang['toptoclevel'] = 'רמה עליונה בתוכן הענינים';
$lang['maxtoclevel'] = 'רמה מירבית בתוכן הענינים';

View File

@ -47,7 +47,7 @@ $lang['youarehere'] = 'Hierarchikus nyomvonal';
$lang['typography'] = 'Legyen-e tipográfiai csere';
$lang['htmlok'] = 'Beágyazott HTML engedélyezése';
$lang['phpok'] = 'Beágyazott PHP engedélyezése';
$lang['dformat'] = 'Dátum formázás (lásd a PHP <a href="http://www.php.net/date">date</a> függvényt)';
$lang['dformat'] = 'Dátum formázás (lásd a PHP <a href="http://www.php.net/strftime">strftime</a> függvényt)';
$lang['signature'] = 'Aláírás';
$lang['toptoclevel'] = 'A tartalomjegyzék felső szintje';
$lang['maxtoclevel'] = 'A tartalomjegyzék mélysége';

View File

@ -48,7 +48,7 @@ $lang['youarehere'] = '現在位置を表示';
$lang['typography'] = 'タイポグラフィー変換';
$lang['htmlok'] = 'HTML埋め込み';
$lang['phpok'] = 'PHP埋め込み';
$lang['dformat'] = '日付フォーマットPHPの<a href="http://www.php.net/date">date</a>関数を参照)';
$lang['dformat'] = '日付フォーマットPHPの<a href="http://www.php.net/strftime">strftime</a>関数を参照)';
$lang['signature'] = '署名';
$lang['toptoclevel'] = '目次 トップレベル見出し';
$lang['maxtoclevel'] = '目次 表示限度見出し';

View File

@ -64,7 +64,7 @@ $lang['youarehere'] = '계층형 위치 추적';
$lang['typography'] = '기호 대체';
$lang['htmlok'] = 'HTML 내장 허용';
$lang['phpok'] = 'PHP 내장 허용';
$lang['dformat'] = '날짜 포맷 (PHP <a href="http://www.php.net/date">date</a> 기능) 참조';
$lang['dformat'] = '날짜 포맷 (PHP <a href="http://www.php.net/strftime">strftime</a> 기능) 참조';
$lang['signature'] = '서명';
$lang['toptoclevel'] = '목차 최상위 항목';
$lang['maxtoclevel'] = '목차 최대 단계';

View File

@ -47,7 +47,7 @@ $lang['youarehere'] = 'Hierarchische broodkruimels';
$lang['typography'] = 'Breng typografische wijzigingen aan';
$lang['htmlok'] = 'Embedded HTML toestaan';
$lang['phpok'] = 'Embedded PHP toestaan';
$lang['dformat'] = 'Datum formaat (zie de PHP <a href="http://www.php.net/date">date</a> functie)';
$lang['dformat'] = 'Datum formaat (zie de PHP <a href="http://www.php.net/strftime">strftime</a> functie)';
$lang['signature'] = 'Ondertekening';
$lang['toptoclevel'] = 'Bovenste niveau voor inhoudsopgave';
$lang['maxtoclevel'] = 'Laagste niveau voor inhoudsopgave';

View File

@ -45,7 +45,7 @@ $lang['youarehere'] = 'Trilha hierárquica';
$lang['typography'] = 'Efetuar modificações tipográficas';
$lang['htmlok'] = 'Permitir incorporação de HTML';
$lang['phpok'] = 'Permitir incorporação de PHP';
$lang['dformat'] = 'Formato da data (veja a função <a href="http://www.php.net/date">date</a> do PHP)';
$lang['dformat'] = 'Formato da data (veja a função <a href="http://www.php.net/strftime">strftime</a> do PHP)';
$lang['signature'] = 'Assinatura';
$lang['toptoclevel'] = 'Nível mais alto para a tabela de conteúdos';
$lang['maxtoclevel'] = 'Nível máximo para a tabela de conteúdos';

View File

@ -41,7 +41,7 @@ $lang['youarehere'] = 'Breadcrumbs hierárquicas';
$lang['typography'] = 'Executar substituições tipográficas';
$lang['htmlok'] = 'Permitir embeber HTML';
$lang['phpok'] = 'Permitir embeber PHP';
$lang['dformat'] = 'Formato de Data (ver função PHP\'s <a href="http://www.php.net/date">date</a>)';
$lang['dformat'] = 'Formato de Data (ver função PHP\'s <a href="http://www.php.net/strftime">strftime</a>)';
$lang['signature'] = 'Assinatura';
$lang['toptoclevel'] = 'Nível de topo para a tabela de conteúdo';
$lang['maxtoclevel'] = 'Máximo nível para a tabela de conteúdo';

View File

@ -44,7 +44,7 @@ $lang['youarehere'] = 'Structura ierarhică a "urmelor" lăsate';
$lang['typography'] = 'Fă înlocuiri topografice';
$lang['htmlok'] = 'Permite intercalare cod HTML';
$lang['phpok'] = 'Permite intercalare cod PHP';
$lang['dformat'] = 'Format dată (vezi funcţia PHP <a href="http://www.php.net/date">date</a>)';
$lang['dformat'] = 'Format dată (vezi funcţia PHP <a href="http://www.php.net/strftime">strftime</a>)';
$lang['signature'] = 'Semnătura';
$lang['toptoclevel'] = 'Primul nivel pentru cuprins';
$lang['maxtoclevel'] = 'Nivelul maxim pentru cuprins';

View File

@ -48,7 +48,7 @@ $lang['youarehere'] = 'Hierarkiska spår';
$lang['typography'] = 'Aktivera typografiska ersättningar';
$lang['htmlok'] = 'Tillåt inbäddad HTML';
$lang['phpok'] = 'Tillåt inbäddad PHP';
$lang['dformat'] = 'Datumformat (se PHP:s <a href="http://www.php.net/date">date</a>-funktion)';
$lang['dformat'] = 'Datumformat (se PHP:s <a href="http://www.php.net/strftime">strftime</a>-funktion)';
$lang['signature'] = 'Signatur';
$lang['toptoclevel'] = 'Toppnivå för innehållsförteckning';
$lang['maxtoclevel'] = 'Maximal nivå för innehållsförteckning';

View File

@ -65,7 +65,7 @@ $lang['youarehere'] = 'Показувати "Ви тут"';
$lang['typography'] = 'Заміняти типографськи символи';
$lang['htmlok'] = 'Дозволити HTML';
$lang['phpok'] = 'Дозволити PHP';
$lang['dformat'] = 'Формат дати (дивіться функцію <a href="http://www.php.net/date">date</a> PHP)';
$lang['dformat'] = 'Формат дати (дивіться функцію <a href="http://www.php.net/strftime">strftime</a> PHP)';
$lang['signature'] = 'Підпис';
$lang['toptoclevel'] = 'Мінімальний рівень для змісту';
$lang['maxtoclevel'] = 'Максимальний рівень для змісту';

View File

@ -64,7 +64,7 @@ $lang['youarehere'] = '显示“您在这里”';
$lang['typography'] = '进行字符替换';
$lang['htmlok'] = '允许嵌入式 HTML';
$lang['phpok'] = '允许嵌入式 PHP';
$lang['dformat'] = '日期格式(参见 PHP 的 <a href="http://www.php.net/date">date</a> 功能)';
$lang['dformat'] = '日期格式(参见 PHP 的 <a href="http://www.php.net/strftime">strftime</a> 功能)';
$lang['signature'] = '签名样式';
$lang['toptoclevel'] = '目录的最顶层';
$lang['maxtoclevel'] = '目录的最多层次';

View File

@ -56,7 +56,7 @@ if (!defined('DOKU_INC')) die();
<dl class="img_tags">
<?php
$t = tpl_img_getTag('Date.EarliestTime');
if($t) print '<dt>'.$lang['img_date'].':</dt><dd>'.date($conf['dformat'],$t).'</dd>';
if($t) print '<dt>'.$lang['img_date'].':</dt><dd>'.strftime($conf['dformat'],$t).'</dd>';
$t = tpl_img_getTag('File.Name');
if($t) print '<dt>'.$lang['img_fname'].':</dt><dd>'.hsc($t).'</dd>';