You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2019/08/17 18:27:19 UTC

svn commit: r1865371 - in /ofbiz/ofbiz-framework/branches/release18.12: ./ framework/common/config/CommonEntityLabels.xml themes/rainbowstone/widget/Theme.xml

Author: jleroux
Date: Sat Aug 17 18:27:19 2019
New Revision: 1865371

URL: http://svn.apache.org/viewvc?rev=1865371&view=rev
Log:
"Applied fix from trunk for revision: 1865370" 
------------------------------------------------------------------------
r1865370 | jleroux | 2019-08-17 20:26:42 +0200 (sam. 17 août 2019) | 7 lignes

Improved: Use Labels in themes names
(OFBIZ-9863)

Adds labels and necessary calls in Theme.xml

While at it, improves other backend themes labels by removing redundancy, at 
least in French and English.
------------------------------------------------------------------------

Modified:
    ofbiz/ofbiz-framework/branches/release18.12/   (props changed)
    ofbiz/ofbiz-framework/branches/release18.12/framework/common/config/CommonEntityLabels.xml
    ofbiz/ofbiz-framework/branches/release18.12/themes/rainbowstone/widget/Theme.xml

Propchange: ofbiz/ofbiz-framework/branches/release18.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Aug 17 18:27:19 2019
@@ -10,4 +10,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1849931,1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850914,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158,1851200,1851224,1851247,1851254,1851315,1851319,1851350,1851353,1851433,1851500,1851805,1851885,1851998,1852503,1852587,1852818,1852882,1853070,1853109,1853691,1853745,1853750,1854306,1854457,1854683,1855078,1855083,1855287,1855371,1855403,1855488,1855492,1855497,1855501,1855898,1856212,1856405,1856455,1856459-1856460,1856484,1856598,1856610,1856613,1856617,1856667,1857088,1857099,1857152,1857154,1857173,1857180,1857213,1857392,1857617,1857692,1857813,1858035,1858092,1858180,1858250,1858256,1858275,1858319,1858347,1858432,1858444,1858483,1858523,1858539,1858965,1858980,1859033,1859055,1859087,1859255,1859263,1859268,1859543,1859571,1859576,1859691,1859694,1859698,1859704,1859708,1859735,1859796,1859800,1859807,1859871,1859877,1859882,1859909,1859911,1859915,1859931,1859968,1859972,1859981,1860082,1860141,
 1860274,1860357,1860526,1860592,1860597,1860613,1860797,1861615,1861811,1861815,1861828,1861834,1861837,1861849,1861859,1861869,1862045-1862046,1862207,1862271,1862278,1862466,1862648,1863560,1863838,1863965,1864216,1864716,1864721,1864881,1864891,1864930,1865103,1865344,1865347,1865367
+/ofbiz/ofbiz-framework/trunk:1849931,1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850914,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158,1851200,1851224,1851247,1851254,1851315,1851319,1851350,1851353,1851433,1851500,1851805,1851885,1851998,1852503,1852587,1852818,1852882,1853070,1853109,1853691,1853745,1853750,1854306,1854457,1854683,1855078,1855083,1855287,1855371,1855403,1855488,1855492,1855497,1855501,1855898,1856212,1856405,1856455,1856459-1856460,1856484,1856598,1856610,1856613,1856617,1856667,1857088,1857099,1857152,1857154,1857173,1857180,1857213,1857392,1857617,1857692,1857813,1858035,1858092,1858180,1858250,1858256,1858275,1858319,1858347,1858432,1858444,1858483,1858523,1858539,1858965,1858980,1859033,1859055,1859087,1859255,1859263,1859268,1859543,1859571,1859576,1859691,1859694,1859698,1859704,1859708,1859735,1859796,1859800,1859807,1859871,1859877,1859882,1859909,1859911,1859915,1859931,1859968,1859972,1859981,1860082,1860141,
 1860274,1860357,1860526,1860592,1860597,1860613,1860797,1861615,1861811,1861815,1861828,1861834,1861837,1861849,1861859,1861869,1862045-1862046,1862207,1862271,1862278,1862466,1862648,1863560,1863838,1863965,1864216,1864716,1864721,1864881,1864891,1864930,1865103,1865344,1865347,1865367,1865370

