Skip to content

Commit

Permalink
Merge pull request openedx#389 from kawaguchi-ks/develop/cypress/fix-…
Browse files Browse the repository at this point in the history
…trans-347

Modify error messages (openedx#347)
  • Loading branch information
kawaguchi-ks committed Oct 1, 2015
2 parents 6478819 + e43083d commit 1fe5476
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 5 deletions.
4 changes: 2 additions & 2 deletions conf/locale/ja_JP/LC_MESSAGES/django-partial.po
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,7 @@ msgstr "再アクティベーション用のメールの送信ができません

#: common/djangoapps/student/views.py:2059
msgid "Valid e-mail address required."
msgstr "正しいメールアドレスが必要です。"
msgstr "メールアドレスの形式が間違っています。見直してください。"

#: common/djangoapps/student/views.py:2062
msgid "Old email is the same as the new email."
Expand Down Expand Up @@ -8200,7 +8200,7 @@ msgstr "ユーザー設定の更新のデータが提供されていません"

#: openedx/core/lib/api/view_utils.py:151
msgid "This value is invalid."
msgstr "値が不正です。"
msgstr "入力値に問題があるので見直してください。"

#: openedx/core/lib/api/view_utils.py:197
msgid "This field is not editable"
Expand Down
4 changes: 2 additions & 2 deletions conf/locale/ja_JP/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -711,7 +711,7 @@ msgstr "再アクティベーション用のメールの送信ができません

#: common/djangoapps/student/views.py
msgid "Valid e-mail address required."
msgstr "正しいメールアドレスが必要です。"
msgstr "メールアドレスの形式が間違っています。見直してください。"

#: common/djangoapps/student/views.py
msgid "Old email is the same as the new email."
Expand Down Expand Up @@ -8671,7 +8671,7 @@ msgstr "ユーザー設定の更新のデータが提供されていません"

#: openedx/core/lib/api/view_utils.py
msgid "This value is invalid."
msgstr "値が不正です。"
msgstr "入力値に問題があるので見直してください。"

#: openedx/core/lib/api/view_utils.py
msgid "This field is not editable"
Expand Down
10 changes: 9 additions & 1 deletion ga/conf/locale/ja_JP/LC_MESSAGES/gaccojs.po
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ msgstr "なし"

#: common/static/js/utils/edx.utils.validate.js
msgid "The email address you've provided isn't formatted correctly."
msgstr "正しいメールアドレスが必要です。"
msgstr "メールアドレスの形式が間違っています。見直してください。"

#: common/static/js/utils/edx.utils.validate.js
msgid "%(field)s must have at least %(count)d characters."
Expand Down Expand Up @@ -220,3 +220,11 @@ msgstr "まだ退会手続きは完了していません。「{email_address}」
#: lms/templates/student_account/register.underscore
msgid "If you are under 20 years old, you have to get permission of your parents to regist this site."
msgstr "※未成年の方がお申し込みをいただく場合は、親権者の同意が必要となります。"

#: lms/static/js/ajax-error.js
msgid ""
"You have been logged out of your edX account. "
"Click Okay to log in again now. "
"Click Cancel to stay on this page "
"(you must log in again to save your work)."
msgstr "ログアウトされています。再度ログインする場合はOKボタンを、このページに留まる場合はキャンセルボタンを押してください。(保存する場合は再度ログインが必要です)"

0 comments on commit 1fe5476

Please sign in to comment.