svn commit: r1865370 - in /ofbiz/ofbiz-framework/trunk: framework/common/config/CommonEntityLabels.xml themes/rainbowstone/widget/Theme.xml

Sat, 17 Aug 2019 11:27:29 -0700 

Author: jleroux
Date: Sat Aug 17 18:26:42 2019
New Revision: 1865370

URL: http://svn.apache.org/viewvc?rev=1865370&view=rev
Log:
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/trunk/framework/common/config/CommonEntityLabels.xml
    ofbiz/ofbiz-framework/trunk/themes/rainbowstone/widget/Theme.xml

Modified: 
ofbiz/ofbiz-framework/trunk/framework/common/config/CommonEntityLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/config/CommonEntityLabels.xml?rev=1865370&r1=1865369&r2=1865370&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/common/config/CommonEntityLabels.xml 
(original)
+++ ofbiz/ofbiz-framework/trunk/framework/common/config/CommonEntityLabels.xml 
Sat Aug 17 18:26:42 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/trunk/themes/rainbowstone/widget/Theme.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/rainbowstone/widget/Theme.xml?rev=1865370&r1=1865369&r2=1865370&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/rainbowstone/widget/Theme.xml (original)
+++ ofbiz/ofbiz-framework/trunk/themes/rainbowstone/widget/Theme.xml Sat Aug 17 
18:26:42 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 -->

Reply via email to