From 5c3fd15323c7f04e344a1258eb307e6f61c93d5e Mon Sep 17 00:00:00 2001
From: John Ma <jiama843@gmail.com>
Date: Wed, 3 Oct 2018 14:08:50 -0400
Subject: [PATCH] Fixed #283 (#284)

* <fixed translation errors>

* <fixed translation errors>

* <fixed translation errors>
---
 app/views/shared/components/_room_block.html.erb    | 2 +-
 app/views/shared/modals/_create_room_modal.html.erb | 2 +-
 app/views/shared/settings/_password.html.erb        | 6 +++---
 config/locales/en.yml                               | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/views/shared/components/_room_block.html.erb b/app/views/shared/components/_room_block.html.erb
index 8b97ba8a..6d3c9d68 100644
--- a/app/views/shared/components/_room_block.html.erb
+++ b/app/views/shared/components/_room_block.html.erb
@@ -15,7 +15,7 @@
 
 <div class="card">
   <div class="card-body p-1">
-    <table class="table table-hover table-vcenter text-nowrap table-no-border">
+    <table class="table table-hover table-vcenter text-wrap table-no-border">
       <tbody class="no-border-top">
         <td>
           <span class="stamp stamp-md bg-cyan">
diff --git a/app/views/shared/modals/_create_room_modal.html.erb b/app/views/shared/modals/_create_room_modal.html.erb
index 4ab6fa62..db6c5a12 100644
--- a/app/views/shared/modals/_create_room_modal.html.erb
+++ b/app/views/shared/modals/_create_room_modal.html.erb
@@ -36,7 +36,7 @@
               <span class="custom-switch-description"><%= t("modal.create_room.auto_join") %></span>
             </label>
           <div class="form-footer">
-            <%= f.submit "Create Room", id: "create-room-submit", class: "btn btn-outline-primary btn-block btn-pill" %>
+            <%= f.submit t("header.create_room"), id: "create-room-submit", class: "btn btn-outline-primary btn-block btn-pill" %>
           </div>
           <% end %>
         </div>
diff --git a/app/views/shared/settings/_password.html.erb b/app/views/shared/settings/_password.html.erb
index 0a0fee5a..4d770dad 100644
--- a/app/views/shared/settings/_password.html.erb
+++ b/app/views/shared/settings/_password.html.erb
@@ -18,13 +18,13 @@
   <div class="form-group">
     <div class="row">
       <div class="col-8">
-        <%= f.label t("settings.password.old"), class: "form-label" %>
+        <%= f.label :password, t("settings.password.old"), class: "form-label" %>
         <%= f.password_field :password, class: "form-control #{form_is_invalid?(@user, :password)}" %>
         <br>
-        <%= f.label t("settings.password.new"), class: "form-label" %>
+        <%= f.label :new_password, t("settings.password.new"), class: "form-label" %>
         <%= f.password_field :new_password, class: "form-control #{form_is_invalid?(@user, :password)}" %>
         <br>
-        <%= f.label t("settings.password.confirmation"), class: "form-label" %>
+        <%= f.label :password_confirmation, t("settings.password.confirmation"), class: "form-label" %>
         <%= f.password_field :password_confirmation, class: "form-control #{form_is_invalid?(@user, :password_confirmation)}" %>
       </div>
     </div>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index f23719ef..82fe17c7 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -114,7 +114,7 @@ en:
       public: Public
       unlisted: Unlisted
   room:
-    invited: You have been inivited to join
+    invited: You have been invited to join
     invite_participants: Invite Participants
     join: Join
     last_session: Last session on %{session}