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

unify video conference actions and translations

Browse Source
This commit is contained in:
Ralf Becker 2020-04-09 10:50:54 +02:00
parent bf9b38495f
commit 943609a009
13 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addressbook/inc/class.addressbook_ui.inc.php
View File

@ -586,14 +586,14 @@ class addressbook_ui extends addressbook_bo
'group' => $group,
'children' => [
'call' => [
'caption' => lang('Call'),
'caption' => lang('Video Call'),
'icon' => 'status/videoconference_call',
'allowOnMultiple' => true,
'onExecute' => 'javaScript:app.addressbook.videoconference_actionCall',
'enabled' => 'javaScript:app.addressbook.videoconference_isUserOnline'
],
'schedule_call' => [
'caption' => lang('Schedule a call'),
'caption' => lang('Schedule a video conference'),
'icon' => 'calendar',
'allowOnMultiple' => true,
'onExecute' => 'javaScript:app.addressbook.add_cal',

3
addressbook/lang/egw_de.lang
View File

@ -96,7 +96,6 @@ business zip code addressbook de PLZ geschäftlich
calendar fields: addressbook de Kalender Felder:
calendar integration addressbook de Kalender Integration
calendar uri addressbook de Kalender URI
call addressbook de Videokonferenz
can be changed via setup >> configuration admin de Kann über Setup >> Konfiguration geändert werden
can't create dn %1 addressbook de dn %1 kann nicht erstellt werden
car phone addressbook de Autotelefon
@ -433,7 +432,7 @@ replacements for inserting contacts into documents addressbook de Platzhalter f
required fields * addressbook de unbedingt auszufüllende Felder *
role addressbook de Beruf
room addressbook de Raum
schedule a call addressbook de Videokonferenz planen
schedule a video conference addressbook de Videokonferenz planen
search letter addressbook de Suche nach Buchstaben
select a portrait format jpeg photo. it will be resized to 60 pixel width. addressbook de Wählen Sie ein hochformatiges jpeg Foto. Es wird 60 Pixel breit skaliert.
select a source address to be used in geolocation routing system addressbook de Legen Sie fest, wie der Startpunkt für die Routenplanung gesetzt wird.

3
addressbook/lang/egw_en.lang
View File

@ -96,7 +96,6 @@ business zip code addressbook en Business postal code
calendar fields: addressbook en Calendar fields:
calendar integration addressbook en Calendar integration
calendar uri addressbook en Calendar URI
call addressbook en Call
can be changed via setup >> configuration admin en Can be changed via Setup >> Configuration
can't create dn %1 addressbook en Can't create dn %1
car phone addressbook en Car phone
@ -433,7 +432,7 @@ replacements for inserting contacts into documents addressbook en Replacements f
required fields * addressbook en Required fields *
role addressbook en Occupation
room addressbook en Room
schedule a call addressbook en Schedule a call
schedule a video conference addressbook en Schedule a video conference
search letter addressbook en Search letter
select a portrait format jpeg photo. it will be resized to 60 pixel width. addressbook en Select a portrait format jpeg photo. It will be re-sized to 60 pixel width.
select a source address to be used in geolocation routing system addressbook en Select a source address to be used in GeoLocation routing system

0
addressbook/lang/egw_et.lang Executable file → Normal file
View File

0
addressbook/lang/egw_iw.lang Executable file → Normal file
View File

0
addressbook/lang/egw_pl.lang Executable file → Normal file
View File

2
calendar/inc/class.calendar_boupdate.inc.php
View File

@ -1064,7 +1064,7 @@ class calendar_boupdate extends calendar_bo
'account_id' => $userid
]);
$event_arr['videoconference'] = [
'field' => lang('Videoconference'),
'field' => lang('Video Conference'),
'data' => $details['videoconference'],
];
// hack to add videoconference-url to ical, only if description was NOT cleared

2
calendar/inc/class.calendar_uilist.inc.php
View File

@ -953,7 +953,7 @@ class calendar_uilist extends calendar_ui
{
$actions['videoconference'] = [
'icon' => 'status/videoconference',
'caption' => 'Video conference',
'caption' => 'Video Conference',
'group' => $group,
'allowOnMultiple' => false,
'disableClass' => 'rowNoView',

1
calendar/lang/egw_de.lang
View File

@ -627,7 +627,6 @@ user selectable css file for the calendar setup calendar de Benutzer können aus
users + groups: inviting both always requires an invite grant admin de Benutzer + Gruppen: Einladungen beider brauchen eine Freigabe
using already existing event on server. calendar de Benutze bereits existierenden Termin auf dem Server
utilities calendar de Zubehör
videoconference calendar de Videokonferenz
view exception calendar de Ausnahme anzeigen
view series calendar de Terminserie anzeigen
view settings calendar de Einträge anzeigen

1
calendar/lang/egw_en.lang
View File

@ -627,7 +627,6 @@ user selectable css file for the calendar setup calendar en User selectable CSS
users + groups: inviting both always requires an invite grant admin en Users + groups: inviting both always requires an invite grant
using already existing event on server. calendar en Using already existing event on server.
utilities calendar en Utilities
videoconference calendar en Videoconference
view exception calendar en View exception
view series calendar en View series
view settings calendar en View settings

0
calendar/lang/egw_iw.lang Executable file → Normal file
View File

0
calendar/lang/egw_pl.lang Executable file → Normal file
View File

2
calendar/templates/default/edit.xet
View File

@ -231,7 +231,7 @@
<label for="location" value="Location"/>
<hbox span="2">
<textbox id="location" maxlength="255" class="et2_fullWidth"/>
<checkbox label="Videoconference" id="videoconference" onchange="app.calendar.videoconferenceOnChange"/>
<checkbox label="Video Conference" id="videoconference" onchange="app.calendar.videoconferenceOnChange"/>
</hbox>
<description/>
<taglist-cat id="category" height="190" empty_label="Categories" multiple="toggle" class="et2_fullWidth" rows="1" />