Fixed bug #14354: Bug: fix percentage of changes in Workspace Manager -> "Show differ...

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@7918 709f56b5-9817-0410-a4d7-c38de5d9e867

diff --git a/ChangeLog b/ChangeLog
index af52f80..270a5c0 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@
 
 2010-06-14  Steffen Kamper  <info@sk-typo3.de>
 
+       * Fixed bug #14354: Bug: fix percentage of changes in Workspace Manager -> "Show differences inline" (Thanks to Marco Huber)
        * Reverted revision 7901:  #14467: Code cleanup: t3lib_iconWorks::getIconImage is not needed anymore
 
 2010-06-13  Steffen Kamper  <info@sk-typo3.de>

diff --git a/typo3/mod/user/ws/class.wslib_gui.php b/typo3/mod/user/ws/class.wslib_gui.php
index 7607db8..4c7e0df 100644 (file)
--- a/typo3/mod/user/ws/class.wslib_gui.php
+++ b/typo3/mod/user/ws/class.wslib_gui.php
@@ -447,8 +447,8 @@ class wslib_gui {
                                                                                } elseif ($rec_off['t3ver_state']==4)   {
                                                                                        $diffCode.= $this->doc->icons(1) . $LANG->getLL('label_moveto_pointer') . '<br/>';
                                                                                } else {
-                                                                                       $diffCode.= ($diffPct<0 ? 'N/A' : ($diffPct ? $diffPct.'% change:' : ''));
-                                                                                       $diffCode.= ($diffPct<0 ? $LANG->getLL('label_notapplicable') : ($diffPct ? sprintf($LANG->getLL('label_percentchange'), $diffPct) : ''));
+                                                                                       $diffCode .= ($diffPct < 0 ? $LANG->getLL('label_notapplicable') :
+                                                                                               ($diffPct ? sprintf($LANG->getLL('label_percentChange'), $diffPct) : ''));
                                                                                        $diffCode.= $diffHTML;
                                                                                }
 

diff --git a/typo3/sysext/lang/locallang_mod_user_ws.xml b/typo3/sysext/lang/locallang_mod_user_ws.xml
index efa2595..0b82b07 100755 (executable)
--- a/typo3/sysext/lang/locallang_mod_user_ws.xml
+++ b/typo3/sysext/lang/locallang_mod_user_ws.xml
@@ -143,6 +143,7 @@
                        <label index="label_allWSes">All workspaces</label>
                        <label index="label_notapplicable">n/a</label>
                        <label index="label_percentchange">%%% change:</label>
+                       <label index="label_percentChange">%d%% change:</label>
                        <label index="label_doaction_default">Do:</label>
                        <label index="label_doaction_publish">Publish</label>
                        <label index="label_doaction_swap">Swap</label>