OFBiz › OFBiz - Commits

svn commit: r1037562 - in /ofbiz/branches/release10.04: ./ applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml applications/order/widget/ordermgr/OrderEntryOrderScreens.xml framework/common/config/CommonUiLabels.xml

‹ 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: r1037562 - in /ofbiz/branches/release10.04: ./ applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml applications/order/widget/ordermgr/OrderEntryOrderScreens.xml framework/common/config/CommonUiLabels.xml

jleroux@apache.org
Author: jleroux
Date: Sun Nov 21 21:17:02 2010
New Revision: 1037562

URL: http://svn.apache.org/viewvc?rev=1037562&view=rev
Log:
"Applied fix from trunk for revision: 1037559"
------------------------------------------------------------------------
r1037559 | jleroux | 2010-11-21 22:07:19 +0100 (dim., 21 nov. 2010) | 6 lines

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/branches/release10.04/   (props changed)
    ofbiz/branches/release10.04/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml
    ofbiz/branches/release10.04/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml
    ofbiz/branches/release10.04/framework/common/config/CommonUiLabels.xml

Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 21 21:17:02 2010
@@ -1,3 +1,3 @@
 /ofbiz/branches/addbirt:831210-885099,885686-886087
 /ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,940851,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960143,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985298,985473,985718,985856,985902,987841,989166,990127,990339,990
 539,991485,993344,993387,995384,995686,996069,996078-996079,996563,997418-997420,997423-997425,997431,997440,997526,997990,998061,998412,998557,1000621,1000725,1000998,1001099,1001131,1001185,1001574,1001849,1001962,1002963,1003434,1003450,1003829,1004139,1027756,1027960,1028053,1028625,1028627,1029600,1030016,1030385,1030390,1033928,1033953,1034138,1034179,1035080,1035084,1036426,1036669,1037507
+/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,940851,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960143,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985298,985473,985718,985856,985902,987841,989166,990127,990339,990
 539,991485,993344,993387,995384,995686,996069,996078-996079,996563,997418-997420,997423-997425,997431,997440,997526,997990,998061,998412,998557,1000621,1000725,1000998,1001099,1001131,1001185,1001574,1001849,1001962,1002963,1003434,1003450,1003829,1004139,1027756,1027960,1028053,1028625,1028627,1029600,1030016,1030385,1030390,1033928,1033953,1034138,1034179,1035080,1035084,1036426,1036669,1037507,1037559

Modified: ofbiz/branches/release10.04/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml?rev=1037562&r1=1037561&r2=1037562&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml (original)
+++ ofbiz/branches/release10.04/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml Sun Nov 21 21:17:02 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/branches/release10.04/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml?rev=1037562&r1=1037561&r2=1037562&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml (original)
+++ ofbiz/branches/release10.04/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml Sun Nov 21 21:17:02 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/branches/release10.04/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/common/config/CommonUiLabels.xml?rev=1037562&r1=1037561&r2=1037562&view=diff
==============================================================================
--- ofbiz/branches/release10.04/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/branches/release10.04/framework/common/config/CommonUiLabels.xml Sun Nov 21 21:17:02 2010
@@ -9260,6 +9260,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>
@@ -9364,6 +9399,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>


Free forum by Nabble Edit this page