Commit Graph
122 Commits
Author SHA1 Message Date
Deepak Nigam 82f0df248b Implemented: Serbian CommonEntityLabelsfor geo entity.
(OFBIZ-11209)
Added missing entity label for Serbia.
Thanks: Ulrich Heidfeld for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1867663 13f79535-47bb-0310-9956-ffa450edef68
2019-09-28 10:26:09 +00:00
Jacques Le Roux 5f1fae8425 Improved: no functional change
Removes duplicated label

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1866733 13f79535-47bb-0310-9956-ffa450edef68
2019-09-10 09:20:54 +00:00
Jacques Le Roux 5ec9d8fb07 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.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1865370 13f79535-47bb-0310-9956-ffa450edef68
2019-08-17 18:26:42 +00:00
Jacques Le Roux a8f3480de4 Fixed: no functional changes
Fixes typos


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1859055 13f79535-47bb-0310-9956-ffa450edef68
2019-05-10 05:15:28 +00:00
Suraj Khurana 20af1d3319 Improved: Arranged framework UI labels in alphabetic order.
(OFBIZ-7345)
Thanks Shivangi for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1840815 13f79535-47bb-0310-9956-ffa450edef68
2018-09-13 13:31:51 +00:00
Deepak Dixit 70ea1b55c2 Fixed sequencing for ILS locale description.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1801314 13f79535-47bb-0310-9956-ffa450edef68
2017-07-08 18:44:48 +00:00
Deepak Dixit 7bb7ac13ea Added mistakenly removed valued for ILS entity uiLabel.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1801312 13f79535-47bb-0310-9956-ffa450edef68
2017-07-08 18:42:29 +00:00
Deepak Dixit 0d6bc54720 Fixed: Removed duplicate uiLable for ILS currency, also fix translation for French locale. (OFBIZ-9413)
Thanks Jacques for reporting

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1801311 13f79535-47bb-0310-9956-ffa450edef68
2017-07-08 18:39:30 +00:00
Deepak Dixit 14f9c7331d Improved: Following uiLabels should move from ProductUiLabels.xml to CommonEntityLabels.xml. (OFBIZ-9408)
ProductShipmentUomAbbreviation_LEN_in
    ProductShipmentUomAbbreviation_WT_g
    ProductShipmentUomAbbreviation_WT_kg
    ProductShipmentUomAbbreviation_WT_lb
    These labels should be written in similer pattern as other labels of "Uom" entity are written in CommonEntityLabels.xml, for example :
    ProductShipmentUomAbbreviation_LEN_in will be written as
    Uom.abbreviation.LEN_in
    <entityName>.<fieldName>.<PrimaryKey>

Thanks Renuka for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1801281 13f79535-47bb-0310-9956-ffa450edef68
2017-07-08 11:36:50 +00:00
Deepak Dixit 8aecef8445 Improved: Removed unused entity uiLabels for removed currency UOM (OFBIZ-9413)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1799209 13f79535-47bb-0310-9956-ffa450edef68
2017-06-19 13:50:34 +00:00
Jacques Le Roux 8749815f0a Improved: Remove redundant backend themes
(OFBIZ-8293)

This completes the previous commits where bizzness time and Dropping Crumbs were
removed

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1767920 13f79535-47bb-0310-9956-ffa450edef68
2016-11-03 16:07:44 +00:00
Jacques Le Roux 56648f77ce Improved: Remove redundant backend themes
(OFBIZ-8293)

This completes the previous commit where bizzness time and Dropping Crumbs were
removed

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1767893 13f79535-47bb-0310-9956-ffa450edef68
2016-11-03 14:35:54 +00:00
Jacques Le Roux efee2bc4b5 No functional change: removes annoying superfluous spaces in labels.
Can't be found when searching from HTML source, HTML removes it. 
There are no others but in ALv2 headers. 
I have asked why on dev@community.apache.org out of curiosity.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1764064 13f79535-47bb-0310-9956-ffa450edef68
2016-10-10 11:43:46 +00:00
Jacques Le Roux 7ada24fd04 This removes the pos component. OFBIZ-7804 "Check if we should fix or remove the POS (hence WebPos?)"
Most is done already. Test pass but testFopMacroLibrary but I don't see how it could be related to these changes, could be a quirk on Windows, BuilBot will tell us. Anyway, I will later double-check to be sure, also to see if I did not miss anything else.

I have voluntarily left 2 or 3 moot points
I was unable to remove possible POS references in <property key="FieldDescription.ProductStore.isImmediatelyFulfilled"> for certain language I'm unable to read.
I have to check if we should keep or not this code snippet
                <!-- if inventory info is not available for all of the products, then don't do the issuance, ie there has to be at least SOME inventory info in the database to facilitate inventory-less POS terminals -->
                <entity-count entity-name="InventoryItem" count-field="iiCount">
                    <condition-expr field-name="facilityId" operator="equals" from-field="orderHeader.originFacilityId"/>
                </entity-count>
