Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
mahara
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
mahara
mahara
Commits
9dc6e7de
Commit
9dc6e7de
authored
Jun 15, 2019
by
Robert Lyon
Committed by
Gerrit Code Review
Jun 15, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge "Bug 1828331: Standarise date display to 24 hour format"
parents
11138e9d
412b7328
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
7 deletions
+7
-7
htdocs/interaction/forum/lang/en.utf8/interaction.forum.php
htdocs/interaction/forum/lang/en.utf8/interaction.forum.php
+1
-1
htdocs/lang/en.utf8/langconfig.php
htdocs/lang/en.utf8/langconfig.php
+4
-4
test/behat/features/social/create_and_delete_groups.feature
test/behat/features/social/create_and_delete_groups.feature
+1
-1
test/behat/features/user_content/create_delete_page.feature
test/behat/features/user_content/create_delete_page.feature
+1
-1
No files found.
htdocs/interaction/forum/lang/en.utf8/interaction.forum.php
View file @
9dc6e7de
...
...
@@ -233,7 +233,7 @@ $string['topicmovedsuccess'] = array(
$string
[
'today'
]
=
'Today'
;
$string
[
'yesterday'
]
=
'Yesterday'
;
$string
[
'strftimerecentrelative'
]
=
'%%v, %%k:%%M'
;
$string
[
'strftimerecentfullrelative'
]
=
'%%v, %%
l:%%M %%p
'
;
$string
[
'strftimerecentfullrelative'
]
=
'%%v, %%
k:%%M
'
;
$string
[
'indentmode'
]
=
'Forum indent mode'
;
$string
[
'indentfullindent'
]
=
'Fully expand'
;
...
...
htdocs/lang/en.utf8/langconfig.php
View file @
9dc6e7de
...
...
@@ -16,18 +16,18 @@ $string['pieform_calendar_dateformat'] = '%%Y/%%m/%%d';
$string
[
'pieform_calendar_timeformat'
]
=
'%%H:%%M'
;
$string
[
'strftimedate'
]
=
'%%e %%B %%Y'
;
$string
[
'strftimedateshort'
]
=
'%%e %%b %%Y'
;
$string
[
'strftimedatetime'
]
=
'%%d %%B %%Y, %%
l:%%M %%p
'
;
$string
[
'strftimedatetime'
]
=
'%%d %%B %%Y, %%
k:%%M
'
;
$string
[
'strftimedatetimeshort'
]
=
'%%Y/%%m/%%d %%H:%%M'
;
$string
[
'strftimedaydate'
]
=
'%%A, %%d %%B %%Y'
;
$string
[
'strftimedaydatetime'
]
=
'%%A, %%d %%B %%Y, %%
l:%%M %%p
'
;
$string
[
'strftimedaydatetime'
]
=
'%%A, %%d %%B %%Y, %%
k:%%M
'
;
$string
[
'strftimedayshort'
]
=
'%%A, %%d %%B'
;
$string
[
'strftimedaytime'
]
=
'%%a, %%k:%%M'
;
$string
[
'strftimemonthyear'
]
=
'%%B %%Y'
;
$string
[
'strftimenotspecified'
]
=
'Not specified'
;
$string
[
'strftimerecent'
]
=
'%%d %%b, %%k:%%M'
;
$string
[
'strftimerecentyear'
]
=
'%%d %%b %%Y, %%k:%%M'
;
$string
[
'strftimerecentfull'
]
=
'%%a, %%d %%b %%Y, %%
l:%%M %%p
'
;
$string
[
'strftimetime'
]
=
'%%
l:%%M %%p
'
;
$string
[
'strftimerecentfull'
]
=
'%%a, %%d %%b %%Y, %%
k:%%M
'
;
$string
[
'strftimetime'
]
=
'%%
k:%%M
'
;
$string
[
'strfdaymonthyearshort'
]
=
'%%d/%%m/%%Y'
;
$string
[
'strfdateofbirth'
]
=
'%%Y/%%m/%%d'
;
$string
[
'strftimew3cdatetime'
]
=
'%%Y-%%m-%%dT%%H:%%M:%%S%%z'
;
...
...
test/behat/features/social/create_and_delete_groups.feature
View file @
9dc6e7de
...
...
@@ -30,7 +30,7 @@ Scenario: Creating groups and deleting them (Selenium)
And
I should see
"Members"
in the
".bt-groupinfo"
"css_element"
And I should see "Group administrators
:
"
in
the
".bt-groupinfo"
"css_element"
And
I should see
"Editable"
in the
".bt-groupinfo"
"css_element"
And I should see "Between 15 June 2015, 3
:
00
AM and 15 June 2015, 3
:
30
AM
"
And I should see "Between 15 June 2015, 3
:
00
and 15 June 2015, 3
:
30
"
# Create Open group
And
I choose
"Groups"
in
"Engage"
from main menu
And
I follow
"Create group"
...
...
test/behat/features/user_content/create_delete_page.feature
View file @
9dc6e7de
...
...
@@ -80,7 +80,7 @@ Scenario: Creating a page with content in it (Bug 1426983)
And
I display the page
# Show last updated date and time when seeing a portfolio page (Bug 1634591)
And
I should see
"Updated on"
in the
".text-right"
element
# actual date format displayed is 31 May 2018, 1
:29 PM
# actual date format displayed is 31 May 2018, 1
3:29
And
I should see the date
"today"
in the
".text-right"
element with the format
"d F Y"
# Verifying the page title and description changed
Then
I should see
"This is the edited page title"
...
...
Write
Preview
Markdown
is supported
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