From b50f4579cce67e6acb6a22e4431c69684205fc6e Mon Sep 17 00:00:00 2001 From: colorbox Date: Tue, 21 Mar 2017 20:58:13 +0900 Subject: [PATCH 1/2] Update English description to Japanese --- app/controllers/order_items_controller.rb | 4 ++-- app/views/order_items/index.html.slim | 2 +- spec/features/order_spec.rb | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/controllers/order_items_controller.rb b/app/controllers/order_items_controller.rb index 66761a4..c2511c0 100644 --- a/app/controllers/order_items_controller.rb +++ b/app/controllers/order_items_controller.rb @@ -19,7 +19,7 @@ def create @order_item = @order.order_items.build(order_item_params) if @order_item.save - redirect_to order_order_items_path(@order) , notice: 'Order item was successfully created.' + redirect_to order_order_items_path(@order) , notice: '注文しました' else render :new end @@ -39,7 +39,7 @@ def update def destroy @order_item.destroy if @order_item - notice = "#{@order_item.customer_name}'s' #{@order_item.lunchbox.name} item was successfully deleted." + notice = "#{@order_item.customer_name} さんの #{@order_item.lunchbox.name} の注文を取り消しました。" redirect_to order_order_items_path(@order_item.order) , notice: notice end end diff --git a/app/views/order_items/index.html.slim b/app/views/order_items/index.html.slim index 3379ae8..6e0afad 100644 --- a/app/views/order_items/index.html.slim +++ b/app/views/order_items/index.html.slim @@ -18,5 +18,5 @@ table(border=1) td.name(align="center") = "✓" - else td.name = "" - td.name = link_to "cancel", order_order_item_path(@order, item), method: :delete, data: {confirm: 'Are you certain you want to delete this?'} + td.name = link_to "予約取り消し", order_order_item_path(@order, item), method: :delete, data: {confirm: 'この注文を取り消しますか？'} diff --git a/spec/features/order_spec.rb b/spec/features/order_spec.rb index 8a36960..e0d407f 100644 --- a/spec/features/order_spec.rb +++ b/spec/features/order_spec.rb @@ -49,9 +49,9 @@ visit order_order_items_path(order) expect(page).to have_text(order_item.customer_name) - expect(page).to have_text('cancel') + expect(page).to have_text('予約取り消し') - click_link('cancel') + click_link('予約取り消し') expect(page).not_to have_text(order_item.customer_name) end @@ -62,7 +62,7 @@ visit order_order_items_path(order) expect(page).to have_text(order_item.customer_name) - expect(page).not_to have_link('cancel') + expect(page).not_to have_link('予約取り消し') end end From f29bc9283fa87a0581a8f98187773cf944934cfe Mon Sep 17 00:00:00 2001 From: colorbox Date: Fri, 24 Mar 2017 01:40:12 +0900 Subject: [PATCH 2/2] Update double quotation to single for readability --- app/views/order_items/index.html.slim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/order_items/index.html.slim b/app/views/order_items/index.html.slim index 6e0afad..9e4457c 100644 --- a/app/views/order_items/index.html.slim +++ b/app/views/order_items/index.html.slim @@ -18,5 +18,5 @@ table(border=1) td.name(align="center") = "✓" - else td.name = "" - td.name = link_to "予約取り消し", order_order_item_path(@order, item), method: :delete, data: {confirm: 'この注文を取り消しますか？'} + td.name = link_to '予約取り消し', order_order_item_path(@order, item), method: :delete, data: {confirm: 'この注文を取り消しますか？'}