From: Martin Kutschker Date: Sun, 13 Sep 2009 19:18:05 +0000 (+0000) Subject: #11945: TS objectbrowser converts labels to uppercase improperly X-Git-Tag: TYPO3_4-3-0beta1~148 X-Git-Url: http://git.typo3.org/Packages/TYPO3.CMS.git/commitdiff_plain/a6674171cb0229717df365e6efb7d2b738f19a8f #11945: TS objectbrowser converts labels to uppercase improperly git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@5921 709f56b5-9817-0410-a4d7-c38de5d9e867 --- diff --git a/ChangeLog b/ChangeLog index 63a2fb11187..a6a87ee7591 100755 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ 2009-09-13 Martin Kutschker * Fixed bug #11943: TCEforms suggest classes lack final ?> and use round brackets around the uid + * Fixed bug #11945: TS objectbrowser converts labels to uppercase improperly (thanks to Christopher Stelmaszyk) 2009-09-12 Steffen Kamper diff --git a/typo3/sysext/tstemplate_objbrowser/class.tx_tstemplateobjbrowser.php b/typo3/sysext/tstemplate_objbrowser/class.tx_tstemplateobjbrowser.php index ee059b0f310..896197d0179 100644 --- a/typo3/sysext/tstemplate_objbrowser/class.tx_tstemplateobjbrowser.php +++ b/typo3/sysext/tstemplate_objbrowser/class.tx_tstemplateobjbrowser.php @@ -55,10 +55,14 @@ class tx_tstemplateobjbrowser extends t3lib_extobjbase { 'setup' => $GLOBALS['LANG']->getLL('setup') ), 'ts_browser_toplevel_setup' => array( - '0' => t3lib_div::strtoupper($GLOBALS['LANG']->getLL('all')) + '0' => $GLOBALS['LANG']->csConvObj->conv_case( + $GLOBALS['LANG']->charSet, $GLOBALS['LANG']->getLL('all'), 'toUpper' + ) ), 'ts_browser_toplevel_const' => array( - '0' => t3lib_div::strtoupper($GLOBALS['LANG']->getLL('all')) + '0' => $GLOBALS['LANG']->csConvObj->conv_case( + $GLOBALS['LANG']->charSet, $GLOBALS['LANG']->getLL('all'), 'toUpper' + ) ), 'ts_browser_const' => array( '0' => $GLOBALS['LANG']->getLL('plainSubstitution'), @@ -383,7 +387,10 @@ class tx_tstemplateobjbrowser extends t3lib_extobjbase { // clear $out = ''; - $out = $this->pObj->sObj." " . t3lib_div::strtoupper($GLOBALS['LANG']->getLL('clear')) . "   "; + $out = $this->pObj->sObj . " " . + $GLOBALS['LANG']->csConvObj->conv_case( + $GLOBALS['LANG']->charSet, $GLOBALS['LANG']->getLL('clear'), 'toUpper' + ) . "   "; $out .= ''; $out .= ''; $theOutput .= $this->pObj->doc->spacer(20); @@ -470,7 +477,11 @@ class tx_tstemplateobjbrowser extends t3lib_extobjbase { } else { $remove = ''; } - $label = $theKey ? $theKey : ($bType == 'setup' ? t3lib_div::strtoupper($GLOBALS['LANG']->getLL('setupRoot')) : t3lib_div::strtoupper($GLOBALS['LANG']->getLL('constantRoot'))); + $label = $theKey ? $theKey : + ($bType == 'setup' ? + $GLOBALS['LANG']->csConvObj->conv_case($GLOBALS['LANG']->charSet, $GLOBALS['LANG']->getLL('setupRoot'), 'toUpper') : + $GLOBALS['LANG']->csConvObj->conv_case($GLOBALS['LANG']->charSet, $GLOBALS['LANG']->getLL('constantRoot'), 'toUpper') + ); $theOutput .= $this->pObj->doc->spacer(15); $theOutput .= $this->pObj->doc->sectionEnd(); $theOutput .= '