Modified: ofbiz/ofbiz-framework/branches/release18.12/framework/common/config/CommonEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/framework/common/config/CommonEntityLabels.xml?rev=1865371&r1=1865370&r2=1865371&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release18.12/framework/common/config/CommonEntityLabels.xml (original)
+++ ofbiz/ofbiz-framework/branches/release18.12/framework/common/config/CommonEntityLabels.xml Sat Aug 17 18:27:19 2019
@@ -21886,9 +21886,9 @@
     </property>
     <property key="VisualTheme.description.BLUELIGHT">
         <value xml:lang="cs">BlueLight Theme: navigační řádek, menu a zakulacené rohy</value>
-        <value xml:lang="en">BlueLight Theme: breadcrumbs, drop-down menus and rounded corners</value>
+        <value xml:lang="en">: breadcrumbs, drop-down menus and rounded corners</value>
         <value xml:lang="es">BlueLight: Migas de pan, menús desplegables y las esquinas redondeadas</value>
-        <value xml:lang="fr">BlueLight Theme: fil d'ariane, menus déroulants et coins arrondis</value>
+        <value xml:lang="fr"> : fil d'ariane, menus déroulants et coins arrondis</value>
         <value xml:lang="ja">ブルーライト: パンくずリスト、ドロップダウンメニュー、そして丸いコーナー</value>
         <value xml:lang="pt-BR">Bluelight Tema: breadcrumbs, menus drop-down e cantos arredondados</value>
         <value xml:lang="ru">Светло-голубая тема: Бреадкрамбсы, раскрывающиеся меню с закругленным углами</value>
@@ -21898,9 +21898,9 @@
     </property>
     <property key="VisualTheme.description.FLAT_GREY">
         <value xml:lang="cs">Flat Grey - Plovoucí rozložení, podpora obousměrného textu</value>
-        <value xml:lang="en">Flat Grey - Floating Layout, Sight-Impaired Accessible, Bidirectional</value>
+        <value xml:lang="en"> - Floating Layout, Sight-Impaired Accessible, Bidirectional</value>
         <value xml:lang="es">Flat Grey - Diseño flotante, accesible para personas con discapacidad visual, bidireccional</value>
-        <value xml:lang="fr">Flat Grey : mise en page dynamique, accessibilité, support de texte bidirectionnel</value>
+        <value xml:lang="fr"> : mise en page dynamique, accessibilité, support de texte bidirectionnel</value>
         <value xml:lang="ja">フラットグレー: 以前のOFBiz標準フローティングレイアウト</value>
         <value xml:lang="pt-BR">Apartamento Grey - Layout padrão antigo OFBiz flutuante</value>
         <value xml:lang="ru">Плоские серые - Плавающие лейауты, Слабовидящий доступ, Двунаправленный</value>
@@ -21921,10 +21921,10 @@
         <value xml:lang="zh-TW">電子商務的替代視覺風格</value>
     </property>
     <property key="VisualTheme.description.TOMAHAWK">
-        <value xml:lang="cs">Tomahawk: evoluční verze BlueLight</value>
+        <value xml:lang="cs">: evoluční verze BlueLight</value>
         <value xml:lang="en">Tomahawk: the evolution of the BlueLight theme</value>
         <value xml:lang="es">Tomahawk: la evolución del tema BlueLight</value>
-        <value xml:lang="fr">Tomahawk: évolution de BlueLight dans les tons noir et orange</value>
+        <value xml:lang="fr"> : évolution de BlueLight dans les tons noir et orange</value>
         <value xml:lang="ja">トマホーク: パンくずの改良</value>
         <value xml:lang="pt-BR">Tomahawk: a evolução do tema Migalhas Descartando</value>
         <value xml:lang="ru">Томахавк: эволюция падающих крамбов темы</value>
