Skip to content

Commit a439fa4

Browse files
feat(translations): consolidate miscellaneous error translations
1 parent ec08e91 commit a439fa4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+279
-364
lines changed

app/controllers/course/assessment/submission/submissions_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ def download_statistics
250250
submission_ids = @assessment.submissions.by_users(course_user_ids).pluck(:id)
251251
if submission_ids.empty?
252252
return render json: {
253-
error: I18n.t('course.assessment.submission.submissions.download_statistics.no_submission_statistics')
253+
error: I18n.t('errors.course.assessment.submission.download_statistics.no_submissions')
254254
}, status: :bad_request
255255
end
256256

app/controllers/course/survey/responses_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ def create
1414
@response.save!
1515
render_response_json
1616
else
17-
render json: { error: t('course.survey.responses.no_course_user') }, status: :bad_request
17+
render json: { error: t('errors.course.survey.responses.no_course_user') }, status: :bad_request
1818
end
1919
rescue ActiveRecord::RecordInvalid => e
2020
handle_create_error(e)

app/controllers/course/user_invitations_controller.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ def aggregate_errors
159159
def invalid_course_user_errors
160160
invalid_course_users.map do |course_user|
161161
user = self.class.helpers.display_course_user(course_user)
162-
t('course.user_invitations.errors.duplicate_user', user: user)
162+
t('errors.course.user_invitations.duplicate_user', user: user)
163163
end
164164
end
165165

@@ -176,7 +176,7 @@ def invalid_course_users
176176
def invalid_invitation_email_errors
177177
invalid_invitations.map do |invitation|
178178
message = invitation.errors.full_messages.to_sentence
179-
t('course.user_invitations.errors.invalid_email', email: invitation.email, message: message)
179+
t('errors.course.user_invitations.invalid_email', email: invitation.email, message: message)
180180
end
181181
end
182182

app/controllers/course/user_registrations_controller.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ def registration_params
2323
def ensure_unregistered_user
2424
return unless current_course.course_users.exists?(user: current_user)
2525

26-
role = t("course.users.role.#{current_course_user.role}")
27-
message = t('course.users.new.already_registered', role: role)
26+
role = t("errors.course.users.role.#{current_course_user.role}")
27+
message = t('errors.course.users.already_registered', role: role)
2828

2929
render json: { errors: message }, status: :conflict
3030
end

app/controllers/user/emails_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def set_primary
3333

3434
def send_confirmation
3535
if @email.confirmed?
36-
render json: { errors: t('.already_confirmed', email: @email.email) }, status: :bad_request
36+
render json: { errors: t('errors.user.emails.already_confirmed', email: @email.email) }, status: :bad_request
3737
else
3838
@email.send_confirmation_instructions
3939
head :ok

app/controllers/user/registrations_controller.rb

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,11 @@ class User::RegistrationsController < Devise::RegistrationsController
77
# GET /resource/sign_up
88
def new
99
if @invitation&.confirmed?
10-
message = @invitation.confirmer ? t('.used_with_email', email: @invitation.confirmer.email) : t('.used')
10+
message = if @invitation.confirmer
11+
t('errors.user.registrations.used_with_email', email: @invitation.confirmer.email)
12+
else
13+
t('errors.user.registrations.used')
14+
end
1115
render json: { message: message }, status: :conflict and return
1216
elsif @invitation.is_a?(Course::UserInvitation)
1317
course = @invitation.course
@@ -34,7 +38,7 @@ def new
3438
def create
3539
unless verify_recaptcha
3640
build_resource(sign_up_params)
37-
render json: { errors: { recaptcha: t('user.registrations.create.verify_recaptcha_alert') } },
41+
render json: { errors: { recaptcha: t('errors.user.registrations.verify_recaptcha_alert') } },
3842
status: :unprocessable_entity
3943
return
4044
end

app/helpers/application_html_formatters_helper.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def sanitize_ckeditor_rich_text(text)
4141
def format_code_block(code, language = nil, start_line = 1)
4242
if code_size_exceeds_limit?(code)
4343
content_tag(:div, class: 'alert alert-warning') do
44-
I18n.t('layouts.code_formatter.size_too_big')
44+
I18n.t('errors.code_formatter.size_too_big')
4545
end
4646
else
4747
sanitize_and_format_code(code, language, start_line)

app/helpers/application_jobs_helper.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ def job_error_message(error)
66

77
case error['class']
88
when Docker::Error::ConflictError.name
9-
I18n.t('course.assessment.answer.programming_auto_grading.job.failure.time_limit_breached')
9+
I18n.t('errors.course.assessment.answer.programming_auto_grading.job.failure.time_limit_breached')
1010
when Timeout::Error.name
11-
I18n.t('course.assessment.answer.programming_auto_grading.job.failure.timeout_error')
11+
I18n.t('errors.course.assessment.answer.programming_auto_grading.job.failure.timeout_error')
1212
when Docker::Error::TimeoutError
13-
I18n.t('course.assessment.answer.programming_auto_grading.job.failure.container_unreachable')
13+
I18n.t('errors.course.assessment.answer.programming_auto_grading.job.failure.container_unreachable')
1414
else
15-
I18n.t('course.assessment.answer.programming_auto_grading.job.failure.generic_error', error: error['message'])
15+
I18n.t('errors.course.assessment.answer.programming_auto_grading.job.failure.generic_error', error: error['message'])
1616
end
1717
end
1818
end

app/models/course/assessment/live_feedback/thread.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def validate_at_most_one_active_thread_per_submission_question
2222

2323
return if active_thread_count <= 1
2424

25-
errors.add(:base, I18n.t('course.assessment.live_feedback.thread.only_one_active_thread'))
25+
errors.add(:base, I18n.t('errors.course.assessment.live_feedback.thread.only_one_active_thread'))
2626
end
2727

2828
def sent_user_messages(user_id)

app/models/user/email.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ def set_new_user_primary_email
4444

4545
return if user.set_next_email_as_primary
4646

47-
errors.add(:base, I18n.t('user.emails.set_primary.no_confirmed_emails'))
47+
errors.add(:base, I18n.t('errors.user.emails.no_confirmed_emails'))
4848
raise ActiveRecord::Rollback
4949
end
5050

0 commit comments

Comments
 (0)