Index: trunk/core/units/languages/languages_tag_processor.php =================================================================== diff -u -N -r7635 -r8437 --- trunk/core/units/languages/languages_tag_processor.php (.../languages_tag_processor.php) (revision 7635) +++ trunk/core/units/languages/languages_tag_processor.php (.../languages_tag_processor.php) (revision 8437) @@ -33,12 +33,17 @@ */ function CurrentDate($params) { - $week_day = $this->Application->Phrase('lu_weekday_'.adodb_date('l')); - $format = str_replace('l', '#@#', $params['format']); // replace with reserved char (preserves translation link) - - return str_replace('#@#', $week_day, adodb_date($format)); + $format = $params['format']; + if (strpos($format, 'l') !== false) { + $week_day = $this->Application->Phrase('lu_weekday_'.adodb_date('l')); + $format = str_replace('l', '#@#', $format); // replace with reserved char (preserves translation link) + + return str_replace('#@#', $week_day, adodb_date($format)); + } + + return adodb_date($format); } - + function ListLanguages($params) { $this->Special = 'enabled'; @@ -50,11 +55,11 @@ $object =& $this->getObject($params); return $this->Application->Phrase($params['phrase_prefix'].$object->GetDBField('PackName')); } - + function LanguageLink($params) { $t = $this->SelectParam($params, 'template,t'); - + $object =& $this->getObject($params); return $this->Application->HREF($t, '', Array('m_lang' => $object->GetID())); } @@ -92,12 +97,12 @@ { return $this->TotalRecords($params) > 1; } - + function IsPrimaryLanguage($params) { return $this->Application->GetDefaultLanguageId() == $this->Application->GetVar('m_lang'); } - + /* function Main_IsMetricUnits($params) { $object =& $this->Application->recallObject($this->Prefix.'.current');