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

* Api: Merge placeholder that checks for EMPTY {{IF fieldname~EMPTY~True text~False text}}

Browse Source 
EMPTY check was already there, just adding it explicitly into the placeholder list
This commit is contained in:
nathan 2022-04-12 09:04:18 -06:00
parent e3be42721e
commit 75e573b6a1
3 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/lang/egw_de.lang
View File

@ -260,6 +260,7 @@ change owner common de Eigentümer ändern
changed common de Geändert changed common de Geändert
charset common de UTF-8 charset common de UTF-8
check all common de Alle auswählen check all common de Alle auswählen
check for empty values in if statements. example {{if url~empty~~website:}} - if url is not empty, writes "website:" common de Sie können auch auf EMPTY prüfen in If-Abfragen. Beispiel {{IF url~EMPTY~~Webseite: }}{{IF url~EMPTY~~url}} - fügt Webseite & URL ein, falls das Feld url nicht leer ist.
check if content should only be displayed but not altered (the content is not send back then!) common de abhaken wenn der Inhalt nur angezeigt aber nicht geändert werden soll (der Inhalt wird dann nicht zurückgesendet!) check if content should only be displayed but not altered (the content is not send back then!) common de abhaken wenn der Inhalt nur angezeigt aber nicht geändert werden soll (der Inhalt wird dann nicht zurückgesendet!)
check if field has to be filled by user common de abhaken wenn das Eingabefeld vom Benutzer zwingend ausgefüllt werden muss check if field has to be filled by user common de abhaken wenn das Eingabefeld vom Benutzer zwingend ausgefüllt werden muss
check installation common de Installation überprüfen check installation common de Installation überprüfen

1
api/lang/egw_en.lang
View File

@ -260,6 +260,7 @@ change owner common en Change Owner
changed common en Changed changed common en Changed
charset common en utf-8 charset common en utf-8
check all common en Check all check all common en Check all
check for empty values in if statements. example {{if url~empty~~website:}} - if url is not empty, writes "website:" common en Check for empty values in IF statements. Example {{IF url~EMPTY~~Website:}} - If url is not empty, writes "Website:"
check if content should only be displayed but not altered (the content is not send back then!) common en Should content be displayed only, but not altered. check if content should only be displayed but not altered (the content is not send back then!) common en Should content be displayed only, but not altered.
check if field has to be filled by user common en Check if field has to be filled by user check if field has to be filled by user common en Check if field has to be filled by user
check installation common en Check installation check installation common en Check installation

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

@ -2968,36 +2968,37 @@ abstract class Merge
{ {
return array( return array(
// Link to current entry // Link to current entry
'link' => lang('URL of current record'), 'link' => lang('URL of current record'),
'link/href' => lang('HTML link to the current record'), 'link/href' => lang('HTML link to the current record'),
'link/title' => lang('Link title of current record'), 'link/title' => lang('Link title of current record'),
// Link system - linked entries // Link system - linked entries
'links' => lang('Titles of any entries linked to the current record, excluding attached files'), 'links' => lang('Titles of any entries linked to the current record, excluding attached files'),
'links/href' => lang('HTML links to any entries linked to the current record, excluding attached files'), 'links/href' => lang('HTML links to any entries linked to the current record, excluding attached files'),
'links/url' => lang('URLs of any entries linked to the current record, excluding attached files'), 'links/url' => lang('URLs of any entries linked to the current record, excluding attached files'),
'attachments' => lang('List of files linked to the current record'), 'attachments' => lang('List of files linked to the current record'),
'links_attachments' => lang('Links and attached files'), 'links_attachments' => lang('Links and attached files'),
'links/[appname]' => lang('Links to specified application. Example: {{links/infolog}}'), 'links/[appname]' => lang('Links to specified application. Example: {{links/infolog}}'),
// General information // General information
'date' => lang('Date'), 'date' => lang('Date'),
'datetime' => lang('Date + time'), 'datetime' => lang('Date + time'),
'time' => lang('Time'), 'time' => lang('Time'),
'user/n_fn' => lang('Name of current user, all other contact fields are valid too'), 'user/n_fn' => lang('Name of current user, all other contact fields are valid too'),
'user/account_lid' => lang('Username'), 'user/account_lid' => lang('Username'),
// Merge control // Merge control
'pagerepeat' => lang('For serial letter use this tag. Put the content, you want to repeat between two Tags.'), 'pagerepeat' => lang('For serial letter use this tag. Put the content, you want to repeat between two Tags.'),
'label' => lang('Use this tag for addresslabels. Put the content, you want to repeat, between two tags.'), 'label' => lang('Use this tag for addresslabels. Put the content, you want to repeat, between two tags.'),
'labelplacement' => lang('Tag to mark positions for address labels'), 'labelplacement' => lang('Tag to mark positions for address labels'),
// Commands // Commands
'IF fieldname' => lang('Example {{IF n_prefix~Mr~Hello Mr.~Hello Ms.}} - search the field "n_prefix", for "Mr", if found, write Hello Mr., else write Hello Ms.'), 'IF fieldname' => lang('Example {{IF n_prefix~Mr~Hello Mr.~Hello Ms.}} - search the field "n_prefix", for "Mr", if found, write Hello Mr., else write Hello Ms.'),
'NELF' => lang('Example {{NELF role}} - if field role is not empty, you will get a new line with the value of field role'), 'IF fieldname~EMPTY~True~False' => lang('Check for empty values in IF statements. Example {{IF url~EMPTY~~Website:}} - If url is not empty, writes "Website:"'),
'NENVLF' => lang('Example {{NENVLF role}} - if field role is not empty, set a LF without any value of the field'), 'NELF' => lang('Example {{NELF role}} - if field role is not empty, you will get a new line with the value of field role'),
'LETTERPREFIX' => lang('Example {{LETTERPREFIX}} - Gives a letter prefix without double spaces, if the title is emty for example'), 'NENVLF' => lang('Example {{NENVLF role}} - if field role is not empty, set a LF without any value of the field'),
'LETTERPREFIXCUSTOM' => lang('Example {{LETTERPREFIXCUSTOM n_prefix title n_family}} - Example: Mr Dr. James Miller'), 'LETTERPREFIX' => lang('Example {{LETTERPREFIX}} - Gives a letter prefix without double spaces, if the title is emty for example'),
'LETTERPREFIXCUSTOM' => lang('Example {{LETTERPREFIXCUSTOM n_prefix title n_family}} - Example: Mr Dr. James Miller'),
); );
} }