svn commit: r1865399 - in /ofbiz/ofbiz-plugins/branches/release18.12: ./ ecommerce/widget/Theme.xml multiflex/ multiflex/widget/Theme.xml

Author: jleroux
Date: Sun Aug 18 15:17:30 2019
New Revision: 1865399

URL: http://svn.apache.org/viewvc?rev=1865399&view=rev
Log:
"Applied fix from plugins for revision: 1865398"
------------------------------------------------------------------------
r1865398 | jleroux | 2019-08-18 17:16:12 +0200 (dim. 18 août 2019) | 5 lignes

Fixed: <description> of <visual-theme> in Theme.xml does not work
(OFBIZ-9867)

There is no str:label in UelFunctions class but util:label
Missed theses files in previous commit (damn plugins)
------------------------------------------------------------------------

Modified:
    ofbiz/ofbiz-plugins/branches/release18.12/   (props changed)
    ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/widget/Theme.xml
    ofbiz/ofbiz-plugins/branches/release18.12/multiflex/   (props changed)
    ofbiz/ofbiz-plugins/branches/release18.12/multiflex/widget/Theme.xml

Propchange: ofbiz/ofbiz-plugins/branches/release18.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 18 15:17:30 2019
@@ -10,4 +10,4 @@
 /ofbiz/branches/json-integration-refactoring/plugins:1634077-1635900
 /ofbiz/branches/multitenant20100310/plugins:921280-927264
 /ofbiz/branches/release13.07/plugins:1547657
-/ofbiz/ofbiz-plugins/trunk:1851002,1851009,1851068,1851135,1851139-1851140,1851185,1851316,1851885,1852988,1853904,1854684,1855082,1855084,1856212,1856802,1856917,1857120,1857173,1858141,1858244,1858265,1858285,1858289,1858312,1859012,1859735,1859893,1859906,1860648,1860801,1861824,1861904,1861986,1862466,1865347
+/ofbiz/ofbiz-plugins/trunk:1851002,1851009,1851068,1851135,1851139-1851140,1851185,1851316,1851885,1852988,1853904,1854684,1855082,1855084,1856212,1856802,1856917,1857120,1857173,1858141,1858244,1858265,1858285,1858289,1858312,1859012,1859735,1859893,1859906,1860648,1860801,1861824,1861904,1861986,1862466,1865347,1865398

Modified: ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/widget/Theme.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/widget/Theme.xml?rev=1865399&r1=1865398&r2=1865399&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/widget/Theme.xml (original)
+++ ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/widget/Theme.xml Sun Aug 18 15:17:30 2019
@@ -23,7 +23,7 @@ under the License.
        xmlns="http://ofbiz.apache.org/Widget-Theme" xsi:schemaLocation="http://ofbiz.apache.org/Widget-Theme http://ofbiz.apache.org/dtds/widget-theme.xsd">
     <visual-themes>
         <visual-theme id="EC_DEFAULT" display-name="Ecommerce Default">
-            <description>${str:label('CommonEntityLabels', 'VisualTheme.description.EC_DEFAULT', locale)}</description>
+            <description>${util:label('CommonEntityLabels', 'VisualTheme.description.EC_DEFAULT', locale)}</description>
             <screenshot location="/images/ecdefaulttheme.jpg"/>
         </visual-theme>
     </visual-themes>

Propchange: ofbiz/ofbiz-plugins/branches/release18.12/multiflex/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 18 15:17:30 2019
@@ -10,4 +10,4 @@
 /ofbiz/branches/json-integration-refactoring/themes/multiflex:1634077-1635900
 /ofbiz/branches/multitenant20100310/themes/multiflex:921280-927264
 /ofbiz/branches/release13.07/themes/multiflex:1547657
-/ofbiz/ofbiz-plugins/trunk/multiflex:1851009
+/ofbiz/ofbiz-plugins/trunk/multiflex:1851009,1865398

Modified: ofbiz/ofbiz-plugins/branches/release18.12/multiflex/widget/Theme.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release18.12/multiflex/widget/Theme.xml?rev=1865399&r1=1865398&r2=1865399&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/branches/release18.12/multiflex/widget/Theme.xml (original)
+++ ofbiz/ofbiz-plugins/branches/release18.12/multiflex/widget/Theme.xml Sun Aug 18 15:17:30 2019
@@ -23,7 +23,7 @@ under the License.
        xmlns="http://ofbiz.apache.org/Widget-Theme" xsi:schemaLocation="http://ofbiz.apache.org/Widget-Theme http://ofbiz.apache.org/dtds/widget-theme.xsd">
     <visual-themes>
         <visual-theme id="MULTIFLEX" display-name="Multiflex">
-            <description>${str:label('CommonEntityLabels', 'VisualTheme.description.MULTIFLEX', locale)}</description>
+            <description>${util:label('CommonEntityLabels', 'VisualTheme.description.MULTIFLEX', locale)}</description>
             <screenshot location="/multiflex/images/screenshot.jpg"/>
         </visual-theme>
     </visual-themes>