#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 63a2fb1..a6a87ee 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 2009-09-13  Martin Kutschker  <masi@typo3.org>
 
        * Fixed bug #11943: TCEforms suggest classes lack final ?> and use round brackets around the uid
 2009-09-13  Martin Kutschker  <masi@typo3.org>
 
        * 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  <info@sk-typo3.de>
 
 
 2009-09-12  Steffen Kamper  <info@sk-typo3.de>
 

diff --git a/typo3/sysext/tstemplate_objbrowser/class.tx_tstemplateobjbrowser.php b/typo3/sysext/tstemplate_objbrowser/class.tx_tstemplateobjbrowser.php
index ee059b0..896197d 100644 (file)
--- 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(
                                '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(
                        ),
                        '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'),
                        ),
                        'ts_browser_const' => array(
                                '0' => $GLOBALS['LANG']->getLL('plainSubstitution'),


@@ -383,7 +387,10 @@ class tx_tstemplateobjbrowser extends t3lib_extobjbase {
 
                                        // clear
                                $out = '';
 
                                        // clear
                                $out = '';

-                               $out = $this->pObj->sObj." <b>" . t3lib_div::strtoupper($GLOBALS['LANG']->getLL('clear')) . "</b> &nbsp;&nbsp;";
+                               $out = $this->pObj->sObj . " <b>" .
+                                       $GLOBALS['LANG']->csConvObj->conv_case(
+                                               $GLOBALS['LANG']->charSet, $GLOBALS['LANG']->getLL('clear'), 'toUpper'
+                                       ) . "</b> &nbsp;&nbsp;";

                                $out .= '<input type="Checkbox" name="data[' . $this->pObj->sObj . '][clearValue]" value="1" />';
                                $out .= '<input type="Submit" name="clear_object" value="' . $GLOBALS['LANG']->getLL('clearButton') . '" />';
                                $theOutput .= $this->pObj->doc->spacer(20);
                                $out .= '<input type="Checkbox" name="data[' . $this->pObj->sObj . '][clearValue]" value="1" />';
                                $out .= '<input type="Submit" name="clear_object" value="' . $GLOBALS['LANG']->getLL('clearButton') . '" />';
                                $theOutput .= $this->pObj->doc->spacer(20);


@@ -470,7 +477,11 @@ class tx_tstemplateobjbrowser extends t3lib_extobjbase {
                        } else {
                                $remove = '';
                        }
                        } 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 .= '<table border="0" cellpadding="1" cellspacing="0" id="typo3-objectBrowser" width="100%">
                        $theOutput .= $this->pObj->doc->spacer(15);
                        $theOutput .= $this->pObj->doc->sectionEnd();
                        $theOutput .= '<table border="0" cellpadding="1" cellspacing="0" id="typo3-objectBrowser" width="100%">