OFBiz › OFBiz - Commits

svn commit: r1447664 - in /ofbiz/trunk: applications/commonext/widget/ofbizsetup/ applications/humanres/webapp/humanres/humanres/ applications/humanres/widget/forms/ applications/marketing/webapp/sfa/contact/ applications/marketing/webapp/sfa/lead/ app...

‹ Previous Topic Next Topic ›
 
classic Classic list List threaded Threaded
♦
♦
 1 message Options
jleroux@apache.org
Reply | Threaded
Open this post in threaded view
♦
♦
|

svn commit: r1447664 - in /ofbiz/trunk: applications/commonext/widget/ofbizsetup/ applications/humanres/webapp/humanres/humanres/ applications/humanres/widget/forms/ applications/marketing/webapp/sfa/contact/ applications/marketing/webapp/sfa/lead/ app...

jleroux@apache.org
Author: jleroux
Date: Tue Feb 19 10:55:10 2013
New Revision: 1447664

URL: http://svn.apache.org/r1447664
Log:
A slightly modified patch from Gil Portenseigne for "Missing PartyCountryCode 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




Modified:
    ofbiz/trunk/applications/commonext/widget/ofbizsetup/SetupForms.xml
    ofbiz/trunk/applications/humanres/webapp/humanres/humanres/findEmployee.ftl
    ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml
    ofbiz/trunk/applications/marketing/webapp/sfa/contact/mergeContacts.ftl
    ofbiz/trunk/applications/marketing/webapp/sfa/lead/mergeLeads.ftl
    ofbiz/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml
    ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml
    ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml
    ofbiz/trunk/applications/party/config/PartyUiLabels.xml
    ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl
    ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl
    ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml
    ofbiz/trunk/applications/product/webapp/facility/facility/EditContactMech.ftl
    ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentRouteSegments.ftl
    ofbiz/trunk/framework/common/config/CommonUiLabels.xml
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCustSettings.ftl

Modified: ofbiz/trunk/applications/commonext/widget/ofbizsetup/SetupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/widget/ofbizsetup/SetupForms.xml?rev=1447664&r1=1447663&r2=1447664&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/widget/ofbizsetup/SetupForms.xml (original)
+++ ofbiz/trunk/applications/commonext/widget/ofbizsetup/SetupForms.xml Tue Feb 19 10:55:10 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>

Modified: ofbiz/trunk/applications/humanres/webapp/humanres/humanres/findEmployee.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/webapp/humanres/humanres/findEmployee.ftl?rev=1447664&r1=1447663&r2=1447664&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/webapp/humanres/humanres/findEmployee.ftl (original)
+++ ofbiz/trunk/applications/humanres/webapp/humanres/humanres/findEmployee.ftl Tue Feb 19 10:55:10 2013
@@ -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>

Modified: ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml?rev=1447664&r1=1447663&r2=1447664&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/EmployeeForms.xml Tue Feb 19 10:55:10 2013
@@ -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>

Modified: ofbiz/trunk/applications/marketing/webapp/sfa/contact/mergeContacts.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/sfa/contact/mergeContacts.ftl?rev=1447664&r1=1447663&r2=1447664&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/webapp/sfa/contact/mergeContacts.ftl (original)
+++ ofbiz/trunk/applications/marketing/webapp/sfa/contact/mergeContacts.ftl Tue Feb 19 10:55:10 2013
@@ -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>

Modified: ofbiz/trunk/applications/marketing/webapp/sfa/lead/mergeLeads.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/sfa/lead/mergeLeads.ftl?rev=1447664&r1=1447663&r2=1447664&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/webapp/sfa/lead/mergeLeads.ftl (original)
+++ ofbiz/trunk/applications/marketing/webapp/sfa/lead/mergeLeads.ftl Tue Feb 19 10:55:10 2013
@@ -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>

Modified: ofbiz/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml?rev=1447664&r1=1447663&r2=1447664&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml Tue Feb 19 10:55:10 2013
@@ -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>

Modified: ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml?rev=1447664&r1=1447663&r2=1447664&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml Tue Feb 19 10:55:10 2013
@@ -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>

Modified: ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml?rev=1447664&r1=1447663&r2=1447664&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml Tue Feb 19 10:55:10 2013
@@ -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>

Modified: ofbiz/trunk/applications/party/config/PartyUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/config/PartyUiLabels.xml?rev=1447664&r1=1447663&r2=1447664&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/config/PartyUiLabels.xml (original)
+++ ofbiz/trunk/applications/party/config/PartyUiLabels.xml Tue Feb 19 10:55:10 2013
@@ -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>

Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl?rev=1447664&r1=1447663&r2=1447664&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl Tue Feb 19 10:55:10 2013
@@ -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>

Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl?rev=1447664&r1=1447663&r2=1447664&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl Tue Feb 19 10:55:10 2013
@@ -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>

Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml?rev=1447664&r1=1447663&r2=1447664&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml Tue Feb 19 10:55:10 2013
@@ -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>

Modified: ofbiz/trunk/applications/product/webapp/facility/facility/EditContactMech.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/EditContactMech.ftl?rev=1447664&r1=1447663&r2=1447664&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/EditContactMech.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/EditContactMech.ftl Tue Feb 19 10:55:10 2013
@@ -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>

Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentRouteSegments.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentRouteSegments.ftl?rev=1447664&r1=1447663&r2=1447664&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentRouteSegments.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentRouteSegments.ftl Tue Feb 19 10:55:10 2013
@@ -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>

Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.xml?rev=1447664&r1=1447663&r2=1447664&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonUiLabels.xml Tue Feb 19 10:55:10 2013
@@ -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>

Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl?rev=1447664&r1=1447663&r2=1447664&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl Tue Feb 19 10:55:10 2013
@@ -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>

Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCustSettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCustSettings.ftl?rev=1447664&r1=1447663&r2=1447664&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCustSettings.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCustSettings.ftl Tue Feb 19 10:55:10 2013
@@ -91,7 +91,7 @@ under the License.
               <tr>
                 <td width="26%" align="right" valign="top"><div></div></td>
                 <td width="2%">&nbsp;</td>
-                <td width="72%"><div>[${uiLabelMap.PartyCountryCode}] [${uiLabelMap.PartyAreaCode}] [${uiLabelMap.PartyContactNumber}] [${uiLabelMap.PartyExtension}]</div></td>
+                <td width="72%"><div>[${uiLabelMap.CommonCountryCode}] [${uiLabelMap.PartyAreaCode}] [${uiLabelMap.PartyContactNumber}] [${uiLabelMap.PartyExtension}]</div></td>
               </tr>
               <tr>
                 <td width="10%" align="right"><div>${uiLabelMap.PartyHomePhone}</div></td>


Free forum by Nabble Edit this page