moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-36615-master' of git://github.com/ankitagarwal/moodle

Browse source
This commit is contained in:
Sam Hemelryk 2012-11-20 10:25:04 +13:00
commit cb33680c22
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
calendar/lib.php
View file

@ -2695,7 +2695,7 @@ function calendar_get_eventtype_choices($courseid) {
$choices[0] = get_string('userevents', 'calendar');
}
if ($allowed->site) {
$choices[SITEID] = get_string('globalevents', 'calendar');
$choices[SITEID] = get_string('siteevents', 'calendar');
}
if (!empty($allowed->courses)) {
$choices[$courseid] = get_string('courseevents', 'calendar');

1
lang/en/calendar.php
View file

@ -161,6 +161,7 @@ $string['showglobalevents'] = 'Show global events';
$string['showgroupsevents'] = 'Show group events';
$string['showuserevents'] = 'Show user events';
$string['shown'] = 'shown';
$string['siteevents'] = 'Site events';
$string['spanningevents'] = 'Events underway';
$string['subscriptions'] = 'Subscriptions';
$string['subscriptionname'] = 'Calendar name';