Skip to content
Browse files

Merge pull request #7372 from Rik/notifications-message-827286

Bug 827286 - Updates: "Tap to download" text is misleading
  • Loading branch information...
2 parents 8e85602 + db75c33 commit 08e3c4e1637f7cd4e70e7d228305d39cb84d6f0a @vingtetun vingtetun committed Jan 9, 2013
View
4 apps/system/js/update_manager.js
@@ -256,7 +256,7 @@ var UpdateManager = {
render: function um_render() {
var _ = navigator.mozL10n.get;
- this.toasterMessage.innerHTML = _('updatesAvailableMessage', {
+ this.toasterMessage.innerHTML = _('updateAvailableInfo', {
n: this.updatesQueue.length
});
@@ -271,7 +271,7 @@ var UpdateManager = {
});
}
} else {
- message = _('updatesAvailableMessage', {
+ message = _('updateAvailableInfo', {
n: this.updatesQueue.length
});
}
View
12 apps/system/locales/system.en-US.properties
@@ -98,12 +98,12 @@ downloadingAppProgress={{ progress }} / {{ max }} downloaded
cancelAllDownloads=Cancel all downloads
wantToCancelAll=Are you sure you want to cancel all downloads?
downloadError=There was an error while downloading the updates.
-updatesAvailableMessage={[ plural(n) ]}
-updatesAvailableMessage[one]={{ n }} update available. <span>Tap to download.</span>
-updatesAvailableMessage[two]={{ n }} updates available. <span>Tap to download.</span>
-updatesAvailableMessage[few]={{ u }} updates available. <span>Tap to download.</span>
-updatesAvailableMessage[many]={{ n }} updates available. <span>Tap to download.</span>
-updatesAvailableMessage[other]={{ n }} updates available. <span>Tap to download.</span>
+updateAvailableInfo={[ plural(n) ]}
+updateAvailableInfo[one]={{ n }} update available. <span>Tap for more info.</span>
+updateAvailableInfo[two]={{ n }} updates available. <span>Tap for more info.</span>
+updateAvailableInfo[few]={{ n }} updates available. <span>Tap for more info.</span>
+updateAvailableInfo[many]={{ n }} updates available. <span>Tap for more info.</span>
+updateAvailableInfo[other]={{ n }} updates available. <span>Tap for more info.</span>
numberOfUpdates={[ plural(n) ]}
numberOfUpdates[one]={{ n }} update available
numberOfUpdates[two]={{ n }} updates available
View
14 apps/system/test/unit/update_manager_test.js
@@ -370,7 +370,7 @@ suite('system/UpdateManager', function() {
test('should show the available message if not downloading', function() {
UpdateManager.updatesQueue = updatableApps;
UpdateManager.render();
- assert.equal('updatesAvailableMessage{"n":3}',
+ assert.equal('updateAvailableInfo{"n":3}',
UpdateManager.message.textContent);
});
});
@@ -512,7 +512,7 @@ suite('system/UpdateManager', function() {
test('should display an updated count', function(done) {
UpdateManager.addToUpdatesQueue(updatableApps[1]);
setTimeout(function() {
- assert.equal('updatesAvailableMessage{"n":2}',
+ assert.equal('updateAvailableInfo{"n":2}',
UpdateManager.message.textContent);
done();
}, tinyTimeout * 2);
@@ -525,7 +525,7 @@ suite('system/UpdateManager', function() {
setTimeout(function() {
var css = UpdateManager.toaster.classList;
assert.isTrue(css.contains('displayed'));
- assert.equal('updatesAvailableMessage{"n":1}',
+ assert.equal('updateAvailableInfo{"n":1}',
UpdateManager.message.textContent);
done();
}, tinyTimeout * 1.5);
@@ -534,15 +534,15 @@ suite('system/UpdateManager', function() {
test('should display an updated count', function(done) {
UpdateManager.addToUpdatesQueue(updatableApps[1]);
setTimeout(function() {
- assert.equal('updatesAvailableMessage{"n":2}',
+ assert.equal('updateAvailableInfo{"n":2}',
UpdateManager.message.textContent);
done();
}, tinyTimeout * 2);
});
test('should show the right message', function(done) {
setTimeout(function() {
- assert.equal('updatesAvailableMessage{"n":1}',
+ assert.equal('updateAvailableInfo{"n":1}',
UpdateManager.toasterMessage.textContent);
done();
}, tinyTimeout * 2);
@@ -981,7 +981,7 @@ suite('system/UpdateManager', function() {
var updatableApp = UpdateManager.updatableApps[0];
UpdateManager.addToUpdatesQueue(updatableApp);
- assert.equal('updatesAvailableMessage{"n":1}',
+ assert.equal('updateAvailableInfo{"n":1}',
UpdateManager.message.textContent);
});
@@ -1057,7 +1057,7 @@ suite('system/UpdateManager', function() {
test('should render', function() {
UpdateManager.removeFromUpdatesQueue(updatableApp);
- assert.equal('updatesAvailableMessage{"n":0}',
+ assert.equal('updateAvailableInfo{"n":0}',
UpdateManager.message.textContent);
});

0 comments on commit 08e3c4e

Please sign in to comment.
Something went wrong with that request. Please try again.