Translate Devise's help text

diff --git a/CutenServer/app/views/teachers/registrations/edit.html.haml b/CutenServer/app/views/teachers/registrations/edit.html.haml
index 5113d40..7ac32e5 100644 (file)
--- a/CutenServer/app/views/teachers/registrations/edit.html.haml
+++ b/CutenServer/app/views/teachers/registrations/edit.html.haml
@@ -12,7 +12,7 @@
       = g.label
       = g.controls do |c|
         = c.password_field :autocomplete => "off"
-        %i.inline-help leave blank if you don't want to change it
+        %i.inline-help= t('devise.registrations.teacher.help.password')
     = f.control_group :password_confirmation do |g|
       = g.label
       = g.controls do |c|
@@ -21,7 +21,6 @@
       = g.label
       = g.controls do |c|
         = c.password_field
-        %i.inline-help we need your current password to confirm your changes
     = f.control_group :name do |g|
       = g.label
       = g.controls do |c|

diff --git a/CutenServer/app/views/users/registrations/edit.html.haml b/CutenServer/app/views/users/registrations/edit.html.haml
index 71f2baf..e7f4d58 100644 (file)
--- a/CutenServer/app/views/users/registrations/edit.html.haml
+++ b/CutenServer/app/views/users/registrations/edit.html.haml
@@ -11,7 +11,7 @@
       = g.label
       = g.controls do |c|
         = c.password_field :autocomplete => "off"
-        %i.inline-help leave blank if you don't want to change it
+        %i.inline-help= t('devise.registrations.user.help.password')
     = f.control_group :password_confirmation do |g|
       = g.label
       = g.controls do |c|
@@ -20,7 +20,6 @@
       = g.label
       = g.controls do |c|
         = c.password_field
-        %i.inline-help we need your current password to confirm your changes
     = f.control_group :student_number do |g|
       = g.label
       = g.controls do |c|

diff --git a/CutenServer/config/locales/en.yml b/CutenServer/config/locales/en.yml
index e9ffd5c..3ef89b7 100644 (file)
--- a/CutenServer/config/locales/en.yml
+++ b/CutenServer/config/locales/en.yml
@@ -6,6 +6,13 @@ en:
     sign_in: "Sign in"
     sign_out: "Sign out"
     edit: "Edit profile"
+    registrations:
+      user:
+        help:
+          password: leave blank if you don't want to change it
+      teacher:
+        help:
+          password: leave blank if you don't want to change it
   home:
     profile: Profile
     lecture: Lecture

diff --git a/CutenServer/config/locales/ja.yml b/CutenServer/config/locales/ja.yml
index f061a1d..6a35453 100644 (file)
--- a/CutenServer/config/locales/ja.yml
+++ b/CutenServer/config/locales/ja.yml
@@ -15,9 +15,13 @@ ja:
       user:
         signed_up: サインアップしました
         updated: 更新しました
+        help:
+          password: 変更しない場合は空のままにしてください
       teacher:
         signed_up: 教師としてサインアップしました
         updated: 更新しました
+        help:
+          password: 変更しない場合は空のままにしてください
     failure:
       already_authenticated: ログイン済みです
       invalid: メールアドレスまたはパスワードが不正です