Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Bug 848916 - back out new strings for just 1.0.1 to keep string freeze #8785

Closed
wants to merge 1 commit into from

1 participant

@Pike

We should try hard to not take the strings in bug 848916 for 1.0.1.
Doing this by disabling the calls to displayError, and then remove the strings again.

This PR is for 1.0.1 only, the new strings should stay on master and v1-train.

@Pike Pike closed this
@Pike Pike deleted the Pike:bug-848916-backout-strings branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
View
9 apps/gallery/js/open.js
@@ -41,7 +41,8 @@ window.addEventListener('localized', function() {
// Report errors if we're passed an invalid image
frame.onerror = function invalid() {
- displayError('imageinvalid');
+ // 1.0.1 only, ignore error
+ // displayError('imageinvalid');
};
}
@@ -80,7 +81,8 @@ window.addEventListener('localized', function() {
// If the image is too large, display an error
if (pixels > MAX_IMAGE_SIZE) {
- displayError('imagetoobig');
+ // 1.0.1 only, ignore error
+ // displayError('imagetoobig');
return;
}
@@ -130,7 +132,8 @@ window.addEventListener('localized', function() {
frame.displayImage(blob);
}
else {
- displayError('imagetoobig');
+ // 1.0.1 only, ignore error
+ // displayError('imagetoobig');
}
}
}
View
3  apps/gallery/locales/gallery.en-US.properties
@@ -51,6 +51,3 @@ pluggedin2-text = Unplug the phone to use this app.
share-noprovider = Can not share this image file type.
memorycardfull = Can not edit photos: Memory card is full.
-
-imagetoobig = Image is too large to display on this device.
-imageinvalid = Image is invalid or corrupt and cannot be displayed.
Something went wrong with that request. Please try again.