From 2bb16e651e80d6caa0bbcf90608b1cd53e5809f1 Mon Sep 17 00:00:00 2001
From: Simon Schampijer <simon@schampijer.de>
Date: Wed, 06 Oct 2010 07:16:47 +0000
Subject: Do not break if the string contains no conversion specifier #10372

Upstream ticket SL #2354
---
diff --git a/src/sugar/util.py b/src/sugar/util.py
index e027734..9f96553 100644
--- a/src/sugar/util.py
+++ b/src/sugar/util.py
@@ -245,10 +245,17 @@ def timestamp_to_elapsed_string(timestamp, max_levels=2):
             if key in _i18n_timestamps_cache:
                 time_period += _i18n_timestamps_cache[key]
             else:
-                translation = gettext.dngettext('sugar-toolkit',
-                                                name_singular,
-                                                name_plural,
-                                                elapsed_units) % elapsed_units
+                tmp = gettext.dngettext('sugar-toolkit',
+                                        name_singular,
+                                        name_plural,
+                                        elapsed_units)
+                # FIXME: This is a hack so we don't crash when a translation
+                # doesn't contain the expected number of placeholders (#2354)
+                try:
+                    translation = tmp % elapsed_units
+                except TypeError:
+                    translation = tmp
+
                 _i18n_timestamps_cache[key] = translation
                 time_period += translation
 
--
cgit v0.9.1