svn commit: r755366 - in /ofbiz/trunk/applications: content/config/ content/webapp/content/survey/ content/widget/forum/ humanres/config/ manufacturing/config/ order/config/ order/src/org/ofbiz/order/shop
Locked
svn commit: r755366 - in /ofbiz/trunk/applications: content/config/ content/webapp/content/survey/ content/widget/forum/ humanres/config/ manufacturing/config/ order/config/ order/src/org/ofbiz/order/shop
 
|
Author: mrisaliti
Date: Tue Mar 17 19:44:17 2009 New Revision: 755366 URL: http://svn.apache.org/viewvc?rev=755366&view=rev Log: A lot of hardcoded labels cleaning and changes some wrong references Modified: ofbiz/trunk/applications/content/config/ContentUiLabels.xml ofbiz/trunk/applications/content/webapp/content/survey/SurveyForms.xml ofbiz/trunk/applications/content/widget/forum/ForumForms.xml ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java ofbiz/trunk/applications/party/config/PartyUiLabels.xml ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml ofbiz/trunk/applications/product/config/ProductErrorUiLabels.xml ofbiz/trunk/applications/product/config/ProductUiLabels.xml ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductWorker.java ofbiz/trunk/applications/product/webapp/catalog/category/CategoryForms.xml ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml Modified: ofbiz/trunk/applications/content/config/ContentUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/config/ContentUiLabels.xml?rev=755366&r1=755365&r2=755366&view=diff ============================================================================== --- ofbiz/trunk/applications/content/config/ContentUiLabels.xml (original) +++ ofbiz/trunk/applications/content/config/ContentUiLabels.xml Tue Mar 17 19:44:17 2009 @@ -670,6 +670,10 @@ <value xml:lang="th">à¹à¸à¸´à¹à¸¡à¸à¸§à¸²à¸¡à¸à¸´à¸à¹à¸«à¹à¸à¸à¸¶à¸</value> <value xml:lang="zh">æ论åæ·»å å°</value> </property> + <property key="ContentForumDescriptionThread"> + <value xml:lang="en">Thread description</value> + <value xml:lang="it">Descrizione discussione</value> + </property> <property key="ContentForumGroupCreate"> <value xml:lang="ar">إستØداث ٠ج٠Ùعة Ù Ùتد٠جدÙد</value> <value xml:lang="de">Neue Forumsgruppe erstellen</value> Modified: ofbiz/trunk/applications/content/webapp/content/survey/SurveyForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/survey/SurveyForms.xml?rev=755366&r1=755365&r2=755366&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/survey/SurveyForms.xml (original) +++ ofbiz/trunk/applications/content/webapp/content/survey/SurveyForms.xml Tue Mar 17 19:44:17 2009 @@ -164,14 +164,13 @@ <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> + <!-- UNUSED FORM <form name="ListSurveyQuestions" type="list" target="updateSurveyQuestion" title="" list-name="surveyQuestionList" list-entry-name="surveyQuestion" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <auto-fields-service service-name="updateSurveyQuestion" map-name="surveyQuestion"/> <field name="surveyId"><hidden/></field> <field name="surveyQuestionSeqId" title="${uiLabelMap.ContentSurveyQuestionNumber}"><display/></field> - - <!-- <field name="surveyQuestionTypeId" title="Question Type"><display description="${surveyQuestionType.description}"/></field> --> <field name="surveyQuestionTypeId"> <drop-down allow-empty="false"> <entity-options entity-name="SurveyQuestionType" description="${description}"/> @@ -180,6 +179,8 @@ <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> + --> + <form name="CreateSurveyQuestion" type="single" target="createSurveyQuestion" title="" default-map-name="surveyQuestion" header-row-style="header-row" default-table-style="basic-table"> <alt-target use-when="surveyQuestion!=null" target="updateSurveyQuestion"/> Modified: ofbiz/trunk/applications/content/widget/forum/ForumForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/forum/ForumForms.xml?rev=755366&r1=755365&r2=755366&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/forum/ForumForms.xml (original) +++ ofbiz/trunk/applications/content/widget/forum/ForumForms.xml Tue Mar 17 19:44:17 2009 @@ -192,7 +192,7 @@ <field name="forumId"><hidden value="${parameters.forumId}"/></field> <field name="rsp.contentId" parameter-name="contentId"><hidden/></field> <field name="rsp.contentName" parameter-name="contentName"><hidden/></field> - <field name="rsp.description" parameter-name="description"><text/></field> + <field name="rsp.description" title="${uiLabelMap.ContentForumDescriptionThread}" parameter-name="description"><text/></field> <field name="rsp.contentTypeId" parameter-name="contentTypeId"><hidden/></field> <field name="rsp.ownerContentId" parameter-name="ownerContentId"><hidden/></field> <field name="rsp.caFromDate" parameter-name="fromDate"><hidden/></field> @@ -200,7 +200,7 @@ <field name="rsp.caContentIdTo" parameter-name="caContentIdTo"><hidden/></field> <field name="rsp.caContentAssocTypeId" parameter-name="caContentAssocTypeId"><hidden/></field> <field name="dataResourceTypeId"><hidden value="ELECTRONIC_TEXT"/></field> - <field name="textData"><textarea rows="8"/></field> + <field name="textData" title="${uiLabelMap.FormFieldTitle_textDataTitle}"><textarea rows="8"/></field> <field name="updateButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> </form> </forms> \ No newline at end of file Modified: ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml?rev=755366&r1=755365&r2=755366&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml (original) +++ ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml Tue Mar 17 19:44:17 2009 @@ -296,6 +296,10 @@ <value xml:lang="th">à¸à¹à¸²à¸¢à¸£à¸«à¸±à¸ªà¸à¸£à¸°à¹à¸ à¸à¸ªà¸à¸²à¸à¸°à¸à¹à¸à¸¡à¸¹à¸¥à¸à¸¶à¸</value> <value xml:lang="zh">åå²èªæ°´å»åï¼è§è²ï¼</value> </property> + <property key="FormFieldTitle_perfRatingTypeId"> + <value xml:lang="en">Perf Rating Type Id</value> + <value xml:lang="it">Tipo percentuale prestazioni</value> + </property> <property key="FormFieldTitle_perfReviewId"> <value xml:lang="en">Perf Review Id</value> <value xml:lang="fr">Réf. d'évaluation des performances</value> @@ -303,6 +307,14 @@ <value xml:lang="th">Perf Review Id</value> <value xml:lang="zh">绩æè¯å®ç¼å·</value> </property> + <property key="FormFieldTitle_perfReviewItemSeqId"> + <value xml:lang="en">Perf Review Item Seq Id</value> + <value xml:lang="it">Riga rassegna prestazioni</value> + </property> + <property key="FormFieldTitle_perfReviewItemTypeId"> + <value xml:lang="en">Perf Review Item Type Id</value> + <value xml:lang="it">Tipo riga rassegna prestazioni</value> + </property> <property key="FormFieldTitle_position"> <value xml:lang="en">Position</value> <value xml:lang="it">Posizione</value> Modified: ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml?rev=755366&r1=755365&r2=755366&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml (original) +++ ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml Tue Mar 17 19:44:17 2009 @@ -70,6 +70,10 @@ <value xml:lang="th">รหัสà¸à¸£à¸°à¹à¸ à¸à¸à¸±à¸à¸à¸µà¸à¹à¸²à¹à¸à¹à¸à¹à¸²à¸¢ GI</value> <value xml:lang="zh">è´¹ç¨æ»è´¦è´¦æ·ç±»åæ è¯</value> </property> + <property key="FormFieldTitle_creationDate"> + <value xml:lang="en">Creation Date</value> + <value xml:lang="it">Data creazione</value> + </property> <property key="FormFieldTitle_defaultYearsOffset"> <value xml:lang="de">Kontenart für Kosten</value> <value xml:lang="en">Default Years Offset</value> Modified: ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml?rev=755366&r1=755365&r2=755366&view=diff ============================================================================== --- ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml (original) +++ ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml Tue Mar 17 19:44:17 2009 @@ -2811,6 +2811,14 @@ <value xml:lang="th">à¹à¸à¸´à¹à¸¡ ${totalQuantity} รายà¸à¸²à¸£à¸¥à¸à¸à¸£à¸°à¸à¸£à¹à¸²</value> <value xml:lang="zh">æ ${totalQuantity} æç»æ·»å å°è´ç©è½¦ã</value> </property> + <property key="cart.addToCart.rental.endDate"> + <value xml:lang="en">Problems parsing Reservation end string.</value> + <value xml:lang="it">Problema durante il parsing della stringa reservation end</value> + </property> + <property key="cart.addToCart.rental.startDate"> + <value xml:lang="en">Problems parsing Reservation start string.</value> + <value xml:lang="it">Problema durante il parsing della stringa reservation start</value> + </property> <property key="cart.agreement_not_specified_to_add_from"> <value xml:lang="de">Kein Vertrag angegeben, aus dem hinzugefügt werden kann.</value> <value xml:lang="en">No agreement specified to add from.</value> @@ -2829,6 +2837,10 @@ <value xml:lang="fr">La quantité doit être un nombre positif</value> <value xml:lang="it">Importo deve essere un numero positivo</value> </property> + <property key="cart.cart_is_in_read_only_mode"> + <value xml:lang="en">Cart is in read only mode</value> + <value xml:lang="it">Carrello è in modalità sola lettura</value> + </property> <property key="cart.category_not_specified_to_add_from"> <value xml:lang="de">Keine Kategorie angegeben, aus der hinzugefügt werden kann.</value> <value xml:lang="en">No category specified to add from.</value> Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java?rev=755366&r1=755365&r2=755366&view=diff ============================================================================== --- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java (original) +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java Tue Mar 17 19:44:17 2009 @@ -124,21 +124,21 @@ pProductId = parentProductId; // price sanity check if (productId == null && price != null && price.compareTo(BigDecimal.ZERO) < 0) { - String errMsg = UtilProperties.getMessage(resource, "cart.price_not_positive_number", this.cart.getLocale()); + String errMsg = UtilProperties.getMessage(resource_error, "cart.price_not_positive_number", this.cart.getLocale()); result = ServiceUtil.returnError(errMsg); return result; } // quantity sanity check if (quantity.compareTo(BigDecimal.ONE) < 0) { - String errMsg = UtilProperties.getMessage(resource, "cart.quantity_not_positive_number", this.cart.getLocale()); + String errMsg = UtilProperties.getMessage(resource_error, "cart.quantity_not_positive_number", this.cart.getLocale()); result = ServiceUtil.returnError(errMsg); return result; } // amount sanity check if (amount != null && amount.compareTo(BigDecimal.ZERO) < 0) { - String errMsg = UtilProperties.getMessage(resource, "cart.amount_not_positive_number", this.cart.getLocale()); + String errMsg = UtilProperties.getMessage(resource_error, "cart.amount_not_positive_number", this.cart.getLocale()); result = ServiceUtil.returnError(errMsg); return result; } @@ -248,7 +248,7 @@ } } catch (CartItemModifyException e) { if (cart.getOrderType().equals("PURCHASE_ORDER")) { - String errMsg = UtilProperties.getMessage(resource, "cart.product_not_valid_for_supplier", this.cart.getLocale()); + String errMsg = UtilProperties.getMessage(resource_error, "cart.product_not_valid_for_supplier", this.cart.getLocale()); errMsg = errMsg + " (" + e.getMessage() + ")"; result = ServiceUtil.returnError(errMsg); } else { @@ -271,7 +271,7 @@ String errMsg = null; if (orderId == null || orderId.length() <= 0) { - errMsg = UtilProperties.getMessage(resource,"cart.order_not_specified_to_add_from", this.cart.getLocale()); + errMsg = UtilProperties.getMessage(resource_error,"cart.order_not_specified_to_add_from", this.cart.getLocale()); result = ServiceUtil.returnError(errMsg); return result; } @@ -530,7 +530,7 @@ String errMsg = null; if (categoryId == null || categoryId.length() <= 0) { - errMsg = UtilProperties.getMessage(resource,"cart.category_not_specified_to_add_from", this.cart.getLocale()); + errMsg = UtilProperties.getMessage(resource_error,"cart.category_not_specified_to_add_from", this.cart.getLocale()); result = ServiceUtil.returnError(errMsg); return result; } @@ -543,14 +543,14 @@ Debug.logWarning(e.toString(), module); Map messageMap = UtilMisc.toMap("categoryId", categoryId); messageMap.put("message", e.getMessage()); - errMsg = UtilProperties.getMessage(resource,"cart.could_not_get_products_in_category_cart", messageMap, this.cart.getLocale()); + errMsg = UtilProperties.getMessage(resource_error,"cart.could_not_get_products_in_category_cart", messageMap, this.cart.getLocale()); result = ServiceUtil.returnError(errMsg); return result; } if (prodCatMemberCol == null) { Map messageMap = UtilMisc.toMap("categoryId", categoryId); - errMsg = UtilProperties.getMessage(resource,"cart.could_not_get_products_in_category", messageMap, this.cart.getLocale()); + errMsg = UtilProperties.getMessage(resource_error,"cart.could_not_get_products_in_category", messageMap, this.cart.getLocale()); result = ServiceUtil.returnError(errMsg); return result; } @@ -639,7 +639,7 @@ BigDecimal oldPrice = BigDecimal.ONE.negate(); if (this.cart.isReadOnlyCart()) { - String errMsg = UtilProperties.getMessage(resource, "cart.cart_is_in_read_only_mode", this.cart.getLocale()); + String errMsg = UtilProperties.getMessage(resource_error, "cart.cart_is_in_read_only_mode", this.cart.getLocale()); errorMsgs.add(errMsg); result = ServiceUtil.returnError(errorMsgs); return result; @@ -714,7 +714,7 @@ if (item != null && quantString.length() > 0) { BigDecimal amount = new BigDecimal(quantString); if (amount.compareTo(BigDecimal.ZERO) <= 0) { - String errMsg = UtilProperties.getMessage(resource, "cart.amount_not_positive_number", this.cart.getLocale()); + String errMsg = UtilProperties.getMessage(resource_error, "cart.amount_not_positive_number", this.cart.getLocale()); errorMsgs.add(errMsg); result = ServiceUtil.returnError(errorMsgs); return result; @@ -728,7 +728,7 @@ } else { quantity = new BigDecimal(nf.parse(quantString).doubleValue()); if (quantity.compareTo(BigDecimal.ZERO) < 0) { - String errMsg = UtilProperties.getMessage(resource, "cart.quantity_not_positive_number", this.cart.getLocale()); + String errMsg = UtilProperties.getMessage(resource_error, "cart.quantity_not_positive_number", this.cart.getLocale()); errorMsgs.add(errMsg); result = ServiceUtil.returnError(errorMsgs); return result; @@ -764,7 +764,7 @@ item.setName(item.getProduct().getString("internalName")); } else { // in this case, the user wanted to purchase a quantity which is not available (probably below minimum) - String errMsg = UtilProperties.getMessage(resource, "cart.product_not_valid_for_supplier", this.cart.getLocale()); + String errMsg = UtilProperties.getMessage(resource_error, "cart.product_not_valid_for_supplier", this.cart.getLocale()); errMsg = errMsg + " (" + item.getProductId() + ", " + quantity + ", " + cart.getCurrency() + ")"; errorMsgs.add(errMsg); } Modified: ofbiz/trunk/applications/party/config/PartyUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/config/PartyUiLabels.xml?rev=755366&r1=755365&r2=755366&view=diff ============================================================================== --- ofbiz/trunk/applications/party/config/PartyUiLabels.xml (original) +++ ofbiz/trunk/applications/party/config/PartyUiLabels.xml Tue Mar 17 19:44:17 2009 @@ -974,6 +974,10 @@ <value xml:lang="en">Rate Default Amount</value> <value xml:lang="it">Importo percentuale di default</value> </property> + <property key="FormFieldTitle_requirePasswordChange"> + <value xml:lang="en">Require Password Change</value> + <value xml:lang="it">Richiesto cambio password</value> + </property> <property key="FormFieldTitle_residenceStatusEnumId"> <value xml:lang="de">Wohnsitzstatus Aufzählung ID</value> <value xml:lang="en">Residence Status Enum Id</value> Modified: ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml?rev=755366&r1=755365&r2=755366&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml Tue Mar 17 19:44:17 2009 @@ -668,8 +668,8 @@ <field name="donePage"><hidden value="${donePage}"/></field> <field name="communicationEventId"><hidden value="${parameters.communicationEventId}"/></field> <field name="delContentDataResource"><hidden value="Y"/></field> - <field name="dummy1" position="1"><display/></field> - <field name="dummy2" position="2"><display/></field> + <field name="dummy1" title="${uiLabelMap.CommonEmptyHeader}" position="1"><display/></field> + <field name="dummy2" title="${uiLabelMap.CommonEmptyHeader}" position="2"><display/></field> <field name="deleteEmail" widget-style="smallSubmit" position="3"><submit/></field> </form> <form name="EditRequestFromCommEvent" type="single" target="createRequestFromCommEvent" default-map-name="communicationEvent"> Modified: ofbiz/trunk/applications/product/config/ProductErrorUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductErrorUiLabels.xml?rev=755366&r1=755365&r2=755366&view=diff ============================================================================== --- ofbiz/trunk/applications/product/config/ProductErrorUiLabels.xml (original) +++ ofbiz/trunk/applications/product/config/ProductErrorUiLabels.xml Tue Mar 17 19:44:17 2009 @@ -638,6 +638,10 @@ <value xml:lang="th">à¸à¸à¸£à¸²à¸¢à¸à¸²à¸£à¸à¸²à¸£à¹à¸¥à¸·à¸à¸à¸¥à¸±à¸à¸©à¸à¸°à¸ªà¸´à¸à¸à¹à¸²à¸§à¹à¸²à¸</value> <value xml:lang="zh">æ¾å°äºç©ºçå¯éæ©ç¹å¾å表ã</value> </property> + <property key="productservices.entity_error_quick_add_variant_data"> + <value xml:lang="en">Entity error quick add variant data</value> + <value xml:lang="it">Errore durante la lettura dei dati per l'aggiunta variante veloce.</value> + </property> <property key="productservices.error_finding_associated_variant_with_ID_error"> <value xml:lang="de">Fehler bei zugeordneter Variante mit ID ${productIdTo}, Fehler war: ${errMessage}.</value> <value xml:lang="en">Error finding associated variant with ID ${productIdTo}, error was: ${errMessage}.</value> @@ -748,6 +752,10 @@ <value xml:lang="th">à¸à¸±à¸à¸«à¸²à¸à¸²à¸£à¸à¹à¸²à¸à¹à¸à¸à¸à¸´à¸à¸µà¸ªà¸´à¸à¸à¹à¸²: ${errMessage}.</value> <value xml:lang="zh">读å产åå®ä½æ¶åºç°é®é¢ï¼${errMessage}ã</value> </property> + <property key="productservices.product_not_found_with_ID"> + <value xml:lang="en">Product not found with ID</value> + <value xml:lang="it">Prodotto non trovato per codice</value> + </property>> <property key="productutilservices.did_not_find_any_valid_variants_for_virtual_ID"> <value xml:lang="de">Keine gültigen Varianten gefunden für virtuelles Produkt mit der ID [${productId}], keinen Merge durchgeführt...</value> <value xml:lang="en">Did not find any valid variants for virtual ID [${productId}], not doing merge...</value> @@ -847,6 +855,10 @@ <value xml:lang="th">à¸à¸à¸¡à¸²à¸à¸à¸§à¹à¸²à¸«à¸à¸¶à¹à¸à¸à¸²à¸£à¹à¸à¸¥à¸µà¹à¸¢à¸à¹à¸à¸¥à¸à¸ªà¸³à¸«à¸£à¸±à¸à¸£à¸«à¸±à¸ªà¹à¸à¸·à¸à¸à¸à¸±à¹à¸à¸«à¸¡à¸ [${productId}], à¹à¸¡à¹à¸à¸³à¸£à¸§à¸¡à¹à¸à¹à¸²à¸à¹à¸§à¸¢à¸à¸±à¸...</value> <value xml:lang="zh">æ¾å°äºä¸ä¸ªä»¥ä¸èæ产åæ è¯ä¸º [${productId}]ææååï¼æ²¡æåå并...</value> </property> + <property key="productworker.null_product_entity_not_valid"> + <value xml:lang="en">Null Product entity not valid</value> + <value xml:lang="it">Entità Product nulla non valida</value> + </property> <property key="variantevents.entity_error_quick_add_variant_data"> <value xml:lang="de">Entitätenfehler beim raschen Hinzufügen Variantendaten: ${errMessage}.</value> <value xml:lang="en">Entity error quick add variant data: ${errMessage}.</value> Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=755366&r1=755365&r2=755366&view=diff ============================================================================== --- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original) +++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Tue Mar 17 19:44:17 2009 @@ -9033,6 +9033,10 @@ <value xml:lang="th">สำหรัà¸à¸«à¸à¹à¸²à¸à¸à¹à¸à¹à¸à¸¥à¹à¸à¸·à¹à¸ ๠à¹à¸à¹à¹à¸«à¸¡à¸·à¸à¸à¸à¸²à¸à¸ªà¸´à¹à¸</value> <value xml:lang="zh">ä¸ºå ¶å®æ件ä¸çå±å¹ä½¿ç¨ç±»ä¼¼äº</value> </property> + <property key="ProductDetailSubScreenTooltip"> + <value xml:lang="en">example: component://ecommerce/widget/CatalogScreens.xml#categorydetail</value> + <value xml:lang="it">esempio: component://ecommerce/widget/CatalogScreens.xml#categorydetail</value> + </property> <property key="ProductDifferentCurrencies"> <value xml:lang="en">Items with different currencies</value> <value xml:lang="fr">Articles utilisant différentes devises</value> @@ -10876,6 +10880,10 @@ <value xml:lang="th">à¸à¹à¸²à¹à¸¡à¹à¸£à¸°à¸à¸¸à¸à¹à¸²à¹à¸£à¸´à¹à¸¡à¸à¹à¸à¸à¸¶à¸</value> <value xml:lang="zh">å¦æ没ææå®ç¼ºçå¼å°</value> </property> + <property key="ProductImageUrlTooltip"> + <value xml:lang="en">example: /images/categories/linkOne/100.jpg</value> + <value xml:lang="it">esempio: /images/categories/linkOne/100.jpg</value> + </property> <property key="ProductInInventory"> <value xml:lang="de">Am Lager</value> <value xml:lang="en">In Inventory</value> Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java?rev=755366&r1=755365&r2=755366&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java Tue Mar 17 19:44:17 2009 @@ -443,7 +443,7 @@ product = delegator.findByPrimaryKeyCache("Product", UtilMisc.toMap("productId", productId)); } catch (GenericEntityException e) { Map<String, String> messageMap = UtilMisc.toMap("errMessage", e.getMessage()); - errMsg = UtilProperties.getMessage(resource,"productservices.productservices.problems_reading_product_entity", messageMap, locale); + errMsg = UtilProperties.getMessage(resource,"productservices.problems_reading_product_entity", messageMap, locale); result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_ERROR); result.put(ModelService.ERROR_MESSAGE, errMsg); return result; Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductWorker.java?rev=755366&r1=755365&r2=755366&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductWorker.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductWorker.java Tue Mar 17 19:44:17 2009 @@ -65,7 +65,7 @@ } public static boolean shippingApplies(GenericValue product) { - String errMsg = null; + String errMsg = ""; if (product != null) { String productTypeId = product.getString("productTypeId"); if ("SERVICE".equals(productTypeId) || (ProductWorker.isDigital(product) && !ProductWorker.isPhysical(product))) { @@ -80,10 +80,8 @@ return chargeShipping.booleanValue(); } } else { - // todo: Hier noch Uebersetzungen einfuegen? - //errMsg = UtilProperties.getMessage(resource,"productworker.null_product_entity_not_valid", UtilHttp.getLocale(request)); throw new IllegalArgumentException(errMsg); - } + } } public static boolean isBillableToAddress(GenericValue product, GenericValue postalAddress) { @@ -137,8 +135,8 @@ } public static boolean taxApplies(GenericValue product) { - String errMsg = null; - if (product != null) { + String errMsg = ""; + if (product != null) { Boolean taxable = product.getBoolean("taxable"); if (taxable == null) { @@ -147,11 +145,9 @@ return taxable.booleanValue(); } } else { - // todo: Hier noch Uebersetzungen einfuegen? - //errMsg = UtilProperties.getMessage(resource,"productworker.null_product_entity_not_valid", UtilHttp.getLocale(request)); throw new IllegalArgumentException(errMsg); } - } + } /** @deprecated */ public static void getProduct(PageContext pageContext, String attributeName, String productId) { Modified: ofbiz/trunk/applications/product/webapp/catalog/category/CategoryForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/CategoryForms.xml?rev=755366&r1=755365&r2=755366&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/category/CategoryForms.xml (original) +++ ofbiz/trunk/applications/product/webapp/catalog/category/CategoryForms.xml Tue Mar 17 19:44:17 2009 @@ -173,7 +173,7 @@ <field use-when="productCategoryLink == null" name="fromDate" title="${uiLabelMap.CommonFromDate}"><date-time/></field> <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-time/></field> <field name="sequenceNum" title="${uiLabelMap.CommonSequence}"><text maxlength="5" size="5"/></field> - <field name="imageUrl" tooltip="example: /images/categories/linkOne/100.jpg"><text size="60" maxlength="255"/></field> + <field name="imageUrl" tooltip="${uiLabelMap.ProductImageUrlTooltip}"><text size="60" maxlength="255"/></field> <field name="linkTypeEnumId" title="${uiLabelMap.ProductLinkTypeEnumId}"> <drop-down allow-empty = "false"> <entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId"> @@ -186,7 +186,7 @@ </entity-options> </drop-down> </field> - <field name="detailSubScreen" tooltip="example: component://ecommerce/widget/CatalogScreens.xml#categorydetail"><text size="60" maxlength="255"/></field> + <field name="detailSubScreen" tooltip="${uiLabelMap.ProductDetailSubScreenTooltip}"><text size="60" maxlength="255"/></field> <field name="submitButton" use-when="productCategoryLink==null" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field> <field name="submitButton" use-when="productCategoryLink!=null" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> <field name="clearFormButton" title="${uiLabelMap.CommonEmptyHeader}" use-when="productCategoryLink!=null"><hyperlink target="EditProductCategoryLinks?productCategoryId=${productCategoryId}" target-type="intra-app" description="${uiLabelMap.CommonClear}"/></field> Modified: ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml?rev=755366&r1=755365&r2=755366&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml (original) +++ ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml Tue Mar 17 19:44:17 2009 @@ -836,10 +836,10 @@ <field name="shipmentMethodTypeId"> <display description="${estimate.shipmentMethodTypeId} (${estimate.carrierPartyId})"/> </field> - <field name="geoIdFrom"> + <field name="geoIdFrom" title="${uiLabelMap.ProductFromGeo}"> <display-entity entity-name="Geo" key-field-name="geoId" description="${geoName} [${geoId}]"/> </field> - <field name="geoIdTo"> + <field name="geoIdTo" title="${uiLabelMap.ProductToGeo}"> <display-entity entity-name="Geo" key-field-name="geoId" description="${geoName} [${geoId}]"/> </field> <field name="partyId"><display/></field> Modified: ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml?rev=755366&r1=755365&r2=755366&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml (original) +++ ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml Tue Mar 17 19:44:17 2009 @@ -2609,23 +2609,51 @@ <value xml:lang="it">Formato priorità non è corretto</value> <value xml:lang="th">รูà¸à¹à¸à¸à¸ªà¸´à¸à¸à¸´à¸à¸´à¹à¸¨à¸©à¹à¸¡à¹à¸à¸¹à¸à¸à¹à¸à¸</value> </property> - <property key="WorkEffortPriorityHigh"> - <value xml:lang="en">High</value> - <value xml:lang="fr">Haute</value> - <value xml:lang="it">Alta</value> - <value xml:lang="nl">High</value> - <value xml:lang="ro">Inalta</value> - <value xml:lang="th">สูà¸</value> - <value xml:lang="zh">é«</value> - </property> - <property key="WorkEffortPriorityLow"> - <value xml:lang="en">Low</value> - <value xml:lang="fr">Basse</value> - <value xml:lang="it">Bassa</value> - <value xml:lang="nl">Low</value> - <value xml:lang="ro">Joasa</value> - <value xml:lang="th">à¸à¹à¸³</value> - <value xml:lang="zh">ä½</value> + <property key="WorkEffortPriorityOne"> + <value xml:lang="en">1 (High)</value> + <value xml:lang="fr">1 (Haute)</value> + <value xml:lang="it">1 (Alta)</value> + <value xml:lang="nl">1 (High)</value> + <value xml:lang="ro">1 (Inalta)</value> + <value xml:lang="th">1 (สูà¸)</value> + <value xml:lang="zh">1 (é«)</value> + </property> + <property key="WorkEffortPriorityTwo"> + <value xml:lang="en">2</value> + <value xml:lang="it">2</value> + </property> + <property key="WorkEffortPriorityThree"> + <value xml:lang="en">3</value> + <value xml:lang="it">3</value> + </property> + <property key="WorkEffortPriorityFour"> + <value xml:lang="en">4</value> + <value xml:lang="it">4</value> + </property> + <property key="WorkEffortPriorityFive"> + <value xml:lang="en">5</value> + <value xml:lang="it">5</value> + </property> + <property key="WorkEffortPrioritySix"> + <value xml:lang="en">6</value> + <value xml:lang="it">6</value> + </property> + <property key="WorkEffortPrioritySeventh"> + <value xml:lang="en">7</value> + <value xml:lang="it">7</value> + </property> + <property key="WorkEffortPriorityEight"> + <value xml:lang="en">8</value> + <value xml:lang="it">8</value> + </property> + <property key="WorkEffortPriorityNine"> + <value xml:lang="en">9 (Low)</value> + <value xml:lang="fr">9 (Basse)</value> + <value xml:lang="it">9 (Bassa)</value> + <value xml:lang="nl">9 (Low)</value> + <value xml:lang="ro">9 (Joasa)</value> + <value xml:lang="th">9 (à¸à¹à¸³)</value> + <value xml:lang="zh">9 (ä½)</value> </property> <property key="WorkEffortPrivatePublic"> <value xml:lang="en">Private/Public</value> Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml?rev=755366&r1=755365&r2=755366&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml Tue Mar 17 19:44:17 2009 @@ -93,8 +93,15 @@ <field name="priority" position="1"> <drop-down allow-empty="true"> - <option key="1" description="1 (${uiLabelMap.WorkEffortPriorityHigh})"/><option key="2"/><option key="3"/><option key="4"/><option key="5"/> - <option key="6"/><option key="7"/><option key="8"/><option key="9" description="9 (${uiLabelMap.WorkEffortPriorityLow})"/> + <option key="1" description="${uiLabelMap.WorkEffortPriorityOne}"/> + <option key="2" description="${uiLabelMap.WorkEffortPriorityTwo}"/> + <option key="3" description="${uiLabelMap.WorkEffortPriorityThree}"/> + <option key="4" description="${uiLabelMap.WorkEffortPriorityFour}"/> + <option key="5" description="${uiLabelMap.WorkEffortPriorityFive}"/> + <option key="6" description="${uiLabelMap.WorkEffortPrioritySix}"/> + <option key="7" description="${uiLabelMap.WorkEffortPrioritySeventh}"/> + <option key="8" description="${uiLabelMap.WorkEffortPriorityEight}"/> + <option key="9" description="${uiLabelMap.WorkEffortPriorityNine}"/> </drop-down> </field> <field name="scopeEnumId" position="2"> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |