Merge branch 'master' into 'master'

add password message

add password message

See merge request !3

app/views/seminars/show.html.erb

@@ -135,7 +135,7 @@
         <label for="password" class="col-sm-2 control-label">*<%= t('seminar_signup.password') %></label>
         <div class="col-sm-10">
           <%= f.text_field :password, :class=>"input-medium form-control", :placeholder=> t('seminar_signup.password') %>
-          ( 此密碼為下次投稿上傳檔案時必須輸入的密碼。 )
+          <%= t('seminar_signup.password_message') %>
         </div>
       </div>
     

config/locales/en.yml

@@ -77,6 +77,7 @@ en:
     address: Address #地址
     email: Email #e-mail信箱
     password: Password #密碼
+    password_message: '( This password is for uploading file when contributing. )'
     note: Note #註解
     time: 'Start / End Time' #(開始/結束)時間
     place: Place #地點

config/locales/zh_tw.yml

@@ -77,6 +77,7 @@ zh_tw:
     address: 地址
     email: e-mail信箱 
     password: 密碼
+    password_message: '( 此密碼為下次投稿上傳檔案時必須輸入的密碼。 )'
     note: 註解
     time: (開始/結束)時間
     place: 地點