Commit Graph
68 Commits
Author SHA1 Message Date
Jacques Le Roux e65f7ff978 Reverts r1752863, once again I applied a patch when moving SeoConfig.xml to e-commerce for OFBIZ-6125. I should have moved the file myself locally and committed directly.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1755032 13f79535-47bb-0310-9956-ffa450edef68
2016-08-03 07:30:35 +00:00
Jacques Le Roux 9dae6c0a9f A patch from Pierre Smits for "Move SeoConfig.xml to e-commerce" https://issues.apache.org/jira/browse/OFBIZ-6125
Currently the configuration file (SeoConfig.xml) is incorporated in the product component. However this is more related to how the e-commerce operates than to the functions in the backend catalog and warehousing applications. 
The file should therefore be moved to its appropriate place.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1752863 13f79535-47bb-0310-9956-ffa450edef68
2016-07-15 18:26:44 +00:00
Ashish Vijaywargiya 923342c1fc Applied patch from jira issue - OFBIZ-7705 - Remove Google Checkout component from specialpurpose as it was discontinued.
Thanks Ravi for removing the reference of Google Checkout from everywhere.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1751393 13f79535-47bb-0310-9956-ffa450edef68
2016-07-05 04:24:53 +00:00
Pranay Pandey 3f6a4d4b8e OFBIZ-7057 - Fixed UiLabel for the GeneratedDescription in ordermgr after applying promotion which was missing due to the usage from EcommerceUiLabels. Thanks Swapnil M Mane for reporting this issue and providing patch for the same.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1742712 13f79535-47bb-0310-9956-ffa450edef68
2016-05-07 13:45:37 +00:00
Shi Jinghai e8fb02c303 Refs #6518.
Translated new labels in trunk version into zh locale (Simplified Chinese).

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1686778 13f79535-47bb-0310-9956-ffa450edef68
2015-06-22 07:10:41 +00:00
Pranay Pandey 3598104491 Applied patch from jira issue - OFBIZ-5034. Contact us submit doesn't display a message on the page and doesn't send an email notification.
Thanks Eric de Maulde for reporting the issue and Amardeep Singh Jhajj for providing the patch.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1652610 13f79535-47bb-0310-9956-ffa450edef68
2015-01-17 14:04:14 +00:00
Jacques Le Roux cd2e289d78 Changes in all labels files: <value xml:lang="(.*)_(.*)"> to <value xml:lang="$1-$2">
Changes also listLocales.ftl to show dashes rather than underscores

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1650880 13f79535-47bb-0310-9956-ffa450edef68
2015-01-11 09:59:32 +00:00
Adrian Crum 8560800dcd Updated the UI label files so they reference a schema.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1649666 13f79535-47bb-0310-9956-ffa450edef68
2015-01-05 21:24:18 +00:00
Ashish Vijaywargiya a3947ee585 Applied patch from OFBIZ-4511 - Non-standard markup for categories screenlet.
Thanks Anne for creating the issue and providing the first patch. Thanks Arun for providing the updated patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1646944 13f79535-47bb-0310-9956-ffa450edef68
2014-12-20 10:23:47 +00:00
Jacques Le Roux 494f357a25 An excerpt of a patch from Nick Ho for "Add/Revise Traditional Chinese (zh-TW) translations" https://issues.apache.org/jira/browse/OFBIZ-5764
added/revised zh-TW translations in the framework, applications and specialpurpose folders to have consistent, commonly-used meaningful terms in Traditional Chinese.