I simply commented out twice this snippet in InvoiceServices.java, because I wonder if it would not be useful when the webPos will be able to issue money change
//                if (null == adj.get("amount")) { // JLR 17/4/7 : fix a bug coming from POS in case of use of a discount (on item(s) or sale, sale here) and a cash amount higher than total (hence issuing change)
//                    continue;
//                }

While at it, since I modified OPTIONAL_LIBRARIES, I also changed these svn:properties: svn:eol-style = native & svn:mime-type = text/plain


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1754402 13f79535-47bb-0310-9956-ffa450edef68
2016-07-28 12:27:20 +00:00
Jacques Le Roux f5d8feac88 An enhanced patch from Christian Carlow for "Add ability to change Routing statuses" - https://issues.apache.org/jira/browse/OFBIZ-6307
Only ROU_ACTIVE statusItem exists for statusTypeId ROUTING_STATUS.  Adding another such as ROU_INACTIVE would allow for more control over routings.  Doing so entails adding the statusId to the find and edit screens.
ROU_INACTIVE was add as a StatusItem and currentStatusId was added to the routing find form as a multi-drop down

jleroux: I added use of common/webcommon/includes/setMultipleSelectJs.ftl and French labels

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1741789 13f79535-47bb-0310-9956-ffa450edef68
2016-04-30 18:43:10 +00:00
Jacques Le Roux 327fb83021 A patch from Tomas Pytelka for "Czech translation" https://issues.apache.org/jira/browse/OFBIZ-6885
jleroux: this was git patch, I'm now used to change them to apply, but I will explain how to generate svn patch from it

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1729078 13f79535-47bb-0310-9956-ffa450edef68
2016-02-08 07:56:23 +00:00
Jacques Le Roux 4d2a942aa4 A patch from Gil Portenseigne for "Add a mean to untie geo associations" https://issues.apache.org/jira/browse/OFBIZ-6528
In the Webtools we can asociate Geos but we have yet no means to untie them

This patch adds a new grid in EditGeoScreen to see/delete GeoAssoc and CommonEntityLabels default-resource-name on GeoAssocType for translation purpose.

jleroux: On Pierre's Smits suggestion Gil also added a clickable link to open the associated Geo and a column to show the geoTypeId of the associated Geo.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1687259 13f79535-47bb-0310-9956-ffa450edef68
2015-06-24 13:10:00 +00:00
Shi Jinghai 85bed69778 Refs #6518.
Translated new labels in trunk version into zh locale (Simplified Chinese).

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1686778 13f79535-47bb-0310-9956-ffa450edef68
2015-06-22 07:10:41 +00:00
Jacques Le Roux ec07424fcb Patches from Taher Alkhateeb for "Translations of CommonUiLabels.xml & CommonEntityLabels.xml to Arabic" https://issues.apache.org/jira/browse/4966
I have translated fully the framework/common/config/CommonUiLabels.xml & CommonEntityLabels.xml to Arabic. Attached is the patch for both files.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1664602 13f79535-47bb-0310-9956-ffa450edef68
2015-03-06 12:38:42 +00:00
Jacques Le Roux d5c3acb587 Slightly modified uilabels patch from Pierre Smits for Dutch translations https://issues.apache.org/jira/browse/OFBIZ-6016
jleroux: I have made some changes within these changes, in agreement with Pierre


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1653224 13f79535-47bb-0310-9956-ffa450edef68
2015-01-20 11:05:22 +00:00
Jacques Le Roux aa2b996605 A modified patch from Pierre Smits for "Adding som Dutch translations to common labels." https://issues.apache.org/jira/browse/OFBIZ-6016
jleroux: I removed 
3 specific comments
<!-- ORRTIZ: TAXREPORT -->
<!-- GEO -->
<!-- ORRTIZ:BMS Applications -->
2 duplicates
<value xml:lang="nl">Gesynchroniseerd</value>
<value xml:lang="nl">Req. - geannuleerd</value>
For the later I kept the old one which seems more complete

I replaced 2482 <value xml:lang="(.*)_(.*)"> by <value xml:lang="(.*)-(.*)">


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1653143 13f79535-47bb-0310-9956-ffa450edef68
2015-01-19 22:32:25 +00:00
Jacques Le Roux b8ca5543c9 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@1650880 13f79535-47bb-0310-9956-ffa450edef68
2015-01-11 09:59:32 +00:00
Jacques Le Roux 04748292cf A patch from Wai for "state/province dropdown contains incorrect items when Canada is chosen in country dropdown" https://issues.apache.org/jira/browse/OFBIZ-5933
When creating a postal address, selecting Canada for country automatically filled the state/province dropdown with values. The issue is that the values of the state/province dropdown list are incorrect.

