Skip to content

Commit

Permalink
Translate "'s Room" in default room
Browse files Browse the repository at this point in the history
  • Loading branch information
Mariam05 committed Jul 7, 2023
1 parent 6e6d6a2 commit 861a2ca
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def create_default_room

User.includes(:rooms).where(role_id: role_params[:role_id]).where(rooms: { id: nil }).find_in_batches do |group|
group.each do |user|
Room.create(name: "#{user.name}'s Room", user_id: user.id)
Room.create(name: t('room.new_room_name', username: user.name, locale: user.language), user_id: user.id)
end
end
end
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/application_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ def create_default_room(user)
return unless user.rooms.count <= 0
return unless PermissionsChecker.new(permission_names: 'CreateRoom', user_id: user.id, current_user: user, current_provider:).call

Room.create(name: "#{user.name}'s Room", user_id: user.id)
Room.create(name: t('room.new_room_name', username: user.name, locale: user.language), user_id: user.id)
end

# Include user domain in lograge logs
Expand Down
2 changes: 2 additions & 0 deletions config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,5 @@ en:
reset_password: Reset Password
link_expires: The link will expire in 1 hour.
ignore_request: If you did not make a request to change your password, please ignore this email.
room:
new_room_name: "%{username}'s Room"
12 changes: 6 additions & 6 deletions spec/controllers/users_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
name: Faker::Name.name,
email: Faker::Internet.email,
password: 'Password123+',
language: 'language'
language: 'en'
}
}
end
Expand Down Expand Up @@ -69,7 +69,7 @@
context 'User language' do
it 'Persists the user language in the user record' do
post :create, params: user_params
expect(User.find_by(email: user_params[:user][:email]).language).to eq('language')
expect(User.find_by(email: user_params[:user][:email]).language).to eq('en')
end

it 'defaults user language to default_locale if the language isn\'t specified' do
Expand Down Expand Up @@ -148,11 +148,11 @@

context 'User language' do
it 'defaults user language to admin language if the language isn\'t specified' do
signed_in_user.update! language: 'language'
signed_in_user.update! language: 'en'

user_params[:user][:language] = nil
post :create, params: user_params
expect(User.find_by(email: user_params[:user][:email]).language).to eq('language')
expect(User.find_by(email: user_params[:user][:email]).language).to eq('en')
expect(response).to have_http_status(:created)
expect(session[:session_token]).to eql(signed_in_user.session_token)
end
Expand Down Expand Up @@ -202,7 +202,7 @@
name: 'Optimus Prime',
email: 'optimus@autobots.cybertron',
password: 'Autobots1!',
language: 'teletraan'
language: 'en'
}

expect { post :create, params: { user: user_params } }.to change(User, :count).from(0).to(1)
Expand Down Expand Up @@ -313,7 +313,7 @@
it 'updates the users attributes' do
updated_params = {
name: 'New Name',
language: 'gl'
language: 'fr'
}
patch :update, params: { id: user.id, user: updated_params }
expect(response).to have_http_status(:ok)
Expand Down

0 comments on commit 861a2ca

Please sign in to comment.