From 58a29d4d604ef64f40aa8af65ff6becbeeee12a7 Mon Sep 17 00:00:00 2001 From: Etienne Segonzac Date: Tue, 18 Mar 2014 15:18:15 +0100 Subject: [PATCH] Bug 984882 - 946874 l10n follow up. r=rik --- apps/communications/dialer/js/calls_handler.js | 4 ++-- apps/communications/dialer/js/handled_call.js | 10 +++++++--- .../dialer/locales/dialer.en-US.properties | 4 ++-- apps/communications/dialer/oncall.html | 3 +++ apps/communications/dialer/style/oncall.css | 11 +++++++---- .../dialer/test/unit/calls_handler_test.js | 4 ++-- .../dialer/test/unit/handled_call_test.js | 16 ++++++++++++---- 7 files changed, 35 insertions(+), 17 deletions(-) diff --git a/apps/communications/dialer/js/calls_handler.js b/apps/communications/dialer/js/calls_handler.js index 55b6575a91e8..8ac92de3fb47 100644 --- a/apps/communications/dialer/js/calls_handler.js +++ b/apps/communications/dialer/js/calls_handler.js @@ -253,8 +253,8 @@ var CallsHandler = (function callsHandler() { } if (navigator.mozIccManager.iccIds.length > 1) { - CallScreen.incomingSim.innerHTML = _('via-sim', - { n: call.serviceId + 1 }); + CallScreen.incomingSim.textContent = _('sim-number', + { n: call.serviceId + 1 }); } else { CallScreen.incomingSim.hidden = true; } diff --git a/apps/communications/dialer/js/handled_call.js b/apps/communications/dialer/js/handled_call.js index b0766db4a1bb..2e656d6d42e9 100644 --- a/apps/communications/dialer/js/handled_call.js +++ b/apps/communications/dialer/js/handled_call.js @@ -40,7 +40,8 @@ function HandledCall(aCall) { this.durationNode = this.node.querySelector('.duration'); this.durationChildNode = this.node.querySelector('.duration span'); - this.simNode = this.node.querySelector('.sim'); + this.viaSimNode = this.node.querySelector('.sim .via-sim'); + this.simNumberNode = this.node.querySelector('.sim .sim-number'); this.numberNode = this.node.querySelector('.numberWrapper .number'); this.additionalInfoNode = this.node.querySelector('.additionalContactInfo'); this.hangupButton = this.node.querySelector('.hangup-button'); @@ -63,9 +64,12 @@ function HandledCall(aCall) { this.durationChildNode.textContent = durationMessage; if (navigator.mozIccManager.iccIds.length > 1) { - this.simNode.innerHTML = _('via-sim', { n: this.call.serviceId + 1 }); + var n = this.call.serviceId + 1; + this.viaSimNode.textContent = _('via-sim', { n: n }); + this.simNumberNode.textContent = _('sim-number', { n: n }); } else { - this.simNode.hidden = true; + this.viaSimNode.hidden = true; + this.simNumberNode.hidden = true; } }).bind(this)); diff --git a/apps/communications/dialer/locales/dialer.en-US.properties b/apps/communications/dialer/locales/dialer.en-US.properties index 0bd5911aea3a..2a4ffb9d65a9 100644 --- a/apps/communications/dialer/locales/dialer.en-US.properties +++ b/apps/communications/dialer/locales/dialer.en-US.properties @@ -59,8 +59,8 @@ hold=Hold resume=Resume sendSms=Send Message callEnded=Call Ended -## LOCALIZATION NOTE "via" will be hidden in some cases -via-sim=via SIM{{ n }} +via-sim=via SIM{{ n }} +sim-number=SIM{{ n }} ## LOCALIZATION NOTE: these labels aren't displayed but they're used for acessibility hangup-a11y-button.aria-label=Hang Up diff --git a/apps/communications/dialer/oncall.html b/apps/communications/dialer/oncall.html index 2f15065f7840..e3dc590661cb 100644 --- a/apps/communications/dialer/oncall.html +++ b/apps/communications/dialer/oncall.html @@ -76,6 +76,9 @@
+ + +
diff --git a/apps/communications/dialer/style/oncall.css b/apps/communications/dialer/style/oncall.css index 4dab3222ecf9..2b7420a3e7d5 100644 --- a/apps/communications/dialer/style/oncall.css +++ b/apps/communications/dialer/style/oncall.css @@ -919,6 +919,9 @@ } /* DSDS SIM indication support */ + .sim .sim-number { + display: none; + } /* Call screen, only 1 open line */ .big-duration .sim { @@ -950,9 +953,12 @@ font-size: 1.3rem; line-height: 3rem; } - #call-screen[data-layout="incoming-locked"] .sim span { + #call-screen[data-layout="incoming-locked"] .sim .via-sim { display: none; } + #call-screen[data-layout="incoming-locked"] .sim .sim-number { + display: inline; + } /* Call waiting UI */ #incoming-container .sim { @@ -965,9 +971,6 @@ font-size: 1.3rem; line-height: 1.5rem; } - #incoming-container .sim span { - display: none; - } /* Hidden everywhere else */ #group-call-details-list .sim, diff --git a/apps/communications/dialer/test/unit/calls_handler_test.js b/apps/communications/dialer/test/unit/calls_handler_test.js index f7be3009763a..71bdeda9e3ec 100644 --- a/apps/communications/dialer/test/unit/calls_handler_test.js +++ b/apps/communications/dialer/test/unit/calls_handler_test.js @@ -241,8 +241,8 @@ suite('calls handler', function() { test('should show the receiving sim', function() { MockMozTelephony.mTriggerCallsChanged(); - assert.equal(CallScreen.incomingSim.textContent, 'via-sim'); - assert.deepEqual(MockLazyL10n.keys['via-sim'], {n: 2}); + assert.equal(CallScreen.incomingSim.textContent, 'sim-number'); + assert.deepEqual(MockLazyL10n.keys['sim-number'], {n: 2}); }); }); }); diff --git a/apps/communications/dialer/test/unit/handled_call_test.js b/apps/communications/dialer/test/unit/handled_call_test.js index e681492ddecc..37d15785de1f 100644 --- a/apps/communications/dialer/test/unit/handled_call_test.js +++ b/apps/communications/dialer/test/unit/handled_call_test.js @@ -73,6 +73,8 @@ suite('dialer/handled_call', function() { '' + '' + '
' + + '' + + '' + '
' + '' + ''; @@ -1061,11 +1063,12 @@ suite('dialer/handled_call', function() { }); suite('One SIM >', function() { - test('should hide the sim node', function() { + test('should hide the sim nodes', function() { mockCall = new MockCall('888', 'outgoing'); subject = new HandledCall(mockCall); - assert.isTrue(subject.simNode.hidden); + assert.isTrue(subject.viaSimNode.hidden); + assert.isTrue(subject.simNumberNode.hidden); }); }); @@ -1078,9 +1081,14 @@ suite('dialer/handled_call', function() { mockCall = new MockCall('888', 'outgoing'); subject = new HandledCall(mockCall); - assert.isFalse(subject.simNode.hidden); - assert.equal(subject.simNode.textContent, 'via-sim'); + assert.isFalse(subject.viaSimNode.hidden); + assert.isFalse(subject.simNumberNode.hidden); + + assert.equal(subject.viaSimNode.textContent, 'via-sim'); assert.deepEqual(MockLazyL10n.keys['via-sim'], {n: 2}); + + assert.equal(subject.simNumberNode.textContent, 'sim-number'); + assert.deepEqual(MockLazyL10n.keys['sim-number'], {n: 2}); }); }); });