extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Calendar: Fix 'None' category option was not translated

Browse Source
This commit is contained in:
nathan 2023-07-11 09:09:12 -06:00
parent 74504cf5b0
commit 822507d341
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
calendar/inc/class.calendar_ui.inc.php
View File

@ -560,13 +560,21 @@ class calendar_ui
array('value' => 'no-enum-groups', 'label' => lang('only group-events'),'title' => lang('Do not include events of group members')), array('value' => 'no-enum-groups', 'label' => lang('only group-events'),'title' => lang('Do not include events of group members')),
array('value' => 'not-unknown', 'label' => lang('No meeting requests'),'title' => lang('Show all status, but unknown')), array('value' => 'not-unknown', 'label' => lang('No meeting requests'),'title' => lang('Show all status, but unknown')),
); );
$sel_options['status_filter'][] = array('value' => 'deleted', 'label' => lang('Deleted'), 'title' => lang('Show events that have been deleted')); $sel_options['status_filter'][] = array(
'value' => 'deleted', 'label' => lang('Deleted'),
'title' => lang('Show events that have been deleted')
);
$sel_options['cat_id'] = array(
['value' => '0', 'label' => lang('None')]
);
// Merge print // Merge print
try { try
if (class_exists('EGroupware\\collabora\\Bo') && {
$GLOBALS['egw_info']['user']['apps']['collabora'] && if(class_exists('EGroupware\\collabora\\Bo') &&
$discovery = \EGroupware\collabora\Bo::discover() $GLOBALS['egw_info']['user']['apps']['collabora'] &&
$discovery = \EGroupware\collabora\Bo::discover()
) )
{ {
$cont['collabora_enabled'] = true; $cont['collabora_enabled'] = true;

4
calendar/templates/default/sidebox.xet
View File

@ -18,9 +18,7 @@ Egroupware
<et2-textbox type="hidden" id="first"></et2-textbox> <et2-textbox type="hidden" id="first"></et2-textbox>
<et2-textbox type="hidden" id="last"></et2-textbox> <et2-textbox type="hidden" id="last"></et2-textbox>
<hrule/> <hrule/>
<et2-select-cat id="cat_id" placeholder="All categories" onchange="app.calendar.update_state({cat_id: widget.getValue()});" emptyLabel="All categories" multiple="true"> <et2-select-cat id="cat_id" placeholder="All categories" onchange="app.calendar.update_state({cat_id: widget.getValue()});" emptyLabel="All categories" multiple="true"></et2-select-cat>
<option value="0">None</option>
</et2-select-cat>
<et2-select id="status_filter" onchange="app.calendar.update_state({status_filter: widget.getValue()});" noLang="true"></et2-select> <et2-select id="status_filter" onchange="app.calendar.update_state({status_filter: widget.getValue()});" noLang="true"></et2-select>
<hrule/> <hrule/>
<et2-calendar-owner id="owner" onchange="app.calendar.update_state({owner: widget.getValue()}); return false;" multiple="true" allowFreeEntries="false" autocompleteParams="{&quot;checkgrants&quot;: true}"/> <et2-calendar-owner id="owner" onchange="app.calendar.update_state({owner: widget.getValue()}); return false;" multiple="true" allowFreeEntries="false" autocompleteParams="{&quot;checkgrants&quot;: true}"/>