Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mahara
mahara
Commits
4bb6ca7f
Commit
4bb6ca7f
authored
Apr 01, 2015
by
Jono Mingard
Committed by
Gerrit Code Review
Apr 01, 2015
Browse files
Merge "Fixing lang string for secret url page (Bug #1436582)"
parents
6c2ebc01
62cc1c8a
Changes
2
Show whitespace changes
Inline
Side-by-side
htdocs/lang/en.utf8/view.php
View file @
4bb6ca7f
...
...
@@ -27,7 +27,7 @@ $string['userviewurltaken'] = 'This URL is already taken. Please choose an
$string
[
'description'
]
=
'Page description'
;
$string
[
'startdate'
]
=
'Access start date/time'
;
$string
[
'stopdate'
]
=
'Access end date/time'
;
$string
[
'stopdatecannotbeinpast'
]
=
'
Stop
date cannot be in the past'
;
$string
[
'stopdatecannotbeinpast
1
'
]
=
'
"To"
date cannot be in the past'
;
$string
[
'startdatemustbebeforestopdate'
]
=
'Start date must be before stop date'
;
$string
[
'newstopdatecannotbeinpast'
]
=
'The end date for \'%s\' access cannot be in the past.'
;
$string
[
'newstartdatemustbebeforestopdate'
]
=
'The start date for \'%s\' access must be before the end date.'
;
...
...
htdocs/view/urls.php
View file @
4bb6ca7f
...
...
@@ -172,7 +172,7 @@ function editurl_validate(Pieform $form, $values) {
$values
[
'stopdate'
]
=
null
;
}
if
(
$values
[
'stopdate'
]
&&
time
()
>
$values
[
'stopdate'
])
{
$form
->
set_error
(
'stopdate'
,
get_string
(
'stopdatecannotbeinpast'
,
'view'
));
$form
->
set_error
(
'stopdate'
,
get_string
(
'stopdatecannotbeinpast
1
'
,
'view'
));
}
if
(
$values
[
'startdate'
]
&&
$values
[
'stopdate'
]
&&
$values
[
'startdate'
]
>
$values
[
'stopdate'
])
{
$form
->
set_error
(
'startdate'
,
get_string
(
'startdatemustbebeforestopdate'
,
'view'
));
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment