OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

AM/PM strings 

Signed-off-by: Travis Ralston <travpc@gmail.com>
pull/21833/head
turt2live 2017-07-03 09:25:03 -06:00
parent e058dd58e5
commit 45559f7cf0
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/DateUtils.js
View File

@ -54,7 +54,7 @@ function pad(n) {
function twelveHourTime(date) { function twelveHourTime(date) {
let hours = date.getHours() % 12; let hours = date.getHours() % 12;
const minutes = pad(date.getMinutes()); const minutes = pad(date.getMinutes());
const ampm = date.getHours() >= 12 ? 'PM' : 'AM'; const ampm = date.getHours() >= 12 ? _t('PM') : _t('AM');
hours = hours ? hours : 12; // convert 0 -> 12 hours = hours ? hours : 12; // convert 0 -> 12
return `${hours}:${minutes}${ampm}`; return `${hours}:${minutes}${ampm}`;
} }

2
src/i18n/strings/en_EN.json
View File

@ -421,6 +421,8 @@
"Notifications": "Notifications", "Notifications": "Notifications",
"(not supported by this browser)": "(not supported by this browser)", "(not supported by this browser)": "(not supported by this browser)",
"<not supported>": "<not supported>", "<not supported>": "<not supported>",
"AM": "AM",
"PM": "PM",
"NOT verified": "NOT verified", "NOT verified": "NOT verified",
"No devices with registered encryption keys": "No devices with registered encryption keys", "No devices with registered encryption keys": "No devices with registered encryption keys",
"No display name": "No display name", "No display name": "No display name",

2
src/i18n/strings/en_US.json
View File

@ -120,6 +120,8 @@
"zh-sg": "Chinese (Singapore)", "zh-sg": "Chinese (Singapore)",
"zh-tw": "Chinese (Taiwan)", "zh-tw": "Chinese (Taiwan)",
"zu": "Zulu", "zu": "Zulu",
"AM": "AM",
"PM": "PM",
"A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains", "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains",
"accept": "accept", "accept": "accept",
"%(targetName)s accepted an invitation.": "%(targetName)s accepted an invitation.", "%(targetName)s accepted an invitation.": "%(targetName)s accepted an invitation.",