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

Commit

Permalink
Merge pull request #26267 from yzen/bug-1101192
Browse files Browse the repository at this point in the history
Bug 1101192 - added labels for missing elements in Email's manual setup.
  • Loading branch information
yzen committed Nov 20, 2014
2 parents fc05945 + 250fd76 commit c187734
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 3 deletions.
10 changes: 7 additions & 3 deletions apps/email/js/cards/setup_manual_config.html
Expand Up @@ -2,7 +2,8 @@
expects a section element -->
<section class="skin-organic form-card bbshim" role="region">
<header class="sup-account-header">
<a data-event="click:onBack" href="#" class="sup-back-btn">
<a data-event="click:onBack" href="#" class="sup-back-btn" role="button"
data-l10n-id="back-button">
<span class="icon icon-back"></span>
</a>
<h1 class="sup-account-header-label header-label"
Expand Down Expand Up @@ -48,6 +49,7 @@ <h2 data-l10n-id="setup-manual-account-type">AccounT TypE</h2>
<span class="button icon icon-dialog">
<select data-prop="accountTypeNode"
data-event="change:onChangeAccountType"
data-l10n-id="setup-manual-account-type-select"
class="mail-select sup-manual-account-type">
<option value="imap+smtp">IMAP+SMTP</option>
<option value="pop3+smtp">POP3+SMTP</option>
Expand Down Expand Up @@ -93,7 +95,8 @@ <h2 data-l10n-id="setup-manual-account-type">AccounT TypE</h2>
</p>
<li class="sup-socket-select-container">
<span class="button icon icon-dialog">
<select class="mail-select sup-manual-composite-socket sup-socket-select">
<select class="mail-select sup-manual-composite-socket sup-socket-select"
data-l10n-id="setup-manual-socket-select">
<option value="SSL" data-l10n-id="setup-manual-socket-ssl">
SsL</option>
<option value="STARTTLS" data-l10n-id="setup-manual-socket-starttls">
Expand Down Expand Up @@ -139,7 +142,8 @@ <h2 data-l10n-id="setup-manual-smtp-header">SmtP SettingS</h2>
</p>
<li class="sup-socket-select-container">
<span class="button icon icon-dialog">
<select class="mail-select sup-manual-smtp-socket sup-socket-select">
<select class="mail-select sup-manual-smtp-socket sup-socket-select"
data-l10n-id="setup-manual-socket-select">
<option value="SSL" data-l10n-id="setup-manual-socket-ssl">
SsL</option>
<option value="STARTTLS" data-l10n-id="setup-manual-socket-starttls">
Expand Down
13 changes: 13 additions & 0 deletions apps/email/locales/email.en-US.properties
@@ -1,3 +1,8 @@
# LOCALIZATION NOTE(back-button): For various cards, a label for a general
# purpose header back button rendered as an icon. The following string is spoken
# by screen readers and not shown on the screen.
back-button.ariaLabel=Back

setup-app-name-header=Mail

setup-empty-account-prompt=You are not set up to send or receive email. Would you like to do that now?
Expand Down Expand Up @@ -101,6 +106,10 @@ setup-manual-config2=Manual setup

setup-manual-config-header=Manual Setup
setup-manual-account-type=Account type
# LOCALIZATION NOTE(setup-manual-account-type-select): For the manual setup
# screen, the label for account type select box. The following string is spoken
# by screen readers and not shown on the screen.
setup-manual-account-type-select.ariaLabel=Account type
setup-manual-imap-header=IMAP settings
setup-manual-pop3-header=POP3 settings
setup-manual-smtp-header=SMTP settings
Expand All @@ -112,6 +121,10 @@ setup-manual-socket=Socket Type
setup-manual-socket-ssl=SSL
# Technical term, should not be translated
setup-manual-socket-starttls=STARTTLS
# LOCALIZATION NOTE(setup-manual-socket-select): For the manual setup screen,
# the label for connection security select box. The following string is spoken
# by screen readers and not shown on the screen.
setup-manual-socket-select.ariaLabel=Connection security

setup-manual-hostname.placeholder=Hostname
setup-manual-port.placeholder=Port Number
Expand Down

0 comments on commit c187734

Please sign in to comment.