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

Fix some missing translations in merge placeholder display

Browse Source
This commit is contained in:
nathan 2022-10-11 15:34:25 -06:00
parent b43dd8f2c3
commit 241b5ec839
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addressbook/lang/egw_de.lang
View File

@ -419,6 +419,7 @@ prevent deleting of contacts admin de Das Löschen von Adressen verhindern
private address addressbook de Privatadresse
private custom fields addressbook de Private Benutzerdefinierte Felder
public key addressbook de öffentlicher Schlüssel
public sharing url addressbook de Geteilt mit Link
publish into groups: addressbook de In folgenden Gruppen veröffentlichen:
read a list / search for entries. addressbook de Lese die Liste / Suche nach Einträgen
read a list of entries. addressbook de Liest eine Liste von Einträgen.

1
addressbook/lang/egw_en.lang
View File

@ -419,6 +419,7 @@ prevent deleting of contacts admin en Prevent deleting of contacts
private address addressbook en Private address
private custom fields addressbook en Private custom fields
public key addressbook en Public key
public sharing url addressbook en Public sharing URL
publish into groups: addressbook en Publish into groups:
read a list / search for entries. addressbook en Read a list / search for entries.
read a list of entries. addressbook en Read a list of entries.

8
api/src/Contacts/Merge.php
View File

@ -203,7 +203,7 @@ class Merge extends Api\Storage\Merge
$group = 'private';
break;
case 'tel_work':
$group = 'phone';
$group = 'phone numbers';
break;
case 'email':
case 'email_home':
@ -232,16 +232,16 @@ class Merge extends Api\Storage\Merge
// Correctly formatted address by country / preference
$placeholders['business'][] = [
'value' => $this->prefix($prefix, 'adr_one_formatted', '{'),
'label' => "Formatted business address"
'label' => lang('Formatted business address')
];
$placeholders['private'][] = [
'value' => $this->prefix($prefix, 'adr_two_formatted', '{'),
'label' => "Formatted private address"
'label' => lang('Formatted private address')
];
$placeholders['EPL only'][] = [
'value' => $this->prefix($prefix, 'share', '{'),
'label' => 'Public sharing URL'
'label' => lang('Public sharing URL')
];
$this->add_customfield_placeholders($placeholders, $prefix);

4
api/src/Storage/Merge.php
View File

@ -3118,7 +3118,7 @@ abstract class Merge
}
else
{
$placeholders['customfields'][] = [
$placeholders['custom fields'][] = [
'value' => $this->prefix($prefix, '#' . $name, '{'),
'label' => $field['label'] . ($field['type'] == 'select-account' ? '*' : '')
];
@ -3294,7 +3294,7 @@ abstract class Merge
else
{
$new_list[] = [
'title' => ($title_prefix ? $title_prefix . ': ' : '') . $group_title,
'title' => ($title_prefix ? lang($title_prefix) . ': ' : '') . lang($group_title),
'placeholders' => $group_placeholders
];
}