OFBiz › OFBiz - Commits

svn commit: r1037559 - in /ofbiz/trunk: applications/order/widget/ordermgr/ framework/common/config/ specialpurpose/ecommerce/config/

‹ Previous Topic Next Topic ›
 
classic Classic list List threaded Threaded
♦
♦
 1 message Options
jleroux@apache.org
Reply | Threaded
Open this post in threaded view
♦
♦
|

svn commit: r1037559 - in /ofbiz/trunk: applications/order/widget/ordermgr/ framework/common/config/ specialpurpose/ecommerce/config/

jleroux@apache.org
Author: jleroux
Date: Sun Nov 21 21:07:19 2010
New Revision: 1037559

URL: http://svn.apache.org/viewvc?rev=1037559&view=rev
Log:
A modified patch from Anne Jessel "title-property should be titleProperty" (https://issues.apache.org/jira/browse/OFBIZ-4018) - OFBIZ-4018

Anne: some screen widgets set the field title-property instead of titleProperty. This causes errors in the logs, and means that the page title is not being set.
While preparing this patch, I discovered the labels referred to by some of these titleProperties were not available in Order component. However the missing ones were in Ecommerce. So I copied the missing ones to OrderUiLabels.xml.

JLR: instead of copying labels in OrderUiLabels.xml, I moved them to CommonUiLabels.xml: less and more consistent changes in the future.

Modified:
    ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml
    ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml
    ofbiz/trunk/framework/common/config/CommonUiLabels.xml
    ofbiz/trunk/specialpurpose/ecommerce/config/EcommerceUiLabels.xml

Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml?rev=1037559&r1=1037558&r2=1037559&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml Sun Nov 21 21:07:19 2010
@@ -89,7 +89,7 @@ under the License.
     <screen name="category">
         <section>
             <actions>
-                <set field="title-property" value="PageTitleCategoryPage"/>
+                <set field="titleProperty" value="PageTitleCategoryPage"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonOrderCatalogDecorator" location="component://order/widget/ordermgr/OrderEntryCommonScreens.xml">
@@ -138,7 +138,7 @@ under the License.
                 <set field="layoutSettings.javaScripts[]" value="/images/prototypejs/prototype.js" global="true"/>
                 <set field="layoutSettings.javaScripts[]" value="/images/prototypejs/popup.js" global="true"/>
                 <set field="layoutSettings.styleSheets[]" value="/images/prototypejs/popup.css" global="true"/>
-                <set field="title-property" value="PageTitleProductPage"/>
+                <set field="titleProperty" value="PageTitleProductPage"/>
                 <set field="configproductdetailScreen" value="component://order/widget/ordermgr/OrderEntryCatalogScreens.xml#configproductdetail"/>
                 <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Product.groovy"/>
             </actions>
@@ -208,7 +208,7 @@ under the License.
     <screen name="keywordsearch">
         <section>
             <actions>
-                <set field="title-property" value="PageTitleSearchResults"/>
+                <set field="titleProperty" value="PageTitleSearchResults"/>
                 <set field="productsummaryScreen" value="component://order/widget/ordermgr/OrderEntryCatalogScreens.xml#productsummary"/>
                 <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/KeywordSearch.groovy"/>
             </actions>
@@ -224,7 +224,7 @@ under the License.
     <screen name="advancedsearch">
         <section>
             <actions>
-                <set field="title-property" value="PageTitleAdvancedSearch"/>
+                <set field="titleProperty" value="PageTitleAdvancedSearch"/>
                 <set field="headerItem" value="Advanced Search"/>
                 <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/AdvancedSearchOptions.groovy"/>
 
@@ -247,7 +247,7 @@ under the License.
     <screen name="quickadd">
         <section>
             <actions>
-                <set field="title-property" value="PageTitleQuickAdd"/>
+                <set field="titleProperty" value="PageTitleQuickAdd"/>
                 <set field="quickaddsummaryScreen" value="component://order/widget/ordermgr/OrderEntryCatalogScreens.xml#quickaddsummary"/>
                 <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/QuickAdd.groovy"/>
             </actions>

Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml?rev=1037559&r1=1037558&r2=1037559&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml Sun Nov 21 21:07:19 2010
@@ -49,7 +49,7 @@ under the License.
         <section>
             <actions>
                 <set field="headerItem" value="orderentry"/>
-                <set field="title-property" value="PageTitleCheckoutOptions"/>
+                <set field="titleProperty" value="PageTitleCheckoutOptions"/>
                 <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutPayment.groovy"/>
                 <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutOptions.groovy"/>
                 <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/StorePaymentOptions.groovy"/>

Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.xml?rev=1037559&r1=1037558&r2=1037559&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonUiLabels.xml Sun Nov 21 21:07:19 2010
@@ -9386,6 +9386,41 @@
         <value xml:lang="zh">新建数据源类型</value>
         <value xml:lang="zh_CN">增加新数据源类型</value>
     </property>
+    <property key="PageTitleCategoryPage">
+        <value xml:lang="cs">kategorie strana</value>
+        <value xml:lang="da">Kategori side</value>
+        <value xml:lang="de">Kategorie Seite</value>
+        <value xml:lang="en">Category Page</value>
+        <value xml:lang="es">Página de Categoría</value>
+        <value xml:lang="fr">Page catégorie</value>
+        <value xml:lang="hi_IN">श्रेणी पृष्ठ</value>
+        <value xml:lang="it">Pagina categoria</value>
+        <value xml:lang="ja">カテゴリページ</value>
+        <value xml:lang="nl">Categorie pagina</value>
+        <value xml:lang="pt_BR">Página de categoria</value>
+        <value xml:lang="pt_PT">Página para Categoria</value>
+        <value xml:lang="ro">Pagina Categoria</value>
+        <value xml:lang="ru">Страница категории</value>
+        <value xml:lang="th">หน้าหมวดหมู่สินค้า</value>
+        <value xml:lang="zh">分类页面</value>
+    </property>
+    <property key="PageTitleCheckoutOptions">
+        <value xml:lang="cs">Možnosti objednání</value>
+        <value xml:lang="da">Muligheder for udcheckning</value>
+        <value xml:lang="de">Bestelloptionen</value>
+        <value xml:lang="en">Checkout Options</value>
+        <value xml:lang="es">Opciones De la Comprobación</value>
+        <value xml:lang="fr">Options de paiement</value>
+        <value xml:lang="it">Opzioni pagamento</value>
+        <value xml:lang="ja">チェックアウトオプション</value>
+        <value xml:lang="nl">Bestelopties</value>
+        <value xml:lang="pt_BR">Opções de pagamento</value>
+        <value xml:lang="pt_PT">Opções de Pagamento</value>
+        <value xml:lang="ro">Optiuni Checkout</value>
+        <value xml:lang="ru">Параметры подтверждения</value>
+        <value xml:lang="th">ออกจากการทำรายการนี้</value>
+        <value xml:lang="zh">结账选项</value>
+    </property>    
     <property key="PageTitleCommonGeoLocation">
         <value xml:lang="en">Geo Location of requested element</value>
         <value xml:lang="fr">Géolocalisation de l'élément demandé</value>
@@ -9499,6 +9534,42 @@
         <value xml:lang="th">หน้าหลัก</value>
         <value xml:lang="zh">首页</value>
     </property>
+    <property key="PageTitleProductPage">
+        <value xml:lang="cs">Výrobek - stránka</value>
+        <value xml:lang="da">Produktside</value>
+        <value xml:lang="de">Produkt Seite</value>
+        <value xml:lang="en">Product Page</value>
+        <value xml:lang="es">Página de Productos</value>
+        <value xml:lang="fr">Page des articles</value>
+        <value xml:lang="hi_IN">सामान पृष्ठ</value>
+        <value xml:lang="it">Pagina prodotto</value>
+        <value xml:lang="ja">Product Page</value>
+        <value xml:lang="nl">Product pagina</value>
+        <value xml:lang="pt_BR">Página de produto</value>
+        <value xml:lang="pt_PT">Página do Produto</value>
+        <value xml:lang="ro">Pagina Produs</value>
+        <value xml:lang="ru">Страница продукта</value>
+        <value xml:lang="th">หน้าสินค้า</value>
+        <value xml:lang="zh">产品页面</value>
+    </property>
+    <property key="PageTitleQuickAdd">
+        <value xml:lang="cs">Zrychlené zadání</value>
+        <value xml:lang="da">Tilføj hurtigt</value>
+        <value xml:lang="de">Schnelleingabe</value>
+        <value xml:lang="en">Quick Add</value>
+        <value xml:lang="es">Añadir Rápido</value>
+        <value xml:lang="fr">Ajout rapide</value>
+        <value xml:lang="hi_IN">जल्द जोड़ें</value>
+        <value xml:lang="it">Aggiunta veloce</value>
+        <value xml:lang="ja">Quick Add</value>
+        <value xml:lang="nl">Snel toevoegen</value>
+        <value xml:lang="pt_BR">Adição rápida</value>
+        <value xml:lang="pt_PT">Compra Expresso</value>
+        <value xml:lang="ro">Adaugare Rapida</value>
+        <value xml:lang="ru">Быстро добавить</value>
+        <value xml:lang="th">เพิ่มอย่างรวดเร็ว</value>
+        <value xml:lang="zh">快速添加</value>
+    </property>
     <property key="PageTitleViewBlocked">
         <value xml:lang="en">View Blocked</value>
         <value xml:lang="fr">Page bloquée</value>

Modified: ofbiz/trunk/specialpurpose/ecommerce/config/EcommerceUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/config/EcommerceUiLabels.xml?rev=1037559&r1=1037558&r2=1037559&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/config/EcommerceUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/config/EcommerceUiLabels.xml Sun Nov 21 21:07:19 2010
@@ -3701,24 +3701,6 @@
         <value xml:lang="th">ข้อมูลใบเสร็จรับเงิน</value>
         <value xml:lang="zh">账单信息</value>
     </property>
-    <property key="PageTitleCategoryPage">
-        <value xml:lang="cs">kategorie strana</value>
-        <value xml:lang="da">Kategori side</value>
-        <value xml:lang="de">Kategorie Seite</value>
-        <value xml:lang="en">Category Page</value>
-        <value xml:lang="es">Página de Categoría</value>
-        <value xml:lang="fr">Page catégorie</value>
-        <value xml:lang="hi_IN">श्रेणी पृष्ठ</value>
-        <value xml:lang="it">Pagina categoria</value>
-        <value xml:lang="ja">カテゴリページ</value>
-        <value xml:lang="nl">Categorie pagina</value>
-        <value xml:lang="pt_BR">Página de categoria</value>
-        <value xml:lang="pt_PT">Página para Categoria</value>
-        <value xml:lang="ro">Pagina Categoria</value>
-        <value xml:lang="ru">Страница категории</value>
-        <value xml:lang="th">หน้าหมวดหมู่สินค้า</value>
-        <value xml:lang="zh">分类页面</value>
-    </property>
     <property key="PageTitleChangePassword">
         <value xml:lang="cs">Změnit heslo</value>
         <value xml:lang="da">Skift kodeord</value>
@@ -3737,23 +3719,6 @@
         <value xml:lang="th">เปลี่ยนรหัสผ่าน</value>
         <value xml:lang="zh">修改密码</value>
     </property>
-    <property key="PageTitleCheckoutOptions">
-        <value xml:lang="cs">Možnosti objednání</value>
-        <value xml:lang="da">Muligheder for udcheckning</value>
-        <value xml:lang="de">Bestelloptionen</value>
-        <value xml:lang="en">Checkout Options</value>
-        <value xml:lang="es">Opciones De la Comprobación</value>
-        <value xml:lang="fr">Options de paiement</value>
-        <value xml:lang="it">Opzioni pagamento</value>
-        <value xml:lang="ja">チェックアウトオプション</value>
-        <value xml:lang="nl">Bestelopties</value>
-        <value xml:lang="pt_BR">Opções de pagamento</value>
-        <value xml:lang="pt_PT">Opções de Pagamento</value>
-        <value xml:lang="ro">Optiuni Checkout</value>
-        <value xml:lang="ru">Параметры подтверждения</value>
-        <value xml:lang="th">ออกจากการทำรายการนี้</value>
-        <value xml:lang="zh">结账选项</value>
-    </property>
     <property key="PageTitleCheckoutReview">
         <value xml:lang="cs">Ověřování objednávky</value>
         <value xml:lang="da">Gennemse udcheckning</value>
@@ -4223,24 +4188,6 @@
         <value xml:lang="th">สรุปการสั่งซื้อสินค้า - ขอบคุณสำหรับการทำรายการสั่งซื้อสินค้า!</value>
         <value xml:lang="zh">订单摘要 - 谢谢你的惠顾！</value>
     </property>
-    <property key="PageTitleProductPage">
-        <value xml:lang="cs">Výrobek - stránka</value>
-        <value xml:lang="da">Produktside</value>
-        <value xml:lang="de">Produkt Seite</value>
-        <value xml:lang="en">Product Page</value>
-        <value xml:lang="es">Página de Productos</value>
-        <value xml:lang="fr">Page des articles</value>
-        <value xml:lang="hi_IN">सामान पृष्ठ</value>
-        <value xml:lang="it">Pagina prodotto</value>
-        <value xml:lang="ja">Product Page</value>
-        <value xml:lang="nl">Product pagina</value>
-        <value xml:lang="pt_BR">Página de produto</value>
-        <value xml:lang="pt_PT">Página do Produto</value>
-        <value xml:lang="ro">Pagina Produs</value>
-        <value xml:lang="ru">Страница продукта</value>
-        <value xml:lang="th">หน้าสินค้า</value>
-        <value xml:lang="zh">产品页面</value>
-    </property>
     <property key="PageTitleProductReview">
         <value xml:lang="cs">Výrobek - přehled</value>
         <value xml:lang="da">Produktgennemgang</value>
@@ -4273,24 +4220,6 @@
         <value xml:lang="th">สำรวจประวัติ</value>
         <value xml:lang="zh">简介调查</value>
     </property>
-    <property key="PageTitleQuickAdd">
-        <value xml:lang="cs">Zrychlené zadání</value>
-        <value xml:lang="da">Tilføj hurtigt</value>
-        <value xml:lang="de">Schnelleingabe</value>
-        <value xml:lang="en">Quick Add</value>
-        <value xml:lang="es">Añadir Rápido</value>
-        <value xml:lang="fr">Ajout rapide</value>
-        <value xml:lang="hi_IN">जल्द जोड़ें</value>
-        <value xml:lang="it">Aggiunta veloce</value>
-        <value xml:lang="ja">Quick Add</value>
-        <value xml:lang="nl">Snel toevoegen</value>
-        <value xml:lang="pt_BR">Adição rápida</value>
-        <value xml:lang="pt_PT">Compra Expresso</value>
-        <value xml:lang="ro">Adaugare Rapida</value>
-        <value xml:lang="ru">Быстро добавить</value>
-        <value xml:lang="th">เพิ่มอย่างรวดเร็ว</value>
-        <value xml:lang="zh">快速添加</value>
-    </property>
     <property key="PageTitleRequestReturn">
         <value xml:lang="cs">Odpověď na poptávku</value>
         <value xml:lang="da">Anmod om returnering</value>


Free forum by Nabble Edit this page