Merge pull request #59 from colorbox/51-japanesize

51 文言の日本語化
esminc · Mar 23, 2017 · 65c53b2 · 65c53b2
2 parents 9488bd7 + f29bc92
commit 65c53b2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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