Commit 9dc6e7de authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review

Merge "Bug 1828331: Standarise date display to 24 hour format"

parents 11138e9d 412b7328
...@@ -233,7 +233,7 @@ $string['topicmovedsuccess'] = array( ...@@ -233,7 +233,7 @@ $string['topicmovedsuccess'] = array(
$string['today'] = 'Today'; $string['today'] = 'Today';
$string['yesterday'] = 'Yesterday'; $string['yesterday'] = 'Yesterday';
$string['strftimerecentrelative'] = '%%v, %%k:%%M'; $string['strftimerecentrelative'] = '%%v, %%k:%%M';
$string['strftimerecentfullrelative'] = '%%v, %%l:%%M %%p'; $string['strftimerecentfullrelative'] = '%%v, %%k:%%M';
$string['indentmode'] = 'Forum indent mode'; $string['indentmode'] = 'Forum indent mode';
$string['indentfullindent'] = 'Fully expand'; $string['indentfullindent'] = 'Fully expand';
......
...@@ -16,18 +16,18 @@ $string['pieform_calendar_dateformat'] = '%%Y/%%m/%%d'; ...@@ -16,18 +16,18 @@ $string['pieform_calendar_dateformat'] = '%%Y/%%m/%%d';
$string['pieform_calendar_timeformat'] = '%%H:%%M'; $string['pieform_calendar_timeformat'] = '%%H:%%M';
$string['strftimedate'] = '%%e %%B %%Y'; $string['strftimedate'] = '%%e %%B %%Y';
$string['strftimedateshort'] = '%%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['strftimedatetimeshort'] = '%%Y/%%m/%%d %%H:%%M';
$string['strftimedaydate'] = '%%A, %%d %%B %%Y'; $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['strftimedayshort'] = '%%A, %%d %%B';
$string['strftimedaytime'] = '%%a, %%k:%%M'; $string['strftimedaytime'] = '%%a, %%k:%%M';
$string['strftimemonthyear'] = '%%B %%Y'; $string['strftimemonthyear'] = '%%B %%Y';
$string['strftimenotspecified'] = 'Not specified'; $string['strftimenotspecified'] = 'Not specified';
$string['strftimerecent'] = '%%d %%b, %%k:%%M'; $string['strftimerecent'] = '%%d %%b, %%k:%%M';
$string['strftimerecentyear'] = '%%d %%b %%Y, %%k:%%M'; $string['strftimerecentyear'] = '%%d %%b %%Y, %%k:%%M';
$string['strftimerecentfull'] = '%%a, %%d %%b %%Y, %%l:%%M %%p'; $string['strftimerecentfull'] = '%%a, %%d %%b %%Y, %%k:%%M';
$string['strftimetime'] = '%%l:%%M %%p'; $string['strftimetime'] = '%%k:%%M';
$string['strfdaymonthyearshort'] = '%%d/%%m/%%Y'; $string['strfdaymonthyearshort'] = '%%d/%%m/%%Y';
$string['strfdateofbirth'] = '%%Y/%%m/%%d'; $string['strfdateofbirth'] = '%%Y/%%m/%%d';
$string['strftimew3cdatetime'] = '%%Y-%%m-%%dT%%H:%%M:%%S%%z'; $string['strftimew3cdatetime'] = '%%Y-%%m-%%dT%%H:%%M:%%S%%z';
......
...@@ -30,7 +30,7 @@ Scenario: Creating groups and deleting them (Selenium) ...@@ -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 "Members" in the ".bt-groupinfo" "css_element"
And I should see "Group administrators:" 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 "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 # Create Open group
And I choose "Groups" in "Engage" from main menu And I choose "Groups" in "Engage" from main menu
And I follow "Create group" And I follow "Create group"
......
...@@ -80,7 +80,7 @@ Scenario: Creating a page with content in it (Bug 1426983) ...@@ -80,7 +80,7 @@ Scenario: Creating a page with content in it (Bug 1426983)
And I display the page And I display the page
# Show last updated date and time when seeing a portfolio page (Bug 1634591) # Show last updated date and time when seeing a portfolio page (Bug 1634591)
And I should see "Updated on" in the ".text-right" element 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, 13:29
And I should see the date "today" in the ".text-right" element with the format "d F Y" 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 # Verifying the page title and description changed
Then I should see "This is the edited page title" Then I should see "This is the edited page title"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment