svn commit: r1760995 - in /ofbiz/trunk: applications/humanres/config/HumanResUiLabels.xml framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelManagerFactory.java specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml

Author: jleroux
Date: Fri Sep 16 05:58:15 2016
New Revision: 1760995

URL: http://svn.apache.org/viewvc?rev=1760995&view=rev
Log:
Fixes: The entity description labels are considered not used by the Label Manager
(OFBIZ-8154)

It's a pity, because of the translations, but the labels starting by "HumanResServices.", which dates from pre Apache era, are not used OOTB, so I remove them here
.portalPageName. is used by demo data
ProductStoreGroup.productStoreGroupName.NA is used as data by ProductTypeData.xml
FormFieldTitle_timesheetPartyId in ProjectMgrUiLabels.xml seems an error. As it duplicates the same in AccountingUiLabels.xml, which is accurate, I remove it from ProjectMgrUiLabels

Modified:
    ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml
    ofbiz/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelManagerFactory.java
    ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml

Modified: ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml?rev=1760995&r1=1760994&r2=1760995&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml (original)
+++ ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml Fri Sep 16 05:58:15 2016
@@ -2799,84 +2799,6 @@
         <value xml:lang="zh">薪水等级序号</value>
         <value xml:lang="zh-TW">薪水等級序號</value>
     </property>
-    <property key="HumanResServices.PartyQualFailureAlreadyExists">
-        <value xml:lang="en">Could not create education entry, it already exists</value>
-        <value xml:lang="es">No se pudo crear la entidad educación, dado que ya existe</value>
-        <value xml:lang="fr">Impossible de créer l'entrée d'éducation, elle existe déjà</value>
-        <value xml:lang="it">Non è possibile creare voce educazione, questo è già esistente</value>
-        <value xml:lang="ja">教育登録ができません、すでに存在します</value>
-        <value xml:lang="pt-BR">Não foi possível criar a entrada de educação, ela já existe</value>
-        <value xml:lang="ro">Nu se poate crea entitatea educatie, pentru ca deja exista</value>
-        <value xml:lang="th">ไม่สามารถสร้างการกรอกข้อมูลการศึกษา  , มันมีอยู่แล้ว</value>
-        <value xml:lang="vi">Không thể tạo điểm nhập đào tạo vì dữ liệu đã tồn tại trong hệ thống</value>
-        <value xml:lang="zh">无法创建教育记录，它已经存在了</value>
-        <value xml:lang="zh-TW">無法新建教育記錄,它已經存在了</value>
-    </property>
-    <property key="HumanResServices.PartyQualFailureDataSource">
-        <value xml:lang="en">Could not create education entry, data source error</value>
-        <value xml:lang="es">No se pudo crear la entidad educación, error de base de datos</value>
-        <value xml:lang="fr">Impossible de créer l'entrée d'éducation, erreur de base de données</value>
-        <value xml:lang="it">Non è possibile creare voce educazione, errore sorgente dati</value>
-        <value xml:lang="ja">教育登録ができません、データソースエラー</value>
-        <value xml:lang="pt-BR">Não foi possível criar a entrada de educação, erro na fonte dos dados</value>
-        <value xml:lang="ro">Nu se poate crea entitatea educatie,eroare de baza de date</value>
-        <value xml:lang="th">ไม่สามารถสร้างการกรอกข้อมูลการศึกษา  , แหล่งข้อมูลผิดพลาด</value>
-        <value xml:lang="vi">Không thể tạo điểm nhập đào tạo vì kết nối cÆ¡ sở dữ liệu không thành công</value>
-        <value xml:lang="zh">无法创建教育记录，数据源出错</value>
-        <value xml:lang="zh-TW">無法新建教育記錄,資料源出錯</value>
-    </property>
-    <property key="HumanResServices.PartyQualFailureIDCreation">
-        <value xml:lang="en">Could not create education entry, ID creation failed</value>
-        <value xml:lang="es">No se pudo crear la entidad educación, la creación del id fallo</value>
-        <value xml:lang="fr">Impossible de créer l'entrée d'éducation, la création d'identifiant a échoué</value>
-        <value xml:lang="it">Non è possibile creare voce educazione, creazione ID fallita</value>
-        <value xml:lang="ja">教育登録ができません、ID生成失敗</value>
-        <value xml:lang="pt-BR">Não foi possível criar entrada de educação, criação de Id falhou</value>
-        <value xml:lang="ro">Nu se poate crea entitatea educatie, creaie Id Falita</value>
-        <value xml:lang="th">ไม่สามารถสร้างการกรอกข้อมูลการศึกษา  , การสร้างรหัสล้มเหลว</value>
-        <value xml:lang="vi">Không thể tạo điểm nhập đào tạo vì không thể lấy được Id</value>
-        <value xml:lang="zh">无法创建教育记录，创建标识时失败。</value>
-        <value xml:lang="zh-TW">無法新建教育記錄,新建識別時失敗.</value>
-    </property>
-    <property key="HumanResServices.PartyQualFailureIDStartsDigit">
-        <value xml:lang="en">Could not create education entry, ID starts with digit</value>
-        <value xml:lang="es">No se pudo crear la entidad educación, el id empieza con un digito</value>
-        <value xml:lang="fr">Impossible de créer l'entrée d'éducation, l'identifiant commence par un chiffre</value>
-        <value xml:lang="it">Non è possibile creare voce educazione, ID inizia con un numero</value>
-        <value xml:lang="ja">教育登録ができません、IDが数字で始まっています</value>
-        <value xml:lang="pt-BR">Não foi possível criar entrada de educação, Id deve começar com um dígito</value>
-        <value xml:lang="ro">Nu se poate crea entitatea educatie, Id starts with digit</value>
-        <value xml:lang="th">ไม่สามารถสร้างการกรอกข้อมูลการศึกษา  , รหัสเริ่มต้นด้วยตัวเลข</value>
-        <value xml:lang="vi">Không thể tạo điểm nhập đào tạo vì Id bắt đầu bằng số</value>
-        <value xml:lang="zh">无法创建教育记录，标识以数字开头</value>
-        <value xml:lang="zh-TW">無法新建教育記錄,識別以數字開頭</value>
-    </property>
-    <property key="HumanResServices.PartyQualFailureInputEntities">
-        <value xml:lang="en">Could not create education entry, one or more input entity does not exist</value>
-        <value xml:lang="es">No se pudo crear la entidad educación, uno o más entidades asociadas no existen</value>
-        <value xml:lang="fr">Impossible de créer l'entrée d'éducation, une ou plusieurs entrée d'entités n'existent pas</value>
-        <value xml:lang="it">Non è possibile creare voce educazione, uno o più entità non esistono</value>
-        <value xml:lang="ja">教育登録ができません、エンティティが存在しません</value>
-        <value xml:lang="pt-BR">Não foi possível criar entrada de educação, uma ou mais entidades não existem</value>
-        <value xml:lang="ro">Nu se poate crea entitatea educatie,unul sau mai multi parametri nu exista</value>
-        <value xml:lang="th">ไม่สามารถสร้างการกรอกข้อมูลการศึกษา  , ไม่มีค่าที่กรอกลงไป</value>
-        <value xml:lang="vi">Không thể tạo điểm nhập đào tạo vì một hoặc nhiều Thá»±c thể (entity) không tồn tại</value>
-        <value xml:lang="zh">无法创建教育记录，一个或多个输入的实体不存在</value>
-        <value xml:lang="zh-TW">無法新建教育記錄,一個或多個輸入的資料實體不存在</value>
-    </property>
-    <property key="HumanResServices.PartyQualFailureMissingParam">
-        <value xml:lang="en">Could not create education entry, required parameters missing</value>
-        <value xml:lang="es">No se pudo crear la entidad educación, faltan parametros</value>
-        <value xml:lang="fr">Impossible de créer l'entrée d'éducation, il manque des paramètres</value>
-        <value xml:lang="it">Non è possibile creare voce educazione, parametro richiesto mancante</value>
-        <value xml:lang="ja">教育登録ができません、必須項目が入力されていません</value>
-        <value xml:lang="pt-BR">Não foi possível criar entrada de educação, parâmetros obrigatórios faltando</value>
-        <value xml:lang="ro">Nu se poate crea entitatea educatie, lipsesc parametric.</value>
-        <value xml:lang="th">ไม่สามารถสร้างการกรอกข้อมูลการศึกษา  , ต้องการตัวแปรที่หายไป</value>
-        <value xml:lang="vi">Không thể tạo điểm nhập đào tạo vì không đủ tham số</value>
-        <value xml:lang="zh">无法创建教育记录，缺少所需的参数</value>
-        <value xml:lang="zh-TW">無法新建教育記錄,缺少所需的參數</value>
-    </property>
     <property key="HumanResSkillType">
         <value xml:lang="de">Fähigkeitenarten</value>
         <value xml:lang="en">Skill Types</value>

