mirror of
https://github.com/owncloudarchive/contacts.git
synced 2025-01-30 19:52:17 +01:00
Fix translations, empty properties
This commit is contained in:
parent
0490c8138f
commit
fb96093964
@ -44,10 +44,14 @@ $vcard = new Sabre_VObject_Component('VCARD');
|
||||
$vcard->add(new Sabre_VObject_Property('FN',$fn));
|
||||
$vcard->add(new Sabre_VObject_Property('UID',OC_Contacts_VCard::createUID()));
|
||||
foreach(array('ADR', 'TEL', 'EMAIL', 'ORG') as $propname){
|
||||
if( !( isset( $values[$propname] ) && $values[$propname] )){
|
||||
continue;
|
||||
}
|
||||
$value = $values[$propname];
|
||||
if (isset($parameters[$propname])){
|
||||
if( isset( $parameters[$propname] ) && count$parameters[$propname] ){
|
||||
$prop_parameters = $parameters[$propname];
|
||||
} else {
|
||||
}
|
||||
else{
|
||||
$prop_parameters = array();
|
||||
}
|
||||
OC_Contacts_VCard::addVCardProperty($vcard, $propname, $value, $prop_parameters);
|
||||
|
@ -65,7 +65,6 @@ foreach( $openaddressbooks as $addressbook ){
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
usort($contacts,'contacts_namesort');
|
||||
$details = array();
|
||||
|
||||
|
@ -14,8 +14,8 @@
|
||||
<label for="ADR"><?php echo $l->t('Address'); ?></label>
|
||||
<div id="contacts_addresspart">
|
||||
<select id="ADR" name="parameters[ADR][TYPE]" size="1">
|
||||
<option value="adr_work"><?php echo $l->t('Work'); ?></option>
|
||||
<option value="adr_home" selected="selected"><?php echo $l->t('Home'); ?></option>
|
||||
<option value="work"><?php echo $l->t('Work'); ?></option>
|
||||
<option value="home" selected="selected"><?php echo $l->t('Home'); ?></option>
|
||||
</select>
|
||||
<p><label><?php echo $l->t('PO Box'); ?></label> <input type="text" name="value[ADR][0]" value=""></p>
|
||||
<p><label><?php echo $l->t('Extended'); ?></label> <input type="text" name="value[ADR][1]" value=""></p>
|
||||
|
@ -14,8 +14,8 @@
|
||||
<div id="contacts_addcontactsparts" style="display:none;">
|
||||
<div id="contacts_addresspart">
|
||||
<select name="parameters[TYPE]" size="1">
|
||||
<option value="adr_work"><?php echo $l->t('Work'); ?></option>
|
||||
<option value="adr_home" selected="selected"><?php echo $l->t('Home'); ?></option>
|
||||
<option value="work"><?php echo $l->t('Work'); ?></option>
|
||||
<option value="home" selected="selected"><?php echo $l->t('Home'); ?></option>
|
||||
</select>
|
||||
<p><label><?php echo $l->t('PO Box'); ?></label> <input type="text" name="value[0]" value=""></p>
|
||||
<p><label><?php echo $l->t('Extended'); ?></label> <input type="text" name="value[1]" value=""></p>
|
||||
|
@ -30,7 +30,7 @@
|
||||
<td class="contacts_details_right">
|
||||
<?php echo $_['property']['value']; ?>
|
||||
<?php if(isset($_['property']['parameters']['TYPE'])): ?>
|
||||
(<?php echo strtolower($_['property']['parameters']['TYPE']); ?>)
|
||||
(<?php echo $l->t(ucwords(str_replace('cell','mobile',strtolower($_['property']['parameters']['TYPE'])))); ?>)
|
||||
<?php endif; ?>
|
||||
<span style="display:none;" data-use="edit"><img class="svg action" src="<?php echo image_path('', 'actions/rename.svg'); ?>" /></span>
|
||||
<span style="display:none;" data-use="delete"><img class="svg action" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></span>
|
||||
@ -40,7 +40,7 @@
|
||||
<?php echo $l->t('Address'); ?>
|
||||
<?php if(isset($_['property']['parameters']['TYPE'])): ?>
|
||||
<br>
|
||||
(<?php echo strtolower($_['property']['parameters']['TYPE']); ?>)
|
||||
(<?php echo $l->t(ucwords($_['property']['parameters']['TYPE'])); ?>)
|
||||
<?php endif; ?>
|
||||
</td>
|
||||
<td class="contacts_details_right">
|
||||
|
Loading…
x
Reference in New Issue
Block a user