Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/webactivity.py
diff options
context:
space:
mode:
authorSascha Silbe <silbe@activitycentral.com>2011-06-07 16:08:28 (GMT)
committer Sascha Silbe <silbe@activitycentral.com>2011-06-12 15:56:22 (GMT)
commit6c790f7bd5f2b8df3af6fe2e94f9e42128ed708f (patch)
tree089a9661579b63fe2810949a02099ea9f195e185 /webactivity.py
parentb12f6accbe6d2d637389a79356d777a7b784a7d3 (diff)
Clarify warning on Stop with pending downloads (SL#1508)
The warning previously used the word "cancel" to describe two antagonistic operations: Not continuing the download (including erasing it from the Journal) and not stopping Browse. The new wording was agreed upon [1] by the Design Team. [1] http://meeting.sugarlabs.org/sugar-meeting/meetings/2011-05-29T16:09:15.html Closes: SL#1508 Signed-off-by: Sascha Silbe <silbe@activitycentral.com>
Diffstat (limited to 'webactivity.py')
-rw-r--r--webactivity.py14
1 files changed, 11 insertions, 3 deletions
diff --git a/webactivity.py b/webactivity.py
index 48cb3ed..fc9e913 100644
--- a/webactivity.py
+++ b/webactivity.py
@@ -18,6 +18,7 @@
import logging
from gettext import gettext as _
+from gettext import ngettext
import os
import subprocess
@@ -650,10 +651,17 @@ class WebActivity(activity.Activity):
return True
else:
alert = Alert()
- alert.props.title = _('Download in progress')
- alert.props.msg = _('Stopping now will cancel your download')
+ alert.props.title = ngettext('Download in progress',
+ 'Downloads in progress',
+ downloadmanager.num_downloads())
+ message = ngettext('Stopping now will erase your download',
+ 'Stopping now will erase your downloads',
+ downloadmanager.num_downloads())
+ alert.props.msg = message
cancel_icon = Icon(icon_name='dialog-cancel')
- alert.add_button(gtk.RESPONSE_CANCEL, _('Cancel'), cancel_icon)
+ cancel_label = ngettext('Continue download', 'Continue downloads',
+ downloadmanager.num_downloads())
+ alert.add_button(gtk.RESPONSE_CANCEL, cancel_label, cancel_icon)
stop_icon = Icon(icon_name='dialog-ok')
alert.add_button(gtk.RESPONSE_OK, _('Stop'), stop_icon)
stop_icon.show()