Modified: ofbiz/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelManagerFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelManagerFactory.java?rev=1760995&r1=1760994&r2=1760995&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelManagerFactory.java (original)
+++ ofbiz/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelManagerFactory.java Fri Sep 16 05:58:15 2016
@@ -138,11 +138,10 @@ public class LabelManagerFactory {
                                     || labelKey.contains("FieldDescription.")
                                     || labelKey.contains("ProductShipmentUomAbbreviation_")
                                     || labelKey.contains("TemporalExpression_")
+                                    || labelKey.contains(".portalPageName.")
+                                    || labelKey.contains("ProductStoreGroup.productStoreGroupName.NA")
                                     )) {
                         continue; // OFBIZ-8154 WIP
-                                    // TODO HumanResServices. labels seems unused and should be removed
-                                    // TODO .portalPageName. is doubtful to be double checked
-                                    // TODO ProductStoreGroup.productStoreGroupName.NA not sure
                     }
                     String labelComment = "";
                     for (Node valueNode : UtilXml.childNodeList(propertyElem.getFirstChild())) {

Modified: ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml?rev=1760995&r1=1760994&r2=1760995&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml Fri Sep 16 05:58:15 2016
@@ -248,16 +248,6 @@
         <value xml:lang="zh">模板Id</value>
         <value xml:lang="zh-TW">模板Id</value>
     </property>
-    <property key="FormFieldTitle_timesheetPartyId">
-        <value xml:lang="de">Zugeordnet zu</value>
-        <value xml:lang="en">Associated to</value>
-        <value xml:lang="fr">Associée à</value>
-        <value xml:lang="ja">割当先</value>
-        <value xml:lang="nl">Gekoppeld aan</value>
-        <value xml:lang="vi">Gắn kết đến</value>
-        <value xml:lang="zh">关联到</value>
-        <value xml:lang="zh-TW">結合到</value>
-    </property>
     <property key="PageTitleAddATimesheet">
         <value xml:lang="de">Neue wöchentliche Zeiterfassung hinzufügen</value>
         <value xml:lang="en">Add a new weekly Timesheet</value>