jleroux: from Nick Ho's patch I have extracted only the Chinese changes, w/o the proposed  dash to underscore changes
This contains notably this 14 "zh" (not "sh-TW") changes:
<value xml:lang="zh">人将由电子邮件接受一个临时密码。</value><!-- was 客户将通过电子邮件收到一个临时密码。 -->
<value xml:lang="zh">合计属于公司: </value>
<value xml:lang="zh"> 完整文本:${fullText}</value>
<value xml:lang="zh">供货商佣金百分比</value>
<value xml:lang="zh">文本大小</value>
<value xml:lang="zh">值</value>
<value xml:lang="zh">算子</value>
<value xml:lang="zh">不能转移已序列化的库存。</value>
<value xml:lang="zh">货运收据</value>
<value xml:lang="zh">获取标识为 ${productStoreShipMethId} 的产品店铺送货方法(ProductStoreShipmentMeth)时出错:${errorString}</value>
<value xml:lang="zh">中国人民币元</value>
<value xml:lang="zh">如果选择"specify other",下拉框旁边会出现文本框。参考form的drop-down元素的other-field-size属性说明</value>
<value xml:lang="zh">文本消息</value>
<value xml:lang="zh">能够收到和解析XML消息,但是BSR->NOUN(买卖关系->名词) ${bsrNoun} 和/或 BSR->VERB(买卖关系->动词) ${bsrVerb} 是空的</value>
I have no competency to judge these changes, but from previous Shi Jinghai's feedback I believe there are OK

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1625816 13f79535-47bb-0310-9956-ffa450edef68
2014-09-17 20:44:07 +00:00
Ashish Vijaywargiya c35c93423b Applied patch from jira issue - OFBIZ-3566 - EcommerceUiLabels references in applications/*
Thanks Adam Heath for reporting the issue and team ofbiz.us for providing the fix. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1618415 13f79535-47bb-0310-9956-ffa450edef68
2014-08-16 20:53:55 +00:00
Jacques Le Roux f5be3d4b65 I stumbled upon this today and I agree with Deepak: http://markmail.org/message/2bsurgd52crssldk
So backporting also to R13.07 (only)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1592588 13f79535-47bb-0310-9956-ffa450edef68
2014-05-05 17:53:53 +00:00
Christian Geisert 081d6a8095 Missing UI Label translations to de Locale for Tags, see OFBIZ-5190
Submitted by Carsten Schinzer


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1497779 13f79535-47bb-0310-9956-ffa450edef68
2013-06-28 14:01:17 +00:00
Jacques Le Roux bcb2a48687 A patch from Shi Jinghai for "Chinese localizations (zh) for trunk" https://issues.apache.org/jira/browse/OFBIZ-5134
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1446482 13f79535-47bb-0310-9956-ffa450edef68
2013-02-15 09:11:54 +00:00
Jacques Le Roux cddf0bf2a2 A patch from Naofumi Fukue "Japanese patch" https://issues.apache.org/jira/browse/OFBIZ-5061
Completed Japanese translation

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1412997 13f79535-47bb-0310-9956-ffa450edef68
2012-11-23 17:35:16 +00:00
Jacques Le Roux 8bc466970e A patch from Naofumi Fukue "Japanese patch" https://issues.apache.org/jira/browse/OFBIZ-5061
Got an issue merging GeoData_JP.xml with Subclipse, using Toirtoise solved it

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1403746 13f79535-47bb-0310-9956-ffa450edef68
2012-10-30 15:48:42 +00:00
Jacques Le Roux 99f9dca678 A patch from Carsten Schinzer "ECommerce application, productdetail is not fully internationalized" https://issues.apache.org/jira/browse/OFBIZ-4962
The i18n in the productdetail.ftl is not complete when featuretree is used to define products. Missing bits:

Reference to existing UI Labels on div productdetail for sizes available
Using a UI Label instead of hard coded "choose option" on the AddItemForm



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1361402 13f79535-47bb-0310-9956-ffa450edef68
2012-07-13 21:12:26 +00:00
Jacques Le Roux fed8217a82 A patch from Tri Duc Vo for "Next Vietnamese Ofbiz translation https://issues.apache.org/jira/browse/OFBIZ-4759
fixed few issues, 3 remains, Tri will have to choice

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1345379 13f79535-47bb-0310-9956-ffa450edef68
2012-06-01 22:32:57 +00:00
Jacques Le Roux 4bb721dfe2 A patch from Tri Duc Vo "contribute Ofbiz Vietnamese tranlasting to community from HaNoi" https://issues.apache.org/jira/browse/OFBIZ-4627
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1304237 13f79535-47bb-0310-9956-ffa450edef68
2012-03-23 08:56:48 +00:00
Erwan de Ferrieres 5a26977691 Missing PageTitleTagResults label, and adding more French translation
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1226089 13f79535-47bb-0310-9956-ffa450edef68
2011-12-31 13:43:20 +00:00
Erwan de Ferrieres c3aa09d12a Removing orphan labels, imported at rev. 1039574
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1226084 13f79535-47bb-0310-9956-ffa450edef68
2011-12-31 13:37:40 +00:00
Erwan de Ferrieres a5b9bcabac ProductCategories is already defined in ProductUiLabels, no need to have it twice
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1226080 13f79535-47bb-0310-9956-ffa450edef68
2011-12-31 13:27:59 +00:00
Erwan de Ferrieres 30c0fce678 Some French translations for tags-related uiLabels
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1226079 13f79535-47bb-0310-9956-ffa450edef68
2011-12-31 13:25:20 +00:00
Hans Bakker b9547e917b add a tagcloud demo to the ecommerce home page, contribution of tom of antwebsystems.com
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1225452 13f79535-47bb-0310-9956-ffa450edef68
2011-12-29 07:05:42 +00:00
Hans Bakker 30d3362fe3 implement the basic janrain package, which enables the login via most social sites, but can not recognize if the same user if logged in from 2 different sites. By default this function is disabled and will not change the functionality of the OFBiz login procedure in any way
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1224876 13f79535-47bb-0310-9956-ffa450edef68
2011-12-27 07:39:43 +00:00
Hans Bakker a68aee3f5d add the possibility of adding tags to products next to having keywords to products, can also optionally approve/reject via a status field
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1222544 13f79535-47bb-0310-9956-ffa450edef68
2011-12-23 03:49:11 +00:00
Hans Bakker 2f26fe782a move blog labels from ecommerce to content and use them from there.....
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1190180 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 07:17:34 +00:00
Jacques Le Roux 2654b23bcc Better French labels
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1182257 13f79535-47bb-0310-9956-ffa450edef68
2011-10-12 08:27:59 +00:00
Sascha Rodekamp e08f288ea9 FIX: Missing UiLabel and typos on Anonymous Checkout (https://issues.apache.org/jira/browse/OFBIZ-4414) A patch from Carsten Schinzer: custsetting.ftl has typos: Opening tag <lable> is used on four occasions instead of <label> while closing tags correctly refer to </label>. Header of section refers to EcommerceUiLabel "EcommerceYourNamePhoneAndEmail" which is not present in specialpurpose/ecommerce/config/EcommerceUiLabels.xml.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1170968 13f79535-47bb-0310-9956-ffa450edef68
2011-09-15 06:29:54 +00:00
Hans Bakker 7c84c691fe Add seo friendly url's for showing content. reorganize the same program snippets with seo friendly url for products. These content url's are demonstrated at the ecommerce frontend in the left bottom corner: Content Information
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1141878 13f79535-47bb-0310-9956-ffa450edef68
2011-07-01 09:03:32 +00:00
Marco Risaliti 83d63b68bd Hardcoded sentences in <default-message> tags (OFBIZ-3996)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1132726 13f79535-47bb-0310-9956-ffa450edef68
2011-06-06 19:08:00 +00:00
Hans Bakker 6a82d07c3a add jquery category tree only showing categories which have a related product or have a related category with a product. It has been tested in IE too. The showing of products from the tree is now using ajax and is only updating the middle of the screen. A contributution of Antwebsystems employee Oat
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1128983 13f79535-47bb-0310-9956-ffa450edef68
2011-05-30 02:58:31 +00:00
Hans Bakker ff4de4ee52 Add an automatic product price currency conversion which can be switched off in a properties file.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1125215 13f79535-47bb-0310-9956-ffa450edef68
2011-05-20 03:18:52 +00:00
Jacques Le Roux 7fd830e291 3 patches from Sascha Rodekamp "Localisation of labels in javascript" (https://issues.apache.org/jira/browse/OFBIZ-3964) - OFBIZ-3964
This cames from Adam's advice: http://markmail.org/message/kai5lfvlnsz7xwki

Sascha comes to this solution
The Idea is to have a method which takes a JSON Object with uiLabel Resources and label entries and returns the resolved labels in a JSON Object which can be used directly in the JS Code.
The advantage of this way, is that we have only one Ajax request which reads all labels. The alternative is an Ajax request for each label, which simplify the request (because you haven't to create a complex JSON Object) but is very expansive.

* Replaces all JS alerts with the new fancy error boxes
* Adds a few uiLabels

I simply fixed some typos. I did not test all cases but did a good review.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1056497 13f79535-47bb-0310-9956-ffa450edef68
2011-01-07 20:40:31 +00:00
Hans Bakker 97be8d34db make the ecommerce 'contactus' not require login, add captcha and will try to match entered email address to party, whennot create the party.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1052449 13f79535-47bb-0310-9956-ffa450edef68
2010-12-24 05:45:19 +00:00
Marco Risaliti cb5e179cc1 Replace some fail-message to fail-property tag all specialpurpose components (OFBIZ-1874)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1052038 13f79535-47bb-0310-9956-ffa450edef68
2010-12-22 19:22:45 +00:00
Jacques Le Roux 40fdd4e6df According to Dukian at OFBIZ-4031 those lines should be removed. I just kept 2 duplicates in Chinese, and one in German
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1040078 13f79535-47bb-0310-9956-ffa450edef68
2010-11-29 11:46:56 +00:00
Jacques Le Roux d62d950736 Fixes the last error remaining from r1039574, OFBIZ-4031
Thanks to Dukian's help

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1039892 13f79535-47bb-0310-9956-ffa450edef68
2010-11-28 15:31:28 +00:00
Jacques Le Roux b42288202c Fix duplicates in labels
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1039858 13f79535-47bb-0310-9956-ffa450edef68
2010-11-28 09:56:44 +00:00
Jacques Le Roux a53253d11d A patch from Dukian "Add Traditional Chinese translation for applications, ecommerce, and ofbizsetup" (https://issues.apache.org/jira/browse/OFBIZ-4031) - OFBIZ-4031
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1039574 13f79535-47bb-0310-9956-ffa450edef68
2010-11-26 21:56:14 +00:00
Jacques Le Roux bf517e1989 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.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1037559 13f79535-47bb-0310-9956-ffa450edef68
2010-11-21 21:07:19 +00:00
Jacques Le Roux 6917333cd9 A patch from Shi Yusen "Improve the Chinese translation of word 'Review' " (https://issues.apache.org/jira/browse/OFBIZ-4028) - OFBIZ-4028
Improve the Chinese translation of word 'Review' to make it same as the term used by local ecommerce suites.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1036483 13f79535-47bb-0310-9956-ffa450edef68
2010-11-18 15:16:29 +00:00
Hans Bakker 74621b9a77 replacing an empty blog summary with text did not work and moving labels from ecommerce to content because used in both components
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1036332 13f79535-47bb-0310-9956-ffa450edef68
2010-11-18 07:28:45 +00:00
Erwan de Ferrieres 0959f50d0c Typos and missing French uiLabels in ecommerce
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1030882 13f79535-47bb-0310-9956-ffa450edef68
2010-11-04 11:10:22 +00:00
Erwan de Ferrieres 3010de4b5b Adding new uiLabels for billingAccount information in eCommerce (limit and available amount)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1030521 13f79535-47bb-0310-9956-ffa450edef68
2010-11-03 16:34:18 +00:00
Hans Bakker 128e51f621 two files missing in last commit
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1029593 13f79535-47bb-0310-9956-ffa450edef68
2010-11-01 10:08:38 +00:00
Hans Bakker 814196caa9 missed some updates in the last blog commit
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1022050 13f79535-47bb-0310-9956-ffa450edef68
2010-10-13 09:41:39 +00:00
Jacques Le Roux 22dbd5b034 A patch from Willem Janssen "Dutch labels patch" (https://issues.apache.org/jira/browse/OFBIZ-3800) - OFBIZ-3800
Adds Dutch translations in various UiLabel files, thanks to Vikas Raikwar for reviewing and checking

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@951124 13f79535-47bb-0310-9956-ffa450edef68
2010-06-03 19:24:26 +00:00
Jacques Le Roux 8b82bebb26 Fixes some French labels related to # which is n° in French
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@947479 13f79535-47bb-0310-9956-ffa450edef68
2010-05-23 20:07:55 +00:00
Jacques Le Roux 7f698d1248 A patch from Nicolas Malin "Pass eCommerce label to Common Label" https://issues.apache.org/jira/browse/OFBIZ-3694 - OFBIZ-3694
Some labels changes, no functional changes



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@942818 13f79535-47bb-0310-9956-ffa450edef68
2010-05-10 16:41:18 +00:00