From c50fd8e6bf551d5070210d4e8e6ca35571d7664b Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Mon, 4 May 2020 09:25:32 +0200 Subject: [PATCH] * API: new data-minimizing account display options "Firstname Inital" and "Firstname [ID]" --- api/lang/egw_bg.lang | 1 + api/lang/egw_ca.lang | 2 ++ api/lang/egw_cs.lang | 2 ++ api/lang/egw_da.lang | 1 + api/lang/egw_de.lang | 2 ++ api/lang/egw_el.lang | 2 ++ api/lang/egw_en.lang | 2 ++ api/lang/egw_es-es.lang | 2 ++ api/lang/egw_et.lang | 1 + api/lang/egw_eu.lang | 1 + api/lang/egw_fa.lang | 1 + api/lang/egw_fi.lang | 2 ++ api/lang/egw_fr.lang | 2 ++ api/lang/egw_hr.lang | 1 + api/lang/egw_hu.lang | 2 ++ api/lang/egw_id.lang | 2 ++ api/lang/egw_it.lang | 2 ++ api/lang/egw_iw.lang | 1 + api/lang/egw_ja.lang | 2 ++ api/lang/egw_lo.lang | 2 ++ api/lang/egw_lv.lang | 1 + api/lang/egw_nl.lang | 2 ++ api/lang/egw_no.lang | 1 + api/lang/egw_pl.lang | 2 ++ api/lang/egw_pt-br.lang | 2 ++ api/lang/egw_pt.lang | 1 + api/lang/egw_ru.lang | 2 ++ api/lang/egw_sk.lang | 2 ++ api/lang/egw_sl.lang | 2 ++ api/lang/egw_sv.lang | 2 ++ api/lang/egw_uk.lang | 1 + api/lang/egw_zh-tw.lang | 2 ++ api/lang/egw_zh.lang | 2 ++ api/src/Accounts.php | 7 +++++++ preferences/inc/class.preferences_hooks.inc.php | 2 ++ 35 files changed, 64 insertions(+) diff --git a/api/lang/egw_bg.lang b/api/lang/egw_bg.lang index 8d4d866ac3..924070195e 100644 --- a/api/lang/egw_bg.lang +++ b/api/lang/egw_bg.lang @@ -798,3 +798,4 @@ update a single entry by passing the fields. common bg Актуализация view this linked entry in its application common bg показва свързания запис в съотв. приложение wk common bg Седм. you can respond by visiting: common bg За преглед посетете: +id common bg Документ за самоличност / ID diff --git a/api/lang/egw_ca.lang b/api/lang/egw_ca.lang index fc17c888b6..96a28048a2 100644 --- a/api/lang/egw_ca.lang +++ b/api/lang/egw_ca.lang @@ -1045,3 +1045,5 @@ writes a 'etemplates.inc.php' file (for application in name) in the setup-dir of xml-file to import common ca fichero xml a importar xslt template common ca Plantilla XSLT year common ca Año +initial common ca Inicial +id common ca id diff --git a/api/lang/egw_cs.lang b/api/lang/egw_cs.lang index 7148972e10..5d8bfcb200 100644 --- a/api/lang/egw_cs.lang +++ b/api/lang/egw_cs.lang @@ -1466,3 +1466,5 @@ your settings have been updated common cs Vaše nastavení byla zaktualizována zambia common cs ZAMBIE zimbabwe common cs ZIMBABWE zoom common cs Lupa +initial common cs Počáteční +id common cs ID diff --git a/api/lang/egw_da.lang b/api/lang/egw_da.lang index ada95b7a44..21c52f6858 100644 --- a/api/lang/egw_da.lang +++ b/api/lang/egw_da.lang @@ -699,3 +699,4 @@ update a single entry by passing the fields. common da opdater et enkelt element upload common da Upload view this linked entry in its application common da se det linkede emne i dets program wk common da Uge +id common da ID diff --git a/api/lang/egw_de.lang b/api/lang/egw_de.lang index 2c4e1abd30..e3f62f4386 100644 --- a/api/lang/egw_de.lang +++ b/api/lang/egw_de.lang @@ -1546,3 +1546,5 @@ your settings have been updated common de Ihre Einstellungen wurden aktualisiert zambia common de ZAMBIA zimbabwe common de ZIMBABWE zoom common de Zoomen +initial common de Anfangsbuchstabe +id common de ID diff --git a/api/lang/egw_el.lang b/api/lang/egw_el.lang index 07a64639a0..7c3f19a937 100644 --- a/api/lang/egw_el.lang +++ b/api/lang/egw_el.lang @@ -763,3 +763,5 @@ update a single entry by passing the fields. common el Ενημέρωση συγ view this linked entry in its application common el εμφάνιση αυτής της συνδεδεμένης καταχώρησης στην αίτησή της wk common el Εβδ you can respond by visiting: common el Για να το δείτε επισκεφθείτε: +initial common el Αρχικό +id common el Id diff --git a/api/lang/egw_en.lang b/api/lang/egw_en.lang index 61bf09c55e..712abf77a4 100644 --- a/api/lang/egw_en.lang +++ b/api/lang/egw_en.lang @@ -1551,3 +1551,5 @@ your settings have been updated common en Your settings have been updated. zambia common en ZAMBIA zimbabwe common en ZIMBABWE zoom common en Zoom +initial common en Initial +id common en ID diff --git a/api/lang/egw_es-es.lang b/api/lang/egw_es-es.lang index 8401ef5784..8d47297277 100644 --- a/api/lang/egw_es-es.lang +++ b/api/lang/egw_es-es.lang @@ -1527,3 +1527,5 @@ your settings have been updated common es-es Sus preferencias fueron actualizada zambia common es-es ZAMBIA zimbabwe common es-es ZIMBAWE zoom common es-es Escala +initial common es-es Inicial +id common es-es ID diff --git a/api/lang/egw_et.lang b/api/lang/egw_et.lang index f3f7edd3b3..1916336ad0 100644 --- a/api/lang/egw_et.lang +++ b/api/lang/egw_et.lang @@ -597,3 +597,4 @@ write langfile common et Kirjuta Keel write tables common et Kirjuta Tabelid year common et Aasta you can respond by visiting: common et Sa saad vastata külastates: +id common et ID diff --git a/api/lang/egw_eu.lang b/api/lang/egw_eu.lang index c0dc465e11..32bdfb23c4 100644 --- a/api/lang/egw_eu.lang +++ b/api/lang/egw_eu.lang @@ -838,3 +838,4 @@ update a single entry by passing the fields. common eu Eguneratu sarrera bakarra upload common eu Kargatu view this linked entry in its application common eu zure aplikazioarekin lotura duen sarrera hau ikusi wk common eu Astea +id common eu Id diff --git a/api/lang/egw_fa.lang b/api/lang/egw_fa.lang index abc114bbe4..3b80e3d7e9 100644 --- a/api/lang/egw_fa.lang +++ b/api/lang/egw_fa.lang @@ -928,3 +928,4 @@ writes a 'etemplates.inc.php' file (for application in name) in the setup-dir of xml-file to import common fa پرونده xml برای ورود xslt template common fa فرم XSLT year common fa سال +id common fa کد diff --git a/api/lang/egw_fi.lang b/api/lang/egw_fi.lang index 25d3a26719..26b3e724af 100644 --- a/api/lang/egw_fi.lang +++ b/api/lang/egw_fi.lang @@ -1277,3 +1277,5 @@ you are not allowed to export more than %1 entries! common fi Sinulla ei ole rii you can respond by visiting: common fi Voit vastata vierailemalla: you need to select a file first! common fi Valitse tiedosto! your code is incorrect !!! common fi Virheellinen koodi! +initial common fi Alkukirjain +id common fi Tunniste diff --git a/api/lang/egw_fr.lang b/api/lang/egw_fr.lang index a2d33df41b..a1fe6a81d0 100644 --- a/api/lang/egw_fr.lang +++ b/api/lang/egw_fr.lang @@ -1509,3 +1509,5 @@ your settings have been updated common fr Vos préférences ont été mises à j zambia common fr ZAMBIE zimbabwe common fr ZIMBABWE zoom common fr Agrandissement +initial common fr Initial +id common fr ID diff --git a/api/lang/egw_hr.lang b/api/lang/egw_hr.lang index c8a4ab9e0c..18f4d67272 100644 --- a/api/lang/egw_hr.lang +++ b/api/lang/egw_hr.lang @@ -923,3 +923,4 @@ writes a 'etemplates.inc.php' file (for application in name) in the setup-dir of xml-file to import common hr xml-file to import xslt template common hr XSLT Template year common hr Year +id common hr identitet diff --git a/api/lang/egw_hu.lang b/api/lang/egw_hu.lang index 558f3192e3..4fb1407350 100644 --- a/api/lang/egw_hu.lang +++ b/api/lang/egw_hu.lang @@ -885,3 +885,5 @@ wk common hu hét working days common hu munkanapok year common hu Év you can respond by visiting: common hu Megtekintéshez látogasson el ide: +initial common hu Kezdeti +id common hu Azonosító diff --git a/api/lang/egw_id.lang b/api/lang/egw_id.lang index 86bfb24b25..b8ee2c2a23 100644 --- a/api/lang/egw_id.lang +++ b/api/lang/egw_id.lang @@ -902,3 +902,5 @@ xml-file to import common id berkas xml untuk impor xslt template common id Templat XSLT year common id Tahun you can respond by visiting: common id Untuk melihatnya, kunjungi: +initial common id Initial +id common id ID diff --git a/api/lang/egw_it.lang b/api/lang/egw_it.lang index 5695a5dc73..8317fa65df 100644 --- a/api/lang/egw_it.lang +++ b/api/lang/egw_it.lang @@ -1476,3 +1476,5 @@ your settings have been updated common it Le tue impostazioni sono state aggiorn zambia common it ZAMBIA zimbabwe common it ZIMBABWE zoom common it Zoom +initial common it Iniziale +id common it ID diff --git a/api/lang/egw_iw.lang b/api/lang/egw_iw.lang index b986773f2e..f6a458242d 100644 --- a/api/lang/egw_iw.lang +++ b/api/lang/egw_iw.lang @@ -690,3 +690,4 @@ write tables common iw כתוב טבלאות xml-file to import common iw ליבוא xml קובץ xslt template common iw XSLT תבנית year common iw שנה +id common iw זיהוי diff --git a/api/lang/egw_ja.lang b/api/lang/egw_ja.lang index e8718ca52f..b74134d20a 100644 --- a/api/lang/egw_ja.lang +++ b/api/lang/egw_ja.lang @@ -1508,3 +1508,5 @@ your settings have been updated common ja 設定が更新されました。 zambia common ja ザンビア zimbabwe common ja ジンバブエ zoom common ja ズーム +initial common ja 初期 +id common ja ID diff --git a/api/lang/egw_lo.lang b/api/lang/egw_lo.lang index 1d428edb78..5b1a137974 100644 --- a/api/lang/egw_lo.lang +++ b/api/lang/egw_lo.lang @@ -790,3 +790,5 @@ select a category common lo ເລືອກໝວດໝູ່ selectbox common lo ຊ່ອງສໍາລັບເລືອກ show common lo ສະແດງ wk common lo ອາທິດໜຶ່ງ +initial common lo ເບືອງຕົ້ນ +id common lo ລະຫັດ diff --git a/api/lang/egw_lv.lang b/api/lang/egw_lv.lang index 0500bc0e92..6bbebd2757 100644 --- a/api/lang/egw_lv.lang +++ b/api/lang/egw_lv.lang @@ -913,3 +913,4 @@ writes a 'etemplates.inc.php' file (for application in name) in the setup-dir of xml-file to import common lv xml datne importēšanai xslt template common lv XSLT veidne year common lv Gads +id common lv ID diff --git a/api/lang/egw_nl.lang b/api/lang/egw_nl.lang index 49ea8bd233..0bb93ffc3f 100644 --- a/api/lang/egw_nl.lang +++ b/api/lang/egw_nl.lang @@ -1356,3 +1356,5 @@ xslt template common nl XSLT Template year common nl Jaar you are not allowed to export more than %1 entries! common nl Je mag niet meer dan %1 items exporteren! you can respond by visiting: common nl Ju kunt reageren via: +initial common nl Initiaal +id common nl ID diff --git a/api/lang/egw_no.lang b/api/lang/egw_no.lang index 13f7c676d7..7646d3502b 100644 --- a/api/lang/egw_no.lang +++ b/api/lang/egw_no.lang @@ -948,3 +948,4 @@ write tables common no Lagre tabeller xml-file to import common no xml-fil som skal importeres xslt template common no XSLT Mal year common no År +id common no Id diff --git a/api/lang/egw_pl.lang b/api/lang/egw_pl.lang index ad82319679..96f0423ed6 100644 --- a/api/lang/egw_pl.lang +++ b/api/lang/egw_pl.lang @@ -1207,3 +1207,5 @@ your settings have been updated common pl Twoje ustawienia zostały uaktualnione zambia common pl ZAMBIA zimbabwe common pl ZIMBABWE zoom common pl Powiększenie +initial common pl Początkowe +id common pl ID diff --git a/api/lang/egw_pt-br.lang b/api/lang/egw_pt-br.lang index 6e25270ffa..2abaefc992 100644 --- a/api/lang/egw_pt-br.lang +++ b/api/lang/egw_pt-br.lang @@ -1299,3 +1299,5 @@ xslt template common pt-br Modelo XSLT year common pt-br Ano you are not allowed to export more than %1 entries! common pt-br Você não tem permissão para exportar mais de %1 registros! you can respond by visiting: common pt-br Você pode responder acessando: +initial common pt-br Inicial +id common pt-br ID diff --git a/api/lang/egw_pt.lang b/api/lang/egw_pt.lang index f197d6c227..333f263d14 100644 --- a/api/lang/egw_pt.lang +++ b/api/lang/egw_pt.lang @@ -1209,3 +1209,4 @@ year common pt Ano you can respond by visiting: common pt Você pode responder, visitando you need to select a file first! common pt Selecione um arquivo primeiro! your code is incorrect !!! common pt Código é incorreto! +id common pt ID diff --git a/api/lang/egw_ru.lang b/api/lang/egw_ru.lang index d9c0e8cb6e..aafd09bf5c 100644 --- a/api/lang/egw_ru.lang +++ b/api/lang/egw_ru.lang @@ -1338,3 +1338,5 @@ you are not allowed to export more than %1 entries! common ru Вам не раз you can respond by visiting: common ru Вы можете отозваться посетив: you need to select a file first! common ru Сначала выберите файл! your code is incorrect !!! common ru Код неправильный! +initial common ru Первоначальный +id common ru Идентификатор diff --git a/api/lang/egw_sk.lang b/api/lang/egw_sk.lang index c6288c57c1..b7e3a4d761 100644 --- a/api/lang/egw_sk.lang +++ b/api/lang/egw_sk.lang @@ -1475,3 +1475,5 @@ your settings have been updated common sk Vaše nastavenia boli upravené zambia common sk ZAMBIA zimbabwe common sk ZIMBABWE zoom common sk Lupa +initial common sk Počiatočné +id common sk ID diff --git a/api/lang/egw_sl.lang b/api/lang/egw_sl.lang index abb2b89571..d418c291b1 100644 --- a/api/lang/egw_sl.lang +++ b/api/lang/egw_sl.lang @@ -1475,3 +1475,5 @@ your settings have been updated common sl Vaše nastavitve so bile posodobljene zambia common sl ZAMBIJA zimbabwe common sl ZIMBABVE zoom common sl Zoom +initial common sl Začetno +id common sl ID diff --git a/api/lang/egw_sv.lang b/api/lang/egw_sv.lang index dd4fc60814..4cfc98164d 100644 --- a/api/lang/egw_sv.lang +++ b/api/lang/egw_sv.lang @@ -1121,3 +1121,5 @@ xml-file to import common sv Importera XML fil xslt template common sv XSLT mall year common sv År you can respond by visiting: common sv Du kan svara genom att besöka: +initial common sv Inledande +id common sv ID diff --git a/api/lang/egw_uk.lang b/api/lang/egw_uk.lang index 47803383cf..062bb5fad0 100644 --- a/api/lang/egw_uk.lang +++ b/api/lang/egw_uk.lang @@ -502,3 +502,4 @@ type common uk Тип unlink common uk Викинути update a single entry by passing the fields. common uk Змінити один запис шляхом заповнення полів. view this linked entry in its application common uk переглянути посилання в відповідному приложенні +id common uk Id diff --git a/api/lang/egw_zh-tw.lang b/api/lang/egw_zh-tw.lang index 4c81949a38..9a068693a4 100644 --- a/api/lang/egw_zh-tw.lang +++ b/api/lang/egw_zh-tw.lang @@ -1154,3 +1154,5 @@ xml-file to import common zh-tw 要匯入的XML檔案 xslt template common zh-tw XSLT樣版 year common zh-tw 年 you can respond by visiting: common zh-tw 檢視網址： +initial common zh-tw 初始的 +id common zh-tw 編號 diff --git a/api/lang/egw_zh.lang b/api/lang/egw_zh.lang index e654da0014..ff0fcb78a2 100644 --- a/api/lang/egw_zh.lang +++ b/api/lang/egw_zh.lang @@ -1175,3 +1175,5 @@ xml-file to import common zh 要导入的 XML-文件 xslt template common zh XSLT 模板 year common zh 年 you can respond by visiting: common zh 查看访问： +initial common zh 初始的 +id common zh 编号 diff --git a/api/src/Accounts.php b/api/src/Accounts.php index ea0d394ee2..26ed7a0610 100644 --- a/api/src/Accounts.php +++ b/api/src/Accounts.php @@ -454,6 +454,7 @@ class Accounts $lid = $GLOBALS['egw_info']['user']['account_lid']; $firstname = $GLOBALS['egw_info']['user']['account_firstname']; $lastname = $GLOBALS['egw_info']['user']['account_lastname']; + $accountid = $GLOBALS['egw_info']['user']['account_id']; } $is_group = $GLOBALS['egw']->accounts->get_type($accountid ? $accountid : $lid) == 'g'; @@ -502,6 +503,12 @@ class Accounts $group = Accounts::id2name($lid, 'account_primary_group'); $name = $lastname . $delimiter . $firstname . ($is_group ? '' : ' ('.Accounts::id2name($group).')'); break; + case 'firstinital': + $name = $firstname.' '.mb_substr($lastname, 0, 1).'.'; + break; + case 'firstid': + $name = $firstname.' ['.$accountid.']'; + break; case 'all': /* fall through */ default: diff --git a/preferences/inc/class.preferences_hooks.inc.php b/preferences/inc/class.preferences_hooks.inc.php index 339597bfce..df696cd912 100644 --- a/preferences/inc/class.preferences_hooks.inc.php +++ b/preferences/inc/class.preferences_hooks.inc.php @@ -82,6 +82,8 @@ class preferences_hooks 'all' => '['.lang('username').'] '.lang('Lastname').','.lang('Firstname'), 'firstgroup'=> lang('Firstname').' '.lang('Lastname').' ('.lang('primary group').')', 'lastgroup' => lang('Lastname').', '.lang('Firstname').' ('.lang('primary group').')', + 'firstinital' => lang('Firstname').' '.lang('Initial'), + 'firstid' => lang('Firstname').' ['.lang('ID').']', ); if ($hook_data['setup']) // called via setup