I was expecting the options for the state/province dropdown to have the following:
name=Alberta, value=AB
name=British Columbia, value=BC
...

What is actually present in the drop down is:
name=AB, value=AB
name=AB, value=BC
...

One observation is that this issue does not appear when the country selected is the United States. It seems to happen with Canada.
Another observation is that this issue applies to the 'en' locale. It seems to work fine for 'fr' locale.

jleroux: this was OK for Saskatchewan, that leaded to the solution


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1650642 13f79535-47bb-0310-9956-ffa450edef68
2015-01-09 20:19:17 +00:00
Adrian Crum 91feff5f51 Updated the UI label files so they reference a schema.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1649666 13f79535-47bb-0310-9956-ffa450edef68
2015-01-05 21:24:18 +00:00
Jacques Le Roux 5ebc58cc6a An excerpt of a patch from Nick Ho for "Add/Revise Traditional Chinese (zh-TW) translations" https://issues.apache.org/jira/browse/OFBIZ-5764
jleroux: some changes I spotted in Nick Ho's patch which sounded sound to me. Some groups of label internal ending white spaces would have been caught by HTML rendering, but anyway better like that.
I also fixed a number of wrong line returns. And found duplicates zh labels entries that I will report to Nick Ho to fix. And finally fixed some errors introduced by Nick Ho I spotted, I hope there are not too much left :/

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1625893 13f79535-47bb-0310-9956-ffa450edef68
2014-09-18 05:54:04 +00:00
Jacques Le Roux 3b118d4842 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@1625816 13f79535-47bb-0310-9956-ffa450edef68
2014-09-17 20:44:07 +00:00
Jacques Le Roux a61be3e0ff A patch from Shi Jinghai for "Add/Revise Traditional Chinese (zh-TW) translations in framework" https://issues.apache.org/jira/browse/OFBIZ-5737
I fixed the duplicated zh:
<value xml:lang="zh">分类页面</value>
<value xml:lang="zh">分類頁面</value>
to
<value xml:lang="zh">分类页面</value>
<value xml:lang="zh_TW">分類頁面</value>
in this patch.

Others are corrections on zh labels thank to Nick Ho's translation.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1623359 13f79535-47bb-0310-9956-ffa450edef68
2014-09-08 11:13:00 +00:00
Jacques Le Roux b74da066f1 Changes for "Add/Revise Traditional Chinese (zh-TW) translations in framework" https://issues.apache.org/jira/browse/OFBIZ-5737 after an exchange between Shi Jinghai and Nick Ho. We really miss a Chinese committer :D
What I did (jleroux):
1. I used <value xml:lang="zh_TW">阿富汗尼</value>
2. I used <value xml:lang="zh_TW">內容管理系統站台</value>
3. I did not change
4. I did not change
5. I used <value xml:lang="zh_TW">此</value>, noticed that: <value xml:lang="zh"> </value>
6. I did not change
7. I used <value xml:lang="zh_TW">度量單位</value> (several places)
8. I did not change

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1622124 13f79535-47bb-0310-9956-ffa450edef68
2014-09-02 21:04:14 +00:00
Jacques Le Roux 425ce1c003 A patch from Nick Ho for "Add/Revise Traditional Chinese (zh-TW) translations in framework" https://issues.apache.org/jira/browse/OFBIZ-5737
more added/updated translations patch files for zh-TW locale

