From 15e33f8b35a59b368f1d5923fde8921d67bf153a Mon Sep 17 00:00:00 2001
From: meejah <meejah@meejah.ca>
Date: Fri, 13 Nov 2020 22:57:44 -0700
Subject: [PATCH] undo a wording change

---
 src/allmydata/test/test_abbreviate.py | 2 +-
 src/allmydata/util/abbreviate.py      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/allmydata/test/test_abbreviate.py b/src/allmydata/test/test_abbreviate.py
index 2fb3d6b95..3ef1e96a6 100644
--- a/src/allmydata/test/test_abbreviate.py
+++ b/src/allmydata/test/test_abbreviate.py
@@ -33,7 +33,7 @@ class Abbreviate(unittest.TestCase):
     def test_abbrev_time_future_5_minutes(self):
         diff = timedelta(minutes=-5)
         s = abbreviate.abbreviate_time(diff)
-        self.assertEqual('5 minutes from now', s)
+        self.assertEqual('5 minutes in the future', s)
 
     def test_abbrev_time_hours(self):
         diff = timedelta(hours=4)
diff --git a/src/allmydata/util/abbreviate.py b/src/allmydata/util/abbreviate.py
index 5ca8aa3d1..f895c3727 100644
--- a/src/allmydata/util/abbreviate.py
+++ b/src/allmydata/util/abbreviate.py
@@ -40,7 +40,7 @@ def abbreviate_time(s):
         if s >= 0.0:
             postfix = ' ago'
         else:
-            postfix = ' from now'
+            postfix = ' in the future'
             s = -s
     def _plural(count, unit):
         count = int(count)