@@ -21932,4 +21932,24 @@
         <value xml:lang="zh">印第安战斧：下拉多级风格的演化版</value>
         <value xml:lang="zh-TW">印第安戰斧:下拉多級風格的演化版</value>
     </property>
-</resource>
\ No newline at end of file
+    <property key="VisualTheme.description.RAINBOWSTONE_SAPHIR">
+        <value xml:lang="en">: Rainbowstone theme in blue</value>
+        <value xml:lang="fr"> : le thème Rainbowstone en bleu</value>
+    </property>
+    <property key="VisualTheme.description.RAINBOWSTONE_AMBER">
+        <value xml:lang="en">: Rainbowstone theme in orange</value>
+        <value xml:lang="fr"> : le thème Rainbowstone en orange</value>
+    </property>
+    <property key="VisualTheme.description.RAINBOWSTONE_RUBY">
+        <value xml:lang="en">: Rainbowstone theme in red</value>
+        <value xml:lang="fr"> : le thème Rainbowstone en rouge</value>
+    </property>
+    <property key="VisualTheme.description.RAINBOWSTONE_EMERALD">
+        <value xml:lang="en">: Rainbowstone theme in green</value>
+        <value xml:lang="fr"> : le thème Rainbowstone en vert</value>
+    </property>
+    <property key="VisualTheme.description.RAINBOWSTONE_SAPHIR">
+        <value xml:lang="en">: Rainbowstone theme in blue</value>
+        <value xml:lang="fr"> : le thème Rainbowstone en bleu</value>
+    </property>
+</resource>

Modified: ofbiz/ofbiz-framework/branches/release18.12/themes/rainbowstone/widget/Theme.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/themes/rainbowstone/widget/Theme.xml?rev=1865371&r1=1865370&r2=1865371&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release18.12/themes/rainbowstone/widget/Theme.xml (original)
+++ ofbiz/ofbiz-framework/branches/release18.12/themes/rainbowstone/widget/Theme.xml Sat Aug 17 18:27:19 2019
@@ -35,6 +35,25 @@ under the License.
             <screenshot location="/rainbowstone/images/themeEmerald.png"/>
         </visual-theme>
     </visual-themes>
+    <visual-themes>
+        <visual-theme id="RAINBOWSTONE_SAPHIR" display-name="Rainbow Stone - Sapphire">
+            <description>${util:label('CommonEntityLabels', 'VisualTheme.description.RAINBOWSTONE_SAPHIR', locale)}</description>
+            <screenshot location="/rainbowstone/images/themeSaphir.png"/>
+        </visual-theme>
+        <visual-theme id="RAINBOWSTONE_AMBER" display-name="Rainbow Stone - Amber">
+            <description>${util:label('CommonEntityLabels', 'VisualTheme.description.RAINBOWSTONE_AMBER', locale)}</description>
+            <screenshot location="/rainbowstone/images/themeAmber.png"/>
+        </visual-theme>
+        <visual-theme id="RAINBOWSTONE_RUBY" display-name="Rainbow Stone - Sapphire">
+            <description>${util:label('CommonEntityLabels', 'VisualTheme.description.RAINBOWSTONE_RUBY', locale)}</description>
+            <screenshot location="/rainbowstone/images/themeRuby.png"/>
+        </visual-theme>
+        <visual-theme id="RAINBOWSTONE_EMERALD" display-name="Rainbow Stone - Sapphire">
+            <description>${util:label('CommonEntityLabels', 'VisualTheme.description.RAINBOWSTONE_EMERALD', locale)}</description>
+            <screenshot location="/rainbowstone/images/themeEmerald.png"/>
+        </visual-theme>
+    </visual-themes>
+    
     <extends location="component://common-theme/widget/Theme.xml"/>
     <theme-properties>
         <!--header image -->