jleroux: 
I added the label
<value xml:lang="zh_TW">服務執行程式拋出一個異常</value>
by hand
Only 1 label was not added:
<value xml:lang="zh_TW">代號</value>
Because of the fuzziness and presence of several possibilities


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1621688 13f79535-47bb-0310-9956-ffa450edef68
2014-09-01 06:51:33 +00:00
Jacques Le Roux 5b71d410db Really better French label
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1617498 13f79535-47bb-0310-9956-ffa450edef68
2014-08-12 14:53:43 +00:00
Jacques Le Roux bf902d9ff2 Better French label
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1617496 13f79535-47bb-0310-9956-ffa450edef68
2014-08-12 14:52:23 +00:00
Adrian Crum 4b8948664b A fix for some Chinese translations. Patch contributed by Leon - https://issues.apache.org/jira/browse/OFBIZ-5446
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1553663 13f79535-47bb-0310-9956-ffa450edef68
2013-12-27 11:20:11 +00:00
Jacques Le Roux eb01bb126d Misc. cleaning in labels
Removes all empty ones
Removes some redundant/duplicates ones (please committers don't commit those again, I know it's not easy to catch, hopefully now we should have less of them)
Automatically replaces some tabs
Few French labels improvements
Removes 2 orphan entries ("ja" & "cs")
Fixes the schema header of WebtoolsUiLabels.xml


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1551594 13f79535-47bb-0310-9956-ffa450edef68
2013-12-17 16:00:50 +00:00
Jacques Le Roux 3f08d5682d value attributes were not correctly closed
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1493332 13f79535-47bb-0310-9956-ffa450edef68
2013-06-15 09:19:29 +00:00
Adrian Crum 95cfc8f385 Russian translation for CommonEntityLabels.xml.
https://issues.apache.org/jira/browse/OFBIZ-5221


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1493326 13f79535-47bb-0310-9956-ffa450edef68
2013-06-15 08:02:02 +00:00
Christian Geisert fa0080cd08 Improved/corrected German translation
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1468127 13f79535-47bb-0310-9956-ffa450edef68
2013-04-15 15:45:32 +00:00
Jacques Le Roux e18c34f93d 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@1446482 13f79535-47bb-0310-9956-ffa450edef68
2013-02-15 09:11:54 +00:00
Jacques Le Roux efbe0f3fa6 Du bon usage du français
http://www.etudes-litteraires.com/forum/topic9238-je-suis-francais-un-francais-majuscule-ou-minuscule.html
http://fr.wikipedia.org/wiki/Usage_des_majuscules_en_fran%C3%A7ais


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1426604 13f79535-47bb-0310-9956-ffa450edef68
2012-12-28 18:26:50 +00:00
Jacques Le Roux ecd2de6362 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@1412997 13f79535-47bb-0310-9956-ffa450edef68
2012-11-23 17:35:16 +00:00
Jacques Le Roux b46c7a2c06 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@1403746 13f79535-47bb-0310-9956-ffa450edef68
2012-10-30 15:48:42 +00:00
Erwan de Ferrieres 901c176aa2 A patch from Nicolas Malin - OBFIZ-5032 - Complete French traduction for common component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1383340 13f79535-47bb-0310-9956-ffa450edef68
2012-09-11 10:35:57 +00:00
Jacques Le Roux 8ac851b7bc Forgot to commit some files at r1345379 (A patch from Tri Duc Vo for "Next Vietnamese Ofbiz translation https://issues.apache.org/jira/browse/OFBIZ-4759)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1345533 13f79535-47bb-0310-9956-ffa450edef68
2012-06-02 17:15:37 +00:00
Christian Geisert 6881ce39aa Moved Swiss German ("Offerte") to de_CH labels
See OFBIZ-2862


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1325807 13f79535-47bb-0310-9956-ffa450edef68
2012-04-13 15:37:04 +00:00
Erwan de Ferrieres f09f963cb0 Adding missing training statuses, as they are used in forms but not created in base. Adding entity labels related
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1234035 13f79535-47bb-0310-9956-ffa450edef68
2012-01-20 17:57:24 +00:00
Erwan de Ferrieres 9b03a5022b Improvements on the EmplLeave entity. Adding entityLabels for the leaveStatus field
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1232158 13f79535-47bb-0310-9956-ffa450edef68
2012-01-16 20:51:18 +00:00
Adrian Crum 4a03998c48 Spanish translations provided by Jose F. Fernandez:
https://issues.apache.org/jira/browse/OFBIZ-4531
https://issues.apache.org/jira/browse/OFBIZ-4532
https://issues.apache.org/jira/browse/OFBIZ-4533
https://issues.apache.org/jira/browse/OFBIZ-4534


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1190423 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 16:14:17 +00:00
Erwan de Ferrieres 0df2322108 A patch from Olivier Heintz - OFBIZ-4507 - French spelling correction in uiLabel
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1188389 13f79535-47bb-0310-9956-ffa450edef68
2011-10-24 21:21:22 +00:00
Jacques Le Roux f9661643f7 Fixes some errors in UiLabels
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1073801 13f79535-47bb-0310-9956-ffa450edef68
2011-02-23 16:09:50 +00:00
Christian Geisert a89af7668e Adding Germany (de_DE) Labels for "Quote" (!= "Offerte") and a few more translations
Submitted by Carsten Schinzer
See OFBIZ-2862



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1073716 13f79535-47bb-0310-9956-ffa450edef68
2011-02-23 12:07:24 +00:00
Bruno Busco 41dcc9b67a Better Italian labels
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1071327 13f79535-47bb-0310-9956-ffa450edef68
2011-02-16 17:49:31 +00:00