mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-26 19:26:04 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #982 from turt2live/travis/presence-undefined

Browse source 
Fix rare case where presence duration is undefined
This commit is contained in:
Matthew Hodgson 2017-06-01 00:38:50 +01:00 committed by GitHub
commit cad2f643ea
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/components/views/rooms/PresenceLabel.js
View file

@ -55,17 +55,17 @@ module.exports = React.createClass({
var d = parseInt(t / (60 * 60 * 24)); var d = parseInt(t / (60 * 60 * 24));
if (t < 60) { if (t < 60) {
if (t < 0) { if (t < 0) {
return "0s"; return _t("for %(amount)ss", {amount: 0});
} }
return s + "s"; return _t("for %(amount)ss", {amount: s});
} }
if (t < 60 * 60) { if (t < 60 * 60) {
return m + "m"; return _t("for %(amount)sm", {amount: m});
} }
if (t < 24 * 60 * 60) { if (t < 24 * 60 * 60) {
return h + "h"; return _t("for %(amount)sh", {amount: h});
} }
return d + "d "; return _t("for %(amount)sd", {amount: d});
}, },
getPrettyPresence: function(presence) { getPrettyPresence: function(presence) {
@ -77,9 +77,8 @@ module.exports = React.createClass({
render: function() { render: function() {
if (this.props.activeAgo >= 0) { if (this.props.activeAgo >= 0) {
var ago = this.props.currentlyActive ? "" : "for " + (this.getDuration(this.props.activeAgo)); let duration = this.getDuration(this.props.activeAgo);
// var ago = this.getDuration(this.props.activeAgo) + " ago"; let ago = this.props.currentlyActive || !duration ? "" : duration;
// if (this.props.currentlyActive) ago += " (now?)";
return ( return (
<div className="mx_PresenceLabel"> <div className="mx_PresenceLabel">
{ this.getPrettyPresence(this.props.presenceState) } { ago } { this.getPrettyPresence(this.props.presenceState) } { ago }

4
src/i18n/strings/en_EN.json
View file

@ -765,6 +765,10 @@
"Drop file here to upload": "Drop file here to upload", "Drop file here to upload": "Drop file here to upload",
" (unsupported)": " (unsupported)", " (unsupported)": " (unsupported)",
"Ongoing conference call%(supportedText)s. %(joinText)s": "Ongoing conference call%(supportedText)s. %(joinText)s", "Ongoing conference call%(supportedText)s. %(joinText)s": "Ongoing conference call%(supportedText)s. %(joinText)s",
"for %(amount)ss": "for %(amount)ss",
"for %(amount)sm": "for %(amount)sm",
"for %(amount)sh": "for %(amount)sh",
"for %(amount)sd": "for %(amount)sd",
"Online": "Online", "Online": "Online",
"Idle": "Idle", "Idle": "Idle",
"Offline": "Offline", "Offline": "Offline",