Permalink
Browse files

A slightly modified patch from Gil Portenseigne for "Missing PartyCou…

…ntryCode uiLabel" https://issues.apache.org/jira/browse/OFBIZ-5138

The label ${uiLabelMap.PartyCountryCode} is used several times in the project but i could not find the definition of PartyCountryCode in label definition files.
I looked further and found CommonCountryCode in label file which is not used and fill the need for PartyCountryCode. To solve this I propose to rename all PartyCountryCode to CommonCountryCode.

jleroux: I also moved CommonCountryCode, CommonCountryCodeMissing and CommonCountryMissing from PartyUiLabels.xml to CommonUiLabels.xml





git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1447664 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
1 parent 473a0f3 commit 79bd163b1486859addccb9651296fd8bfd60a25c @JacquesLeRoux JacquesLeRoux committed Feb 19, 2013
@@ -43,13 +43,13 @@
</field>
<field name="USER_ADDRESS_ALLOW_SOL"><hidden value="Y"/></field>
<field name="WorkPhoneTitle" title="${uiLabelMap.PartyContactWorkPhoneNumber}" title-area-style="group-label" widget-style="tooltip"><display description="${uiLabelMap.PartyPhoneNumberRequired}" also-hidden="false"/></field>
- <field name="USER_WORK_COUNTRY" title="${uiLabelMap.PartyCountryCode}"><text size="4" maxlength="10"/></field>
+ <field name="USER_WORK_COUNTRY" title="${uiLabelMap.CommonCountryCode}"><text size="4" maxlength="10"/></field>
<field name="USER_WORK_AREA" title="${uiLabelMap.PartyAreaCode}"><text size="4" maxlength="10"/></field>
<field name="USER_WORK_CONTACT" title="${uiLabelMap.PartyPhoneNumber}"><text size="15" maxlength="15"/></field>
<field name="USER_WORK_EXT" title="${uiLabelMap.PartyContactExt}"><text size="6" maxlength="10"/></field>
<field name="USER_WORK_ALLOW_SOL"><hidden value="Y"/></field>
<field name="FaxPhoneTitle" title="${uiLabelMap.PartyContactFaxPhoneNumber}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
- <field name="USER_FAX_COUNTRY" title="${uiLabelMap.PartyCountryCode}"><text size="4" maxlength="10"/></field>
+ <field name="USER_FAX_COUNTRY" title="${uiLabelMap.CommonCountryCode}"><text size="4" maxlength="10"/></field>
<field name="USER_FAX_AREA" title="${uiLabelMap.PartyAreaCode}"><text size="4" maxlength="10"/></field>
<field name="USER_FAX_CONTACT" title="${uiLabelMap.PartyPhoneNumber}"><text size="15" maxlength="15"/></field>
<field name="USER_FAX_EXT" title="${uiLabelMap.PartyContactExt}"><text size="6" maxlength="10"/></field>
@@ -94,7 +94,7 @@ under the License.
</#if>
<#if extInfo == "T">
<tr><td colspan="3"><hr /></td></tr>
- <tr><td class="label">${uiLabelMap.PartyCountryCode}</td>
+ <tr><td class="label">${uiLabelMap.CommonCountryCode}</td>
<td><input type="text" name="countryCode" value="${parameters.countryCode?if_exists}"/></td>
</tr>
<tr><td class="label">${uiLabelMap.PartyAreaCode}</td>
@@ -58,7 +58,7 @@
</drop-down>
</field>
<field name="phoneTitle" title="${uiLabelMap.PartyPrimaryPhone}" title-area-style="group-label"><display/></field>
- <field name="countryCode" title="${uiLabelMap.PartyCountryCode}"><text size="4" maxlength="10"/></field>
+ <field name="countryCode" title="${uiLabelMap.CommonCountryCode}"><text size="4" maxlength="10"/></field>
<field name="areaCode" title="${uiLabelMap.PartyAreaCode}"><text size="4" maxlength="10"/></field>
<field name="contactNumber" title="${uiLabelMap.PartyPhoneNumber}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="15" maxlength="15"/></field>
<field name="extension" title="${uiLabelMap.PartyContactExt}"><text size="6" maxlength="10"/></field>
@@ -97,7 +97,7 @@ under the License.
</tr>
<tr><td><br /><h3>${uiLabelMap.PartyPrimaryPhone}</h3></td></tr>
<tr>
- <td width="20%">${uiLabelMap.PartyCountryCode}</td>
+ <td width="20%">${uiLabelMap.CommonCountryCode}</td>
<td width="30%">${contactInfo1.countryCode?if_exists}</td>
<td width="30%">${contactInfo2.countryCode?if_exists}</td>
<td width="10%"><input type="checkbox" name="useContactNum2" value="Y"/></td>
@@ -101,7 +101,7 @@ under the License.
</tr>
<tr><td><br /><h3>${uiLabelMap.PartyPrimaryPhone}</h3></td></tr>
<tr>
- <td width="20%">${uiLabelMap.PartyCountryCode}</td>
+ <td width="20%">${uiLabelMap.CommonCountryCode}</td>
<td width="30%">${contactInfo1.countryCode?if_exists}</td>
<td width="30%">${contactInfo2.countryCode?if_exists}</td>
<td width="10%"><input type="checkbox" name="useContactNum2" value="Y"/></td>
@@ -62,7 +62,7 @@ under the License.
<field name="phoneTitle" title="${uiLabelMap.PartyPrimaryPhone}" title-area-style="group-label"><display/></field>
- <field name="countryCode" title="${uiLabelMap.PartyCountryCode}"><text size="4" maxlength="10"/></field>
+ <field name="countryCode" title="${uiLabelMap.CommonCountryCode}"><text size="4" maxlength="10"/></field>
<field name="areaCode" title="${uiLabelMap.PartyAreaCode}"><text size="4" maxlength="10"/></field>
<field name="contactNumber" title="${uiLabelMap.PartyPhoneNumber}"><text size="15" maxlength="15"/></field>
<field name="extension" title="${uiLabelMap.PartyContactExt}"><text size="6" maxlength="10"/></field>
@@ -229,7 +229,7 @@ under the License.
</field>
</form>
<form name="FindTelecomNumber" type="single">
- <field name="tnCountryCode" title="${uiLabelMap.PartyCountryCode}"><text-find/></field>
+ <field name="tnCountryCode" title="${uiLabelMap.CommonCountryCode}"><text-find/></field>
<field name="tnAreaCode" title="${uiLabelMap.PartyAreaCode}"><text-find/></field>
<field name="tnContactNumber" title="${uiLabelMap.PartyContactNumber}"><text-find/></field>
<field name="tnExtension" title="${uiLabelMap.PartyExtension}"><text-find/></field>
@@ -136,7 +136,7 @@ under the License.
</drop-down>
</field>
<field name="phoneTitle" title="${uiLabelMap.PartyPrimaryPhone}" title-area-style="group-label"><display/></field>
- <field name="countryCode" title="${uiLabelMap.PartyCountryCode}"><text size="4" maxlength="10"/></field>
+ <field name="countryCode" title="${uiLabelMap.CommonCountryCode}"><text size="4" maxlength="10"/></field>
<field name="areaCode" title="${uiLabelMap.PartyAreaCode}"><text size="4" maxlength="10"/></field>
<field name="contactNumber" title="${uiLabelMap.PartyPhoneNumber}"><text size="15" maxlength="15"/></field>
<field name="extension" title="${uiLabelMap.PartyContactExt}"><text size="6" maxlength="10"/></field>
@@ -51,7 +51,7 @@ under the License.
</drop-down>
</field>
<field name="phoneTitle" title="${uiLabelMap.PartyPrimaryPhone}" title-area-style="group-label"><display/></field>
- <field name="countryCode" title="${uiLabelMap.PartyCountryCode}"><text size="4" maxlength="10"/></field>
+ <field name="countryCode" title="${uiLabelMap.CommonCountryCode}"><text size="4" maxlength="10"/></field>
<field name="areaCode" title="${uiLabelMap.PartyAreaCode}"><text size="4" maxlength="10"/></field>
<field name="contactNumber" title="${uiLabelMap.PartyPhoneNumber}"><text size="15" maxlength="15"/></field>
<field name="extension" title="${uiLabelMap.PartyContactExt}"><text size="6" maxlength="10"/></field>
@@ -4983,56 +4983,6 @@
<value xml:lang="vi">Không thể tạo mới mục đích này, một mục đích cùng loại đã tồn tại</value>
<value xml:lang="zh">无法创建新的目的,已经存在一个那样类型的目的了</value>
</property>
- <property key="CommonCountryCode">
- <value xml:lang="cs">Mezinárodní předvolba</value>
- <value xml:lang="de">Landesvorwahl</value>
- <value xml:lang="en">Country Code</value>
- <value xml:lang="es">Código de país</value>
- <value xml:lang="fr">Code pays</value>
- <value xml:lang="hi_IN">देश कोड</value>
- <value xml:lang="it">Codice paese</value>
- <value xml:lang="ja">国コード</value>
- <value xml:lang="nl">Land Kode</value>
- <value xml:lang="pt_BR">Código do país</value>
- <value xml:lang="pt_PT">Código do País</value>
- <value xml:lang="ro">Cod Tara</value>
- <value xml:lang="ru">Код страны</value>
- <value xml:lang="th">รหัสประเทศ</value>
- <value xml:lang="vi">Mã nước</value>
- <value xml:lang="zh">国家代码</value>
- <value xml:lang="zh_TW">國碼</value>
- </property>
- <property key="CommonCountryCodeMissing">
- <value xml:lang="de">Landesvorwahl fehlt</value>
- <value xml:lang="en">Country code is Missing</value>
- <value xml:lang="fr">Le code pays manque</value>
- <value xml:lang="hi_IN">देश कोड गायब है</value>
- <value xml:lang="it">Codice paese è mancante</value>
- <value xml:lang="ja">国コードが正しくありません</value>
- <value xml:lang="pt_BR">Código do país está em branco</value>
- <value xml:lang="vi">Mã nước chưa được nhập</value>
- <value xml:lang="zh">找不到国家代码</value>
- <value xml:lang="zh_TW">沒有國碼</value>
- </property>
- <property key="CommonCountryMissing">
- <value xml:lang="cs">Chybí země</value>
- <value xml:lang="de">Land fehlt</value>
- <value xml:lang="en">Country is Missing</value>
- <value xml:lang="es">Falta el País</value>
- <value xml:lang="fr">Pays absent</value>
- <value xml:lang="hi_IN">देश नही है</value>
- <value xml:lang="it">Paese mancante</value>
- <value xml:lang="ja">国が正しくありません</value>
- <value xml:lang="nl">Naam van het land mist</value>
- <value xml:lang="pt_BR">País está em branco</value>
- <value xml:lang="pt_PT">País em falta</value>
- <value xml:lang="ro">Tara lipseste </value>
- <value xml:lang="ru">Страна не указана</value>
- <value xml:lang="th">ไม่ได้ใส่ประเทศ</value>
- <value xml:lang="vi">Thông tin Đất nước chưa được nhập</value>
- <value xml:lang="zh">找不到国家</value>
- <value xml:lang="zh_TW">沒有國家</value>
- </property>
<property key="PartyCreateAddEmail">
<value xml:lang="de">Email zu Akteur erstellen/hinzufügen</value>
<value xml:lang="en">Create/Add Email to Party</value>
@@ -197,7 +197,7 @@ under the License.
</tr>
<tr>
<td class="label"></td>
- <td>[${uiLabelMap.PartyCountryCode}] [${uiLabelMap.PartyAreaCode}] [${uiLabelMap.PartyContactNumber}] [${uiLabelMap.PartyContactExt}]</td>
+ <td>[${uiLabelMap.CommonCountryCode}] [${uiLabelMap.PartyAreaCode}] [${uiLabelMap.PartyContactNumber}] [${uiLabelMap.PartyContactExt}]</td>
</tr>
<#elseif "EMAIL_ADDRESS" = mechMap.contactMechTypeId?if_exists>
<tr>
@@ -167,7 +167,7 @@ under the License.
<#if extInfo == "T">
<tr><td colspan="3"><hr /></td></tr>
<tr>
- <td class="label">${uiLabelMap.PartyCountryCode}</td>
+ <td class="label">${uiLabelMap.CommonCountryCode}</td>
<td><input type="text" name="countryCode" value="${parameters.countryCode?if_exists}"/></td>
</tr>
<tr>
@@ -457,25 +457,25 @@ under the License.
<drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down>
</field>
<field name="HomePhoneTitle" title="${uiLabelMap.PartyHomePhone}" title-area-style="group-label" widget-style="tooltip"><display description="${uiLabelMap.PartyPhoneNumberRequired}" also-hidden="false"/></field>
- <field name="USER_HOME_COUNTRY" title="${uiLabelMap.PartyCountryCode}"><text size="4" maxlength="10"/></field>
+ <field name="USER_HOME_COUNTRY" title="${uiLabelMap.CommonCountryCode}"><text size="4" maxlength="10"/></field>
<field name="USER_HOME_AREA" title="${uiLabelMap.PartyAreaCode}"><text size="4" maxlength="10"/></field>
<field name="USER_HOME_CONTACT" title="${uiLabelMap.PartyPhoneNumber}"><text size="15" maxlength="15"/></field>
<field name="USER_HOME_EXT" title="${uiLabelMap.PartyContactExt}"><text size="6" maxlength="10"/></field>
<field name="USER_HOME_ALLOW_SOL" title="${uiLabelMap.PartyContactAllowSolicitation}?"><drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down></field>
<field name="WorkPhoneTitle" title="${uiLabelMap.PartyContactWorkPhoneNumber}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
- <field name="USER_WORK_COUNTRY" title="${uiLabelMap.PartyCountryCode}"><text size="4" maxlength="10"/></field>
+ <field name="USER_WORK_COUNTRY" title="${uiLabelMap.CommonCountryCode}"><text size="4" maxlength="10"/></field>
<field name="USER_WORK_AREA" title="${uiLabelMap.PartyAreaCode}"><text size="4" maxlength="10"/></field>
<field name="USER_WORK_CONTACT" title="${uiLabelMap.PartyPhoneNumber}"><text size="15" maxlength="15"/></field>
<field name="USER_WORK_EXT" title="${uiLabelMap.PartyContactExt}"><text size="6" maxlength="10"/></field>
<field name="USER_WORK_ALLOW_SOL" title="${uiLabelMap.PartyContactAllowSolicitation}?"><drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down></field>
<field name="FaxPhoneTitle" title="${uiLabelMap.PartyContactFaxPhoneNumber}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
- <field name="USER_FAX_COUNTRY" title="${uiLabelMap.PartyCountryCode}"><text size="4" maxlength="10"/></field>
+ <field name="USER_FAX_COUNTRY" title="${uiLabelMap.CommonCountryCode}"><text size="4" maxlength="10"/></field>
<field name="USER_FAX_AREA" title="${uiLabelMap.PartyAreaCode}"><text size="4" maxlength="10"/></field>
<field name="USER_FAX_CONTACT" title="${uiLabelMap.PartyPhoneNumber}"><text size="15" maxlength="15"/></field>
<field name="USER_FAX_EXT" title="${uiLabelMap.PartyContactExt}"><text size="6" maxlength="10"/></field>
<field name="USER_FAX_ALLOW_SOL" title="${uiLabelMap.PartyContactAllowSolicitation}?"><drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down></field>
<field name="MobilePhoneTitle" title="${uiLabelMap.PartyContactMobilePhoneNumber}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
- <field name="USER_MOBILE_COUNTRY" title="${uiLabelMap.PartyCountryCode}"><text size="4" maxlength="10"/></field>
+ <field name="USER_MOBILE_COUNTRY" title="${uiLabelMap.CommonCountryCode}"><text size="4" maxlength="10"/></field>
<field name="USER_MOBILE_AREA" title="${uiLabelMap.PartyAreaCode}"><text size="4" maxlength="10"/></field>
<field name="USER_MOBILE_CONTACT" title="${uiLabelMap.PartyPhoneNumber}"><text size="15" maxlength="15"/></field>
<field name="USER_MOBILE_ALLOW_SOL" title="${uiLabelMap.PartyContactAllowSolicitation}?"><drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down></field>
@@ -215,7 +215,7 @@ under the License.
</tr>
<tr>
<td>&nbsp;</td>
- <td>[${uiLabelMap.PartyCountryCode}] [${uiLabelMap.PartyAreaCode}] [${uiLabelMap.PartyContactNumber}] [${uiLabelMap.PartyExtension}]</td>
+ <td>[${uiLabelMap.CommonCountryCode}] [${uiLabelMap.PartyAreaCode}] [${uiLabelMap.PartyContactNumber}] [${uiLabelMap.PartyExtension}]</td>
</tr>
<#elseif "EMAIL_ADDRESS" = mechMap.contactMechTypeId?if_exists>
<tr>
@@ -35,7 +35,7 @@ under the License.
<div>${uiLabelMap.ProductOriginDestinationPhoneId}</div>
<div>${uiLabelMap.ProductShipmentThirdPartyAccountNumber}</div>
<div>${uiLabelMap.ProductShipmentThirdPartyPostalCode}</div>
- <div>${uiLabelMap.ProductShipmentThirdPartyCountryCode}</div>
+ <div>${uiLabelMap.ProductShipmentThirdCommonCountryCode}</div>
</td>
<td valign="top">
<div>${uiLabelMap.ProductShipmentFedexHomeDeliveryTypeDate}</div>
@@ -2071,6 +2071,56 @@
<value xml:lang="zh-CN">国家</value>
<value xml:lang="zh-TW">國家</value>
</property>
+ <property key="CommonCountryCode">
+ <value xml:lang="cs">Mezinárodní předvolba</value>
+ <value xml:lang="de">Landesvorwahl</value>
+ <value xml:lang="en">Country Code</value>
+ <value xml:lang="es">Código de país</value>
+ <value xml:lang="fr">Code pays</value>
+ <value xml:lang="hi_IN">देश कोड</value>
+ <value xml:lang="it">Codice paese</value>
+ <value xml:lang="ja">国コード</value>
+ <value xml:lang="nl">Land Kode</value>
+ <value xml:lang="pt_BR">Código do país</value>
+ <value xml:lang="pt_PT">Código do País</value>
+ <value xml:lang="ro">Cod Tara</value>
+ <value xml:lang="ru">Код страны</value>
+ <value xml:lang="th">รหัสประเทศ</value>
+ <value xml:lang="vi">Mã nước</value>
+ <value xml:lang="zh">国家代码</value>
+ <value xml:lang="zh_TW">國碼</value>
+ </property>
+ <property key="CommonCountryCodeMissing">
+ <value xml:lang="de">Landesvorwahl fehlt</value>
+ <value xml:lang="en">Country code is Missing</value>
+ <value xml:lang="fr">Le code pays manque</value>
+ <value xml:lang="hi_IN">देश कोड गायब है</value>
+ <value xml:lang="it">Codice paese è mancante</value>
+ <value xml:lang="ja">国コードが正しくありません</value>
+ <value xml:lang="pt_BR">Código do país está em branco</value>
+ <value xml:lang="vi">Mã nước chưa được nhập</value>
+ <value xml:lang="zh">找不到国家代码</value>
+ <value xml:lang="zh_TW">沒有國碼</value>
+ </property>
+ <property key="CommonCountryMissing">
+ <value xml:lang="cs">Chybí země</value>
+ <value xml:lang="de">Land fehlt</value>
+ <value xml:lang="en">Country is Missing</value>
+ <value xml:lang="es">Falta el País</value>
+ <value xml:lang="fr">Pays absent</value>
+ <value xml:lang="hi_IN">देश नही है</value>
+ <value xml:lang="it">Paese mancante</value>
+ <value xml:lang="ja">国が正しくありません</value>
+ <value xml:lang="nl">Naam van het land mist</value>
+ <value xml:lang="pt_BR">País está em branco</value>
+ <value xml:lang="pt_PT">País em falta</value>
+ <value xml:lang="ro">Tara lipseste </value>
+ <value xml:lang="ru">Страна не указана</value>
+ <value xml:lang="th">ไม่ได้ใส่ประเทศ</value>
+ <value xml:lang="vi">Thông tin Đất nước chưa được nhập</value>
+ <value xml:lang="zh">找不到国家</value>
+ <value xml:lang="zh_TW">沒有國家</value>
+ </property>
<property key="CommonCounty">
<value xml:lang="ar">ولاية</value>
<value xml:lang="de">Kreis/Bezirk</value>
@@ -205,7 +205,7 @@ under the License.
<tr>
<td align="right" valign="top"></td>
<td>&nbsp;</td>
- <td>[${uiLabelMap.PartyCountryCode}] [${uiLabelMap.PartyAreaCode}] [${uiLabelMap.PartyContactNumber}] [${uiLabelMap.PartyExtension}]</td>
+ <td>[${uiLabelMap.CommonCountryCode}] [${uiLabelMap.PartyAreaCode}] [${uiLabelMap.PartyContactNumber}] [${uiLabelMap.PartyExtension}]</td>
</tr>
<#elseif contactMechTypeId = "EMAIL_ADDRESS">
<tr>
Oops, something went wrong.

0 comments on commit 79bd163

Please sign in to comment.