From dc41080eb1f9036bb964a4d6aa62779772ac428c Mon Sep 17 00:00:00 2001
From: Daiki <nojiri1098@gmail.com>
Date: Wed, 8 Apr 2020 12:44:21 +0900
Subject: [PATCH 1/5] =?UTF-8?q?Replace=20=E6=AE=8B=E3=82=8A=E7=97=85?=
 =?UTF-8?q?=E5=BA=8A=E6=95=B0=20to=20=E7=97=85=E5=BA=8A=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/locales/en.json                   | 4 ++--
 assets/locales/ja.json                   | 4 ++--
 components/cards/SickbedsSummaryCard.vue | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/assets/locales/en.json b/assets/locales/en.json
index 6a6b346b5921c..102a67465e275 100644
--- a/assets/locales/en.json
+++ b/assets/locales/en.json
@@ -189,11 +189,11 @@
   "合計": "Total",
   "{date}の全体累計": "Cumulative total as of %{date}",
   "{date}の合計": "Total of %{date}",
-  "入院患者数と残り病床数": "Number of Hospitalized Patients and Remaining Sickbeds",
+  "入院患者数と病床数": "Number of Hospitalized Patients and Remaining Sickbeds",
   "床": "beds",
   "総病床数": "Total Number of Sickbeds",
   "入院患者数": "Hospitalized Patients",
-  "残り病床数": "Remaining Sickbeds",
+  "病床数": "Remaining Sickbeds",
   "最新のお知らせ": "What's new",
   "都の備蓄マスク20万枚を都内全区市町村へ提供": "Oita Prefecture Government provides the stockpile of masks for all the wards: and the municipalities in Oita (in Japanese)",
   "都内医療機関及び保健所等へのマスクの配布について": "Regarding the distribution of masks to medical institutions: public health centers: etc.: in Oita",
diff --git a/assets/locales/ja.json b/assets/locales/ja.json
index 997de952ef099..8575e9d027f44 100644
--- a/assets/locales/ja.json
+++ b/assets/locales/ja.json
@@ -191,11 +191,11 @@
   "合計": "合計",
   "{date}の全体累計": "%{date}の全体累計",
   "{date}の合計": "%{date}の合計",
-  "入院患者数と残り病床数": "入院患者数と残り病床数",
+  "入院患者数と病床数": "入院患者数と病床数",
   "床": "床",
   "総病床数": "総病床数",
   "入院患者数": "入院患者数",
-  "残り病床数": "残り病床数",
+  "病床数": "病床数",
   "最新のお知らせ": "最新のお知らせ",
   "都の備蓄マスク20万枚を都内全区市町村へ提供": "都の備蓄マスク20万枚を都内全区市町村へ提供",
   "都内医療機関及び保健所等へのマスクの配布について": "都内医療機関及び保健所等へのマスクの配布について",
diff --git a/components/cards/SickbedsSummaryCard.vue b/components/cards/SickbedsSummaryCard.vue
index 2cebc31e8bb9d..d94e08dfa0f78 100644
--- a/components/cards/SickbedsSummaryCard.vue
+++ b/components/cards/SickbedsSummaryCard.vue
@@ -1,7 +1,7 @@
 <template>
   <v-col cols="12" md="6" class="DataCard">
     <circle-chart
-      :title="$t('入院患者数と残り病床数')"
+      :title="$t('入院患者数と病床数')"
       :title-id="'patietns-and-sickedbeds'"
       :chart-data="sickbedsGraph"
       :date="date"

From 2a3b7ea30550bde836c2ba970dbdb55b91e2b5b2 Mon Sep 17 00:00:00 2001
From: Daiki <nojiri1098@gmail.com>
Date: Wed, 8 Apr 2020 12:45:59 +0900
Subject: [PATCH 2/5] Replace "Remaining Sickbeds" to "Sickbeds"

---
 assets/locales/en.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/locales/en.json b/assets/locales/en.json
index 102a67465e275..712c2b0731ae4 100644
--- a/assets/locales/en.json
+++ b/assets/locales/en.json
@@ -189,11 +189,11 @@
   "合計": "Total",
   "{date}の全体累計": "Cumulative total as of %{date}",
   "{date}の合計": "Total of %{date}",
-  "入院患者数と病床数": "Number of Hospitalized Patients and Remaining Sickbeds",
+  "入院患者数と病床数": "Number of Hospitalized Patients and Sickbeds",
   "床": "beds",
   "総病床数": "Total Number of Sickbeds",
   "入院患者数": "Hospitalized Patients",
-  "病床数": "Remaining Sickbeds",
+  "病床数": "Sickbeds",
   "最新のお知らせ": "What's new",
   "都の備蓄マスク20万枚を都内全区市町村へ提供": "Oita Prefecture Government provides the stockpile of masks for all the wards: and the municipalities in Oita (in Japanese)",
   "都内医療機関及び保健所等へのマスクの配布について": "Regarding the distribution of masks to medical institutions: public health centers: etc.: in Oita",

From bca420edcf6190085a06afa8f7fd3c7181b1e245 Mon Sep 17 00:00:00 2001
From: nakamura_subaru <subaru.nakamura@drecom.co.jp>
Date: Wed, 8 Apr 2020 18:59:11 +0900
Subject: [PATCH 3/5] build data on master branch when development deploying

---
 .github/workflows/develop.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml
index 728031a6b15f2..d34ecdb5cf0ae 100644
--- a/.github/workflows/develop.yml
+++ b/.github/workflows/develop.yml
@@ -13,7 +13,7 @@ jobs:
       - name: Pull submodule latest commit
         run: |
           git submodule update -i
-          cd data/ && git checkout development
+          cd data/ && git checkout master
 
       - name: Setup Node
         uses: actions/setup-node@v1

From 4f4d629036aa22227b4a9ab5b13f5829cf391204 Mon Sep 17 00:00:00 2001
From: Daiki <nojiri1098@gmail.com>
Date: Wed, 8 Apr 2020 22:40:59 +0900
Subject: [PATCH 4/5] Empty commit


From a262c450547c9e83be2f02167111666d43578738 Mon Sep 17 00:00:00 2001
From: Daiki <nojiri1098@gmail.com>
Date: Wed, 8 Apr 2020 23:08:24 +0900
Subject: [PATCH 5/5] Empty commit