holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix export when exporting both country code and country name

Browse Source
This commit is contained in:
Nathan Gray 2011-03-14 19:37:59 +00:00
parent 928a71397d
commit e1c084ee0c
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addressbook/inc/class.addressbook_bo.inc.php
View File

@ -211,7 +211,7 @@ class addressbook_bo extends addressbook_so
'adr_one_region' => lang('state').' ('.lang('business').')',
'adr_one_postalcode' => lang('zip code').' ('.lang('business').')',
'adr_one_countryname' => lang('country').' ('.lang('business').')',
'adr_one_countrycode' => lang('country').' ('.lang('business').')',
'adr_one_countrycode' => lang('country code').' ('.lang('business').')',
'label' => lang('label'),
'adr_two_street' => lang('street').' ('.lang('private').')',
'adr_two_street2' => lang('address line 2').' ('.lang('private').')',
@ -219,7 +219,7 @@ class addressbook_bo extends addressbook_so
'adr_two_region' => lang('state').' ('.lang('private').')',
'adr_two_postalcode' => lang('zip code').' ('.lang('private').')',
'adr_two_countryname' => lang('country').' ('.lang('private').')',
'adr_two_countrycode' => lang('country').' ('.lang('private').')',
'adr_two_countrycode' => lang('country code').' ('.lang('private').')',
'tel_work' => lang('work phone'),
'tel_cell' => lang('mobile phone'),
'tel_fax' => lang('fax').' ('.lang('business').')',

1
addressbook/lang/egw_en.lang
View File

@ -124,6 +124,7 @@ copied by %1, from record #%2. addressbook en Copied by %1, from record #%2.
copy a contact and edit the copy addressbook en Copy a contact and edit the copy
copy your changes to the clipboard, %1reload the entry%2 and merge them. addressbook en Copy your changes to the clipboard, %1reload the entry%2 and merge them.
country common en Country
country code addressbook en Country code
create new links addressbook en Create new links
created addressbook en Created
credit addressbook en Credit

6
addressbook/setup/importexport_default.xml
View File

@ -41,7 +41,7 @@
<entry type="string" name="adr_one_region">State (Business)</entry>
<entry type="string" name="adr_one_postalcode">ZIP Code (Business)</entry>
<entry type="string" name="adr_one_countryname">Country (Business)</entry>
<entry type="string" name="adr_one_countrycode">Country (Business)</entry>
<entry type="string" name="adr_one_countrycode">country code (Business)</entry>
<entry type="string" name="label">Label</entry>
<entry type="string" name="adr_two_street">Street (Private)</entry>
<entry type="string" name="adr_two_street2">Address Line 2 (Private)</entry>
@ -49,7 +49,7 @@
<entry type="string" name="adr_two_region">State (Private)</entry>
<entry type="string" name="adr_two_postalcode">ZIP Code (Private)</entry>
<entry type="string" name="adr_two_countryname">Country (Private)</entry>
<entry type="string" name="adr_two_countrycode">Country (Private)</entry>
<entry type="string" name="adr_two_countrycode">country code (Private)</entry>
<entry type="string" name="tel_work">Work Phone</entry>
<entry type="string" name="tel_cell">Mobile Phone</entry>
<entry type="string" name="tel_fax">Fax (Business)</entry>
@ -84,6 +84,7 @@
<entry type="string" name="convert">1</entry>
<entry type="string" name="explode_multiselects"/>
</entry>
<entry type="string" name="modified">2011-03-14 13:31:29</entry>
</entry>
<entry type="array" name="import-addressbook">
<entry type="string" name="name">import-addressbook</entry>
@ -245,6 +246,7 @@
<entry type="string" name="contact_owner">-1</entry>
<entry type="string" name="change_owner">0</entry>
</entry>
<entry type="string" name="modified">2011-02-03 11:02:34</entry>
</entry>
</entry>
</entry>