Author: jleroux
Date: Sun Aug 18 15:17:33 2019
New Revision: 1865400
URL: http://svn.apache.org/viewvc?rev=1865400&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/release17.12/ (props changed)
ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/widget/Theme.xml
ofbiz/ofbiz-plugins/branches/release17.12/multiflex/ (props changed)
ofbiz/ofbiz-plugins/branches/release17.12/multiflex/widget/Theme.xml
Propchange: ofbiz/ofbiz-plugins/branches/release17.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 18 15:17:33 2019
@@ -11,4 +11,4 @@
/ofbiz/branches/multitenant20100310/plugins:921280-927264
/ofbiz/branches/release13.07/plugins:1547657
/ofbiz/ofbiz-framework/trunk:1836107
-/ofbiz/ofbiz-plugins/trunk:1819576,1819580,1819582,1819589,1820962,1820973,1821045,1821049,1821051,1822129,1822133,1822139,1822143,1822145,1822389,1822391,1822395,1824646,1824648,1824650,1824654,1828569,1830856,1831084,1832727,1832800,1837796,1837845,1837857,1838249,1838381,1838797,1838816,1841650,1845558,1847272,1847346,1847398,1847528,1847530,1848009,1848396,1848398,1848921,1849119,1851002,1851068,1851135,1851185,1852988,1855082,1856802,1856917,1857120,1857173,1858141,1858244,1858285,1858312,1859012,1859735,1859893,1859906,1860648,1860801,1861824,1861904,1861986,1862466,1865347
+/ofbiz/ofbiz-plugins/trunk:1819576,1819580,1819582,1819589,1820962,1820973,1821045,1821049,1821051,1822129,1822133,1822139,1822143,1822145,1822389,1822391,1822395,1824646,1824648,1824650,1824654,1828569,1830856,1831084,1832727,1832800,1837796,1837845,1837857,1838249,1838381,1838797,1838816,1841650,1845558,1847272,1847346,1847398,1847528,1847530,1848009,1848396,1848398,1848921,1849119,1851002,1851068,1851135,1851185,1852988,1855082,1856802,1856917,1857120,1857173,1858141,1858244,1858285,1858312,1859012,1859735,1859893,1859906,1860648,1860801,1861824,1861904,1861986,1862466,1865347,1865398
Modified: ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/widget/Theme.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/widget/Theme.xml?rev=1865400&r1=1865399&r2=1865400&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/widget/Theme.xml
(original)
+++ ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/widget/Theme.xml Sun
Aug 18 15:17:33 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/release17.12/multiflex/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 18 15:17:33 2019
@@ -11,3 +11,4 @@
/ofbiz/branches/multitenant20100310/themes/multiflex:921280-927264
/ofbiz/branches/release13.07/themes/multiflex:1547657
/ofbiz/ofbiz-framework/trunk:1822377
+/ofbiz/ofbiz-plugins/trunk/multiflex:1865398
Modified: ofbiz/ofbiz-plugins/branches/release17.12/multiflex/widget/Theme.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release17.12/multiflex/widget/Theme.xml?rev=1865400&r1=1865399&r2=1865400&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/branches/release17.12/multiflex/widget/Theme.xml
(original)
+++ ofbiz/ofbiz-plugins/branches/release17.12/multiflex/widget/Theme.xml Sun
Aug 18 15:17:33 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>
