Merge pull request #22185 from dmarcos/bug1039629

Bug 1039629 - [B2G] [Camera] Placeholder warning text is shown when Came...

apps/camera/js/controllers/battery.js

@@ -75,6 +75,12 @@ BatteryController.prototype.notifications = {
 BatteryController.prototype.updateStatus = function () {
   var previous = this.app.get('batteryStatus');
   var current = this.getStatus(this.battery);
+  // We need the app to be first localized
+  // before showing the battery status message
+  if (!this.app.localized()) {
+    this.app.on('localized', this.updateStatus);
+    return;
+  }
   if (current !== previous) {
     this.app.set('batteryStatus', current);
   }

apps/camera/test/unit/controllers/battery_test.js

@@ -34,6 +34,7 @@ suite('controllers/battery', function() {
     this.app.settings.battery = sinon.createStubInstance(this.Setting);
     this.app.settings.battery.get.withArgs('levels').returns(levels);
     this.app.l10n = { get: sinon.stub() };
+    this.app.localized = sinon.stub().returns(true);
     this.app.views = {
       notification: sinon.createStubInstance(this.NotificationView)
     };
@@ -126,6 +127,17 @@ suite('controllers/battery', function() {
       this.controller.updateStatus();
       assert.ok(this.app.set.calledWith('batteryStatus', 'healthy'));
     });
+
+    test('should wait for the app to be localized', function() {
+      this.app.battery.level = 0.06;
+      this.app.localized.returns(false);
+      this.controller.app.get
+        .withArgs('batteryStatus')
+        .returns('critical');
+
+      this.controller.updateStatus();
+      assert.ok(this.app.on.calledWith('localized'));
+    });
   });
 
   suite('BatteryController#onStatusChange()', function() {