From f6828a820585130deb9f82989ce0e5f3864abb6a Mon Sep 17 00:00:00 2001 From: nathan Date: Tue, 28 Sep 2021 10:16:57 -0600 Subject: [PATCH] Placeholder dialog: Add "name, email, phone snippet", fix some more missing translation issues --- api/js/etemplate/et2_widget_placeholder.ts | 5 +++-- api/templates/default/placeholder_snippet.xet | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/api/js/etemplate/et2_widget_placeholder.ts b/api/js/etemplate/et2_widget_placeholder.ts index 3ae08beca1..fe9696f344 100644 --- a/api/js/etemplate/et2_widget_placeholder.ts +++ b/api/js/etemplate/et2_widget_placeholder.ts @@ -368,8 +368,9 @@ export class et2_placeholder_snippet_select extends et2_placeholder_select static placeholders = { "addressbook": { "addresses": { - "{{n_fn}}\n{{adr_one_street}}{{NELF adr_one_street2}}\n{{adr_one_formatted}}": "Work address", + "{{org_name}}\n{{n_fn}}\n{{adr_one_street}}{{NELF adr_one_street2}}\n{{adr_one_formatted}}": "Business address", "{{n_fn}}\n{{adr_two_street}}{{NELF adr_two_street2}}\n{{adr_two_formatted}}": "Home address", + "{{n_fn}}\n{{email}}\n{{tel_work}}": "Name, email, phone" } } }; @@ -490,7 +491,7 @@ export class et2_placeholder_snippet_select extends et2_placeholder_select options.push( { value: key, - label: et2_placeholder_snippet_select.placeholders[appname][group][key] + label: this.egw().lang(et2_placeholder_snippet_select.placeholders[appname][group][key]) }); }); return options; diff --git a/api/templates/default/placeholder_snippet.xet b/api/templates/default/placeholder_snippet.xet index 504c51c7d7..1644649f3d 100644 --- a/api/templates/default/placeholder_snippet.xet +++ b/api/templates/default/placeholder_snippet.xet @@ -9,7 +9,7 @@