From 2f5addc1745b1f1e036afadfb35d343ed961c36c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yago=20Gonz=C3=A1lez?= <yagogonzalezg@gmail.com>
Date: Sat, 25 Mar 2017 11:21:37 +0100
Subject: [PATCH] i18n: Add missed strings.

---
 static/js/subs.js                               |  4 ++--
 static/js/timerender.js                         |  4 ++--
 static/styles/settings.css                      |  5 +++--
 .../settings/account-settings.handlebars        |  4 ++--
 .../templates/settings/bot-settings.handlebars  | 17 ++++++++---------
 .../settings/display-settings.handlebars        |  2 +-
 .../settings/muted-topics-settings.handlebars   |  6 +++---
 .../templates/stream_sidebar_actions.handlebars |  1 +
 .../templates/subscription_settings.handlebars  |  8 ++++----
 templates/zerver/dev_login.html                 |  2 +-
 templates/zerver/settings_overlay.html          |  2 +-
 templates/zerver/settings_sidebar.html          |  2 +-
 12 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/static/js/subs.js b/static/js/subs.js
index 521afe39f3..c8c12d640f 100644
--- a/static/js/subs.js
+++ b/static/js/subs.js
@@ -594,8 +594,8 @@ exports.setup_page = function (callback) {
             name: "stream-filter-toggle",
             selected: 0,
             values: [
-                { label: "Subscribed" },
-                { label: "All streams" },
+                { label: i18n.t("Subscribed") },
+                { label: i18n.t("All streams") },
             ],
             callback: function () {
                 actually_filter_streams();
diff --git a/static/js/timerender.js b/static/js/timerender.js
index f9e31a3388..331d7231aa 100644
--- a/static/js/timerender.js
+++ b/static/js/timerender.js
@@ -24,9 +24,9 @@ exports.render_now = function (time) {
     var days_old = Math.round(start_of_other_day.diffDays(start_of_today));
 
     if (days_old === 0) {
-        return ["Today", true];
+        return [i18n.t("Today"), true];
     } else if (days_old === 1) {
-        return ["Yesterday", true];
+        return [i18n.t("Yesterday"), true];
     } else if (days_old >= 365) {
         // For long running servers, searching backlog can get ambiguous
         // without a year stamp. Only show year if message is over a year old.
diff --git a/static/styles/settings.css b/static/styles/settings.css
index ce752e5b1a..6e08481171 100644
--- a/static/styles/settings.css
+++ b/static/styles/settings.css
@@ -626,12 +626,13 @@ input[type=checkbox].inline-block {
     white-space: pre;
 }
 
-.edit_bot_form .control-label,
 #create_bot_form .control-label,
 #create_alert_word_form .control-label,
+#get_api_key_box .control-label,
 .admin-emoji-form .control-label,
 .admin-filter-form .control-label,
-.default-stream-form .control-label {
+.default-stream-form .control-label,
+.edit_bot_form .control-label {
     width: 10em;
     text-align: right;
     margin-right: 20px;
diff --git a/static/templates/settings/account-settings.handlebars b/static/templates/settings/account-settings.handlebars
index e8a0a3d9c1..4284df256a 100644
--- a/static/templates/settings/account-settings.handlebars
+++ b/static/templates/settings/account-settings.handlebars
@@ -8,7 +8,7 @@
     <form class="email-change-form">
       <p for="change_email" class="inline-block title">
         {{t "Email" }}: <span id='email_value'>{{page_params.email}}</span>
-        <a id="change_email" href="#change_email" {{#if page_params.realm_email_changes_disabled}}style="display:none" {{/if}}title="{{t 'Change email' }}">[Change]</a>
+        <a id="change_email" href="#change_email" {{#if page_params.realm_email_changes_disabled}}style="display:none" {{/if}}title="{{t 'Change email' }}">[{{t "Change" }}]</a>
         <i class="icon-vector-question-sign change_email_tooltip" {{#unless page_params.realm_email_changes_disabled}}style="display:none" {{/unless}} data-toggle="tooltip"
         title="{{t 'Changing email addresses has been disabled by your Zulip organization administrators. Contact an administrator for help.' }}"></i>
       </p>
@@ -84,7 +84,7 @@
 
           <div class="input-group no-border">
             <label for="" class="inline-block"></label>
-            <input type="submit" class="button w-200 sea-green input-size" name="change_settings" value="Save Changes" />
+            <input type="submit" class="button w-200 sea-green input-size" name="change_settings" value="{{t 'Save changes' }}" />
           </div>
           <div class="input-group">
             <label for="" class="inline-block"></label>
diff --git a/static/templates/settings/bot-settings.handlebars b/static/templates/settings/bot-settings.handlebars
index 2a33f6b0ba..a6c6214e5a 100644
--- a/static/templates/settings/bot-settings.handlebars
+++ b/static/templates/settings/bot-settings.handlebars
@@ -6,12 +6,12 @@
   </div>
 
   <div class="bot-settings-form">
-    {{#tr this}}
     <p class="bot-settings-note padded-container">
+    {{#tr this}}
       Looking for our <a href="/integrations" target="_blank">Integrations</a>
       or <a href="{{ server_uri }}/api" target="_blank">API</a> documentation?
-    </p>
     {{/tr}}
+    </p>
 
     <ul class="nav nav-tabs nav-justified" id="bots_lists_navbar">
       <li class="active active-bots-tab"><a>{{t "Active bots" }}</a></li>
@@ -28,7 +28,7 @@
 
     <div class="add-new-bot-box grey-bg">
       <form id="create_bot_form" class="form-horizontal no-padding">
-        <h4 class="new-bot-section-title light no-margin">Add a new bot</h4>
+        <h4 class="new-bot-section-title light no-margin">{{t "Add a new bot" }}</h4>
         <div class="new-bot-form">
           <div class="input-group">
             <label for="create_bot_name">{{t "Full name" }}</label>
@@ -71,21 +71,20 @@
 
     <div class="form-horizontal" id="api_key_button_box">
       <div class="input-group side-padded-container">
+        <p class="api-key-note">
         {{#tr this}}
-        <p class="api-key-note">For most bots using the API, you'll want to give each bot
+          For most bots using the API, you'll want to give each bot
           its own name and API key using the above section.  But if you
           want to write a bot that can access your own private
           messages, you should use your personal API key.
-        </p>
         {{/tr}}
+        </p>
         <button class="button white" id="api_key_button">{{t "Show/change your API key" }}</button>
       </div>
     </div>
     <div id="get_api_key_box" class="side-padded-container">
-      {{#tr this}}
-      <p>Please re-enter your password to confirm your identity.
-        <a href="/accounts/password/reset/" target="_blank">Forgotten it?</a></p>
-      {{/tr}}
+      <p>{{t "Please re-enter your password to confirm your identity." }}
+        <a href="/accounts/password/reset/" target="_blank">{{t "Forgotten it?" }}</a></p>
       <form action="/json/fetch_api_key" method="post" class="form-horizontal">
         <div class="control-group">
           <label for="password" class="control-label">{{t "Current password" }}</label>
diff --git a/static/templates/settings/display-settings.handlebars b/static/templates/settings/display-settings.handlebars
index 605803c7d1..e008551be6 100644
--- a/static/templates/settings/display-settings.handlebars
+++ b/static/templates/settings/display-settings.handlebars
@@ -8,7 +8,7 @@
 
     <p for="default_language" class="inline-block title">
       {{t "Default language" }}: <span id='default_language_name'>{{page_params.default_language_name}}</span>
-      <a id="default_language" href="#default_language" title="{{t 'Change default language' }}">[Change]</a>
+      <a id="default_language" href="#default_language" title="{{t 'Change default language' }}">[{{t "Change" }}]</a>
     </p>
 
     <div id="default_language_modal" class="modal hide" tabindex="-1" role="dialog"
diff --git a/static/templates/settings/muted-topics-settings.handlebars b/static/templates/settings/muted-topics-settings.handlebars
index 58d253c7db..cb1247701d 100644
--- a/static/templates/settings/muted-topics-settings.handlebars
+++ b/static/templates/settings/muted-topics-settings.handlebars
@@ -5,9 +5,9 @@
   </div>
   <table id="muted_topics_table" class="table">
     <thead>
-      <th>Stream</th>
-      <th>Topic</th>
-      <th>Actions</th>
+      <th>{{t "Stream" }}</th>
+      <th>{{t "Topic" }}</th>
+      <th>{{t "Actions" }}</th>
     </thead>
     <tbody></tbody>
   </table>
diff --git a/static/templates/stream_sidebar_actions.handlebars b/static/templates/stream_sidebar_actions.handlebars
index 264080cc4e..753c3df1dd 100644
--- a/static/templates/stream_sidebar_actions.handlebars
+++ b/static/templates/stream_sidebar_actions.handlebars
@@ -48,6 +48,7 @@
     <li>
         <a class="popover_sub_unsub_button" data-name="{{stream.name}}">
             <i class='icon-vector-envelope'></i>
+            {{t "Unsubscribe" }}
         </a>
     </li>
     <li>
diff --git a/static/templates/subscription_settings.handlebars b/static/templates/subscription_settings.handlebars
index 31efbd6484..178a049e6d 100644
--- a/static/templates/subscription_settings.handlebars
+++ b/static/templates/subscription_settings.handlebars
@@ -17,7 +17,7 @@
       {{/if}}
     </div>
     <button class="button small white rounded subscribe-button sub_unsub_button {{#unless subscribed }}unsubscribed{{/unless}}" type="button" name="button">
-        {{#if subscribed }}Unsubscribe{{else}}Subscribe{{/if}}</button>
+        {{#if subscribed }}{{#tr oneself }}Unsubscribe{{/tr}}{{else}}{{#tr oneself }}Subscribe{{/tr}}{{/if}}</button>
     <a href="{{preview_url}}" class="button small white rounded" id="preview-stream-button" role="button">{{t "View stream"}}</a>
   </div>
   <div class="stream-description" data-no-description="{{t 'No description.' }}">
@@ -33,7 +33,7 @@
         {{partial "subscription_type"}}
       </div>
         {{#if is_admin}}
-          <a class="change-stream-privacy" data-is-private="{{#if can_make_public}}true{{else}}false{{/if}}">{{t "[Change]"}}</a>
+          <a class="change-stream-privacy" data-is-private="{{#if can_make_public }}true{{else}}false{{/if}}">[{{t "Change" }}]</a>
         {{/if}}
     </div>
     <div class="subscription-config">
@@ -41,7 +41,7 @@
       <li>
         <div id="sub_setting_not_in_home_view" class="sub_setting_checkbox sub-mute-setting">
           <input id="mutestream-{{stream_id}}" class="sub_setting_control" type="checkbox" tabindex="-1" {{#unless in_home_view}}checked{{/unless}} />
-          <label class="subscription-control-label">Mute stream</label>
+          <label class="subscription-control-label">{{t "Mute stream" }}</label>
           <p class="mute-note {{#if in_home_view}}hide-mute-note{{/if}}">{{t "Muted streams don't show up in your home view or generate notifications unless you are mentioned." }}</p>
         </div>
       </li>
@@ -76,7 +76,7 @@
     </div>
     {{#if email_address}}
     <div class="stream-email-box">
-      <div class="sub_settings_title">Email address <i class="icon-vector-question-sign stream-email-hint" id="email-address-hint-{{stream_id}}"></i></div>
+      <div class="sub_settings_title">{{t "Email address" }} <i class="icon-vector-question-sign stream-email-hint" id="email-address-hint-{{stream_id}}"></i></div>
       <div class="stream-email">
           <span class="email-address">{{email_address}}</span>
       </div>
diff --git a/templates/zerver/dev_login.html b/templates/zerver/dev_login.html
index b8c8ed608c..ee1277802d 100644
--- a/templates/zerver/dev_login.html
+++ b/templates/zerver/dev_login.html
@@ -5,7 +5,7 @@
 <div class="app login-page">
     <div class="app-main login-page-container">
         <h4 class="login-page-header">{{ _('Click on a user to log in!') }}</h4>
-        <p class="devlogin_subheader">(Or visit the <a href="/login">normal login page</a>)</p>
+        <p class="devlogin_subheader">{{ _('(Or visit the <a href="/login">normal login page</a>)') }}</p>
         <form name="direct_login_form" id="direct_login_form" method="post" class="login-form"
             action="{{ url('zerver.views.auth.dev_direct_login') }}">
             {{ csrf_input }}
diff --git a/templates/zerver/settings_overlay.html b/templates/zerver/settings_overlay.html
index b1fa0228b8..70ed5f399b 100644
--- a/templates/zerver/settings_overlay.html
+++ b/templates/zerver/settings_overlay.html
@@ -81,7 +81,7 @@
             <ul>
                 <li>
                     <div class="icon icon-vector-off"></div>
-                    <a href="#logout" class="no-style logout_button"><div class="text">Log Out</div></a>
+                    <a href="#logout" class="no-style logout_button"><div class="text">{{ _('Log out') }}</div></a>
                 </li>
             </ul>
         </div>
diff --git a/templates/zerver/settings_sidebar.html b/templates/zerver/settings_sidebar.html
index f2650d0b57..11c3db5c10 100644
--- a/templates/zerver/settings_sidebar.html
+++ b/templates/zerver/settings_sidebar.html
@@ -40,7 +40,7 @@
                     </div>
                     <div class="buttons">
                         <input type="submit" class="btn btn-primary edit_bot_button" value="{{ _('Save') }}" />
-                        <button type="button" class="btn btn-default reset_edit_bot" data-sidebar-form-close>Cancel</button>
+                        <button type="button" class="btn btn-default reset_edit_bot" data-sidebar-form-close>{{ _('Cancel') }}</button>
                         <div class="edit_bot_spinner"></div>
                     </div>
                 </div>