Merge branch 'development' into development

.github/labeler.yml

@@ -1,3 +1,2 @@
 auto_merge:
   - assets/locales/*.json
-

.github/workflows/build.yml

@@ -15,11 +15,15 @@ jobs:
         with:
           node-version: '10.x'
 
+      - name: Get yarn cache directory path
+        id: yarn-cache-dir-path
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+
       - name: Cache dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
-          path: ~/.cache/yarn
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+          key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
           restore-keys: |
             ${{ runner.os }}-yarn-
 

.github/workflows/deploy.yml

@@ -20,11 +20,15 @@ jobs:
         with:
           node-version: '10.x'
 
+      - name: Get yarn cache directory path
+        id: yarn-cache-dir-path
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+
       - name: Cache dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
-          path: ~/.cache/yarn
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+          key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
           restore-keys: |
             ${{ runner.os }}-yarn-
 
@@ -38,28 +42,13 @@ jobs:
         env:
           GOOGLE_ANALYTICS_ID: ${{ secrets.GOOGLE_ANALYTICS_ID }}
 
-      - name: Temporarily disable "include administrators" branch protection
-        uses: benjefferies/branch-protection-bot@master
-        if: always()
-        with:
-          access-token: ${{ secrets.ACCESS_TOKEN }}
-          branch: production
-
       - name: Deploy
         uses: peaceiris/actions-gh-pages@v3
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: ./dist
           publish_branch: production
-
-      - name: Enable "include administrators" branch protection
-        uses: benjefferies/branch-protection-bot@master
-        if: always()  # Force to always run this step to ensure "include administrators" is always turned back on
-        with:
-          access-token: ${{ secrets.ACCESS_TOKEN }}
-          owner: tokyo-metropolitan-gov
-          repo: covid19
-          branch: production
+
       - name: Create GitHub release
         uses: rymndhng/release-on-push-action@master
         with:

.github/workflows/ogp_builder.yml

@@ -20,11 +20,14 @@ jobs:
         uses: actions/setup-node@v1
         with:
           node-version: '10.x'
+      - name: Get yarn cache directory path
+        id: yarn-cache-dir-path
+        run: echo "::set-output name=dir::$(yarn cache dir)"
       - name: Cache dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
-          path: ~/.cache/yarn
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+          key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
           restore-keys: |
             ${{ runner.os }}-yarn-
 

.github/workflows/screenshot.yml

@@ -16,11 +16,16 @@ jobs:
         uses: actions/setup-node@v1
         with:
           node-version: '10.x'
+
+      - name: Get yarn cache directory path
+        id: yarn-cache-dir-path
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+
       - name: Cache dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
-          path: ~/.cache/yarn
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+          key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
           restore-keys: |
             ${{ runner.os }}-yarn-
 

.github/workflows/staging.yml

@@ -16,11 +16,15 @@ jobs:
         with:
           node-version: '10.x'
 
+      - name: Get yarn cache directory path
+        id: yarn-cache-dir-path
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+
       - name: Cache dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
-          path: ~/.cache/yarn
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+          key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
           restore-keys: |
             ${{ runner.os }}-yarn-
 

CONTRIBUTORS.md

@@ -162,6 +162,15 @@ Tokyo Covid-19 response site contributors
 | Taiyu Yoshizawa | [@Nekoya3](https://github.com/Nekoya3) | [@Nekoya3_](https://twitter.com/Nekoya3_) | Coding |
 | Hikaru Hasegawa | [@telumo](https://github.com/telumo) | | Coding |
 | Tatsumi0000 | [@Tatsumi0000](https://github.com/Tatsumi0000) | [@Tatsumi0002](https://twitter.com/Tatsumi0002) | Frontend |
+| [urangurang](https://urangurang.github.io) | [@UrangUrang](https://github.com/UrangUrang) | | Coding, Translation |
+| asuchi0819 | [@asuchi0819](https://github.com/asuchi0819) | | Coding |
+| Kou-Squ | [@Kou-Squ](https://github.com/Kou-Squ) | | Translation |
+| kenem | [@kenem](https://github.com/kenem) | | Translation (Ja -> En) |
+| Marie | [@Marie](https://github.com/Marie) | | Translation (Ja -> De) |
+| Sisi | [@hello-iamsisi](https://github.com/hello-iamsisi) | | Translation Reviewer |
+| [yuu26](https://yuu26.com) | [@yuu26jp](https://github.com/yuu26jp) | [@m_on_yu](https://twitter.com/m_on_yu) | Coding |
+| Takayuki Inadome | [@InadomeLabo](https://github.com/InadomeLabo) | | Coding |
+| [MYUNG](https://1998.media) | [@1998code](https://github.com/1998code) | [@1998design](https://twitter.com/1998design) | Translation |
 
 ご協力に感謝です！！！
 

FORKED_SITES.md

@@ -4,20 +4,19 @@
 
 都道府県名 | 公開サイト | 運営者 | プロジェクト
 ------------ | ------------- | ------------- | -------------
-東京都（このサイト）|https://stopcovid19.metro.tokyo.lg.jp|東京都（**公式**）|[tokyo-metropolitan-gov/covid19](https://github.com/tokyo-metropolitan-gov/covid19)|
+東京都（このサイト）|https://stopcovid19.metro.tokyo.lg.jp/|東京都（**公式**）|[tokyo-metropolitan-gov/covid19](https://github.com/tokyo-metropolitan-gov/covid19)|
 [](01)北海道|https://stopcovid19.hokkaido.dev/|JUST道IT（有志団体）|[codeforsapporo/covid19](https://github.com/codeforsapporo/covid19)|
-[](02)青森県|https://covid19.codeforaomori.org|Code for Aomori|[CodeForAomori/covid19](https://github.com/CodeForAomori/covid19)|
-[](02)青森県|https://covid19-aomori.info/|Aomori Hackers（有志団体）|[covid19-aomori/website](https://github.com/covid19-aomori/website)|
+[](02)青森県|https://stopcovid19.pref.aomori.lg.jp/|青森県（**公式**）|[covid19-aomori/website](https://github.com/covid19-aomori/website)|
+[](02)青森県|https://covid19.codeforaomori.org/|Code for Aomori|[CodeForAomori/covid19](https://github.com/CodeForAomori/covid19)|
 [](02)青森県|https://covid19-daily-tohoku.news/|デーリー東北新聞社|[momujin/covid19](https://github.com/momujin/covid19)|
 [](03)岩手県|https://iwate.stopcovid19.jp/|有志|[MeditationDuck/covid19](https://github.com/MeditationDuck/covid19)|
 [](04)宮城県|https://miyagi.stopcovid19.jp/|Code for Shiogama|[code4shiogama/covid19-miyagi](https://github.com/code4shiogama/covid19-miyagi)|
-[](05)秋田県|https://covid19-akita.netlify.app/|学生 (有志) |[asaba-zauberer/covid19-akita](https://github.com/asaba-zauberer/covid19-akita)|
+[](05)秋田県|https://covid19-akita.netlify.app/|学生（有志）|[asaba-zauberer/covid19-akita](https://github.com/asaba-zauberer/covid19-akita)|
 [](06)山形県|https://stopcovid19-yamagata.netlify.app/|有志|[yamaserif/covid19](https://github.com/yamaserif/covid19)|
-[](07)福島県|https://fukushima-covid19.firebaseapp.com|GDG Fukushima|[donuzium/covid19](https://github.com/donuzium/covid19)|
+[](07)福島県|https://fukushima-covid19.firebaseapp.com/|福島県（**公式**）|[donuzium/covid19](https://github.com/donuzium/covid19)|
 [](08)茨城県|https://ibaraki.stopcovid19.jp/|個人|[a01sa01to/covid19-ibaraki](https://github.com/a01sa01to/covid19-ibaraki)|
-[](08)茨城県|https://stopcovid19-ibaraki.jp/|Project Ume(有志)|[BenataY/covid19](https://github.com/BenataY/covid19)|
+[](08)茨城県|https://stopcovid19-ibaraki.jp/|Project Ume（有志）|[BenataY/covid19](https://github.com/BenataY/covid19)|
 [](09)栃木県|https://covid19-tochigi.netlify.com/|有志|[covid19-tochigi/covid19](https://github.com/covid19-tochigi/covid19)|
-[](09)栃木県|https://covid-19-tochigi.origamium.net/|個人|[origamium/covid19-tochigi](https://github.com/origamium/covid19-tochigi)|
 [](10)群馬県|https://stopcovid19.pref.gunma.jp/|群馬県（**公式**）|[bpr-gunma/covid19](https://github.com/bpr-gunma/covid19)|
 [](11)埼玉県|https://saitama.stopcovid19.jp/|Code for TODA|[codefortoda/covid19-saitama](https://github.com/codefortoda/covid19-saitama)|
 [](12)千葉県|https://chiba-covid19.mypl.net/|地域情報サイト「まいぷれ」|[keisuke-kimura/covid19](https://github.com/keisuke-kimura/covid19)|
@@ -29,33 +28,34 @@
 [](14)神奈川県|https://www.pref.kanagawa.jp/osirase/1369/|神奈川県（**公式**）||
 [](14)横浜市|https://covid19.yokohama/|個人|[covid19yokohama/covid19](https://github.com/covid19yokohama/covid19)|
 [](15)新潟県|https://niigata.stopcovid19.jp/|Code for Niigata|[CodeForNiigata/covid19](https://github.com/CodeForNiigata/covid19)|
-[](15)新潟県|https://stopcovid19-niigata-unofficial.netlify.app|air-h-128k-il|[air-h-128k-il/covid19](https://github.com/air-h-128k-il/covid19)|
+[](15)新潟県|https://stopcovid19-niigata-unofficial.netlify.app/|air-h-128k-il|[air-h-128k-il/covid19](https://github.com/air-h-128k-il/covid19)|
+[](17)石川県|https://stopcovid19.pref.ishikawa.jp/|石川県（**公式**）||
 [](17)石川県|https://ishikawa-covid19.netlify.app/|個人|[Retsuki/covid19-ishikawa/](https://github.com/Retsuki/covid19-ishikawa/)|
 [](18)福井県|https://covid19-fukui.com/|地元有志（**福井県公認**）|[nomunomu0504/covid19](https://github.com/nomunomu0504/covid19)|
 [](18)福井県|https://covid19-fukui.bosai-signal.jp/|丹南ケーブルテレビ株式会社|[westar7/fukui-covid19](https://github.com/westar7/fukui-covid19)|
 [](19)山梨県|https://stopcovid19.yamanashi.dev/|stopcovid19.yamanashi.devチーム|[covid19-yamanashi/covid19](https://github.com/covid19-yamanashi/covid19)|
 [](20)長野県|https://stop-covid19-nagano.netlify.app/|有志|[Stop-COVID19-Nagano/covid19](https://github.com/Stop-COVID19-Nagano/covid19)|
 [](20)長野県|https://covid19-nagano.info/|個人|[kanai3id/covid19](https://github.com/kanai3id/covid19)|
 [](21)岐阜県|https://covid19-gifu.netlify.app/|個人|[CODE-for-GIFU/covid19](https://github.com/CODE-for-GIFU/covid19)|
-[](22)静岡市|https://stopcovid19.city.shizuoka.lg.jp|静岡市（**公式**)|[kazuomatz/covid19](https://github.com/kazuomatz/covid19)|
-[](22)浜松市|https://stopcovid19-hamamatsu.netlify.app/|有志|[code-for-hamamatsu/covid19](https://github.com/code-for-hamamatsu/covid19)|
+[](22)静岡市|https://stopcovid19.city.shizuoka.lg.jp/|静岡市（**公式**）|[kazuomatz/covid19](https://github.com/kazuomatz/covid19)|
+[](22)浜松市|https://stopcovid19-hamamatsu.netlify.app/|浜松市（**公式**）|[code-for-hamamatsu/covid19](https://github.com/code-for-hamamatsu/covid19)|
 [](23)愛知県|https://stopcovid19.code4.nagoya/|有志|[code4nagoya/covid19](https://github.com/code4nagoya/covid19)|
-[](24)三重県|https://mie.stopcovid19.jp/|高専生チーム(有志)|[FlexiblePrintedCircuits/covid19-mie](https://github.com/FlexiblePrintedCircuits/covid19-mie)|
-[](25)滋賀県|https://stopcovid19.pref.shiga.jp/|滋賀県（**公式**)|[Shiga-pref-org/covid19](https://github.com/Shiga-pref-org/covid19)|
+[](24)三重県|https://mie.stopcovid19.jp/|高専生チーム（有志）|[FlexiblePrintedCircuits/covid19-mie](https://github.com/FlexiblePrintedCircuits/covid19-mie)|
+[](25)滋賀県|https://stopcovid19.pref.shiga.jp/|滋賀県（**公式**）|[Shiga-pref-org/covid19](https://github.com/Shiga-pref-org/covid19)|
 [](26)京都府|https://stopcovid19-kyoto.netlify.app/|有志|[stopcovid19-kyoto/covid19](https://github.com/stopcovid19-kyoto/covid19)|
 [](27)大阪府|https://covid19-osaka.info/|大阪府（**公式**）|[codeforosaka/covid19](https://github.com/codeforosaka/covid19)|
 [](28)兵庫県|https://stop-covid19-hyogo.org/|有志|[stop-covid19-hyogo/covid19](https://github.com/stop-covid19-hyogo/covid19)|
 [](29)奈良県|https://stopcovid19.code4nara.org/|有志|[code4nara/covid19](https://github.com/code4nara/covid19)|
 [](30)和歌山県|https://stopcovid19.wakayama.jp/|エフエム和歌山|[sys-cube/covid19](https://github.com/sys-cube/covid19)|
 [](31)鳥取県|https://tottori-covid19.netlify.app/|有志|[tottori-covid19/covid19](https://github.com/tottori-covid19/covid19)|
 [](32)島根県|https://shimane-covid19.netlify.app/|島根出身学生有志|[TaigaMikami/covid19](https://github.com/TaigaMikami)|
-[](33)岡山県|https://okayama.stopcovid19.jp/|学生エンジニア(有志)|[stopcovid19-okayama/covid19](https://github.com/stopcovid19-okayama/covid19)|
+[](33)岡山県|https://okayama.stopcovid19.jp/|学生エンジニア（有志）|[stopcovid19-okayama/covid19](https://github.com/stopcovid19-okayama/covid19)|
 [](34)広島県|https://covid19-hiroshima.netlify.app/|個人|[tatsuya1970/covid19](https://github.com/tatsuya1970/covid19)|
-[](35)山口県|https://covid19-yamaguchi.netlify.app|有志|[nishidayoshikatsu/covid19-yamaguchi](https://github.com/nishidayoshikatsu/covid19-yamaguchi)|
-[](37)香川県|https://kagawa.stopcovid19.jp/|学生エンジニア(有志)|[codeforkagawa/covid19](https://github.com/codeforkagawa/covid19)|
-[](37)香川県|https://covid19-kagawa.jp/|学生エンジニア (有志)|[i15317/covid19](https://github.com/i15317/covid19) |
-[](38)愛媛県|https://ehime-covid19.com/|ボランティア(有志)|[ehime-covid19/covid19](https://github.com/ehime-covid19/covid19)|
-[](39)高知県|https://covid19-kochi.netlify.app|学生エンジニア(有志)||
+[](35)山口県|https://covid19-yamaguchi.netlify.app/|有志|[nishidayoshikatsu/covid19-yamaguchi](https://github.com/nishidayoshikatsu/covid19-yamaguchi)|
+[](37)香川県|https://kagawa.stopcovid19.jp/|学生エンジニア（有志）|[codeforkagawa/covid19](https://github.com/codeforkagawa/covid19)|
+[](37)香川県|https://covid19-kagawa.jp/|学生エンジニア（有志）|[i15317/covid19](https://github.com/i15317/covid19) |
+[](38)愛媛県|https://ehime-covid19.com/|ボランティア（有志）|[ehime-covid19/covid19](https://github.com/ehime-covid19/covid19)|
+[](39)高知県|https://covid19-kochi.netlify.app/|学生エンジニア（有志）||
 [](40)福岡県|https://fukuoka.stopcovid19.jp/|Code for Fukuoka, Code for Kurume|[Code-for-Fukuoka/covid19-fukuoka](https://github.com/Code-for-Fukuoka/covid19-fukuoka)|
 [](40)福岡市|https://stopcovid19.codeforfukuoka.org/|Code for Fukuoka|[Code-for-Fukuoka/covid19](https://github.com/Code-for-Fukuoka/covid19)|
 [](40)北九州市|https://stopcovid19-kitakyushu.jp/|Code for Kitakyushu|[covid19-kitakyushu/covid19](https://github.com/covid19-kitakyushu/covid19)|
@@ -66,12 +66,13 @@
 [](45)宮崎県|https://covid19-miyazaki.netlify.app/|有志|[covid19-miyazaki/covid19](https://github.com/covid19-miyazaki/covid19)|
 [](46)鹿児島県|https://covid19.code4kagoshima.org/|有志|[codeforkagoshima/covid19](https://github.com/codeforkagoshima/covid19)
 [](47)沖縄県|https://okinawa.stopcovid19.jp/|有志|[Code-for-OKINAWA/covid19](https://github.com/Code-for-OKINAWA/covid19)
-[]()全国|https://covid19.wlaboratory.com|個人|[mm0202/covid19-jp](https://github.com/mm0202/covid19-jp)|
+[]()全国|https://covid19.wlaboratory.com/|個人|[mm0202/covid19-jp](https://github.com/mm0202/covid19-jp)|
 ## 都道府県追加時のルール
 
 1. 東京都: 先頭で固定とする。
-1. 東京都以外: 厚生労働省発行のPDF([都道府県番号 - tp0727-1d.pdf](https://www.mhlw.go.jp/topics/2007/07/dl/tp0727-1d.pdf))に従って、表に以下の情報を追加する。
-   - 公開しているサイト: URLを記載する。
+1. 東京都以外: 厚生労働省発行のPDF（[都道府県番号 - tp0727-1d.pdf](https://www.mhlw.go.jp/topics/2007/07/dl/tp0727-1d.pdf)）に従って、表に以下の情報を追加する。
+   - 公開しているサイト: URLを記載する。URLの末尾にスラッシュを忘れずに記載すること。
+   - 運営者: 括弧を使用する際には、全角で統一すること。
    - プロジェクト
       - Private Repository: 未記入とする。
       - Public Repository

README.md

@@ -20,12 +20,12 @@ Issues にあるいろいろな修正にご協力いただけると嬉しいで
 
 ## このサイトから派生したサイト
 
-[Link先](./FORKED_SITES.md)を御覧ください。
+[このサイトから派生したサイト](./FORKED_SITES.md)を御覧ください。
 
 ## 翻訳者向け情報
 
-翻訳をお手伝いいただける方は、[こちらのドキュメント](./TRANSLATION.md)を御覧ください。
+翻訳をお手伝いいただける方は、[How to contribute translations](./TRANSLATION.md)を御覧ください。
 
 ## 開発者向け情報
 
-開発をお手伝いいただける方は、[こちらのドキュメント](./FOR_DEVELOPERS.md)を御覧ください。
+開発をお手伝いいただける方は、[開発者向け情報](./FOR_DEVELOPERS.md)を御覧ください。