Skip to content
This repository has been archived by the owner on Nov 3, 2021. It is now read-only.

Bug 984882 - 946874 l10n follow up. #17290

Merged
merged 1 commit into from
Mar 19, 2014
Merged

Bug 984882 - 946874 l10n follow up. #17290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/communications/dialer/js/calls_handler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
10 changes: 7 additions & 3 deletions apps/communications/dialer/js/handled_call.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand All @@ -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));

Expand Down
4 changes: 2 additions & 2 deletions apps/communications/dialer/locales/dialer.en-US.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=<span>via</span> 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
Expand Down
3 changes: 3 additions & 0 deletions apps/communications/dialer/oncall.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,9 @@
<div class="direction"></div>
</div>
<div class="sim">
<!-- Depending on the context, none or only one of those will be displayed -->
<span class="via-sim"></span>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add a HTML comment explaining that we will display 0 or 1 of those indications depending on the state of the call?

<span class="sim-number"></span>
</div>
<button class="merge-button">Merge</button>
</section>
Expand Down
11 changes: 7 additions & 4 deletions apps/communications/dialer/style/oncall.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -919,6 +919,9 @@
}

/* DSDS SIM indication support */
.sim .sim-number {
display: none;
}

/* Call screen, only 1 open line */
.big-duration .sim {
Expand Down Expand Up @@ -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 {
Expand All @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions apps/communications/dialer/test/unit/calls_handler_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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});
});
});
});
Expand Down
16 changes: 12 additions & 4 deletions apps/communications/dialer/test/unit/handled_call_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ suite('dialer/handled_call', function() {
'</div>' +
'</div>' +
'<div class="sim">' +
'<span class="via-sim"></span>' +
'<span class="sim-number"></span>' +
'</div>' +
'<button class="merge-button"></button>' +
'</section>';
Expand Down Expand Up @@ -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);
});
});

Expand All @@ -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});
});
});
});